Skip to content

Commit 6d349de

Browse files
authored
Merge branch 'main' into bg
2 parents 173d688 + e69d087 commit 6d349de

File tree

29 files changed

+945
-121
lines changed

29 files changed

+945
-121
lines changed

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@ jobs:
139139
run: just run_demo -l --ignore-stamp --yapper -c test-configs/c0
140140
- name: Run sailfish demo
141141
run: just run_sailfish_demo
142+
- name: Test with block-maker
143+
run: just test-all
142144

143145
contracts:
144146
runs-on: ubuntu-latest

Cargo.lock

Lines changed: 129 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@ parking_lot = "0.12.3"
7676
prometheus = "0.14"
7777
prost = "0.14.1"
7878
quickcheck = "1.0.3"
79+
quick_cache = "0.6.16"
7980
rand = "0.9"
8081
rayon = "1.10"
81-
reqwest = { version = "0.12", features = ["json"] }
82+
rustix = { version = "1.1.2", features = ["process"] }
83+
reqwest = { version = "0.12", features = ["json", "brotli", "gzip", "zstd"] }
8284
secp256k1 = { version = "0.31.0", features = ["global-context", "hashes", "rand", "serde"] }
8385
serde = { version = "1", features = ["derive", "rc"] }
8486
serde_bytes = "0.11.15"

0 commit comments

Comments
 (0)