Skip to content

Commit d4552fb

Browse files
nuke-web3mothran
andauthored
BM-212: Relax semver match to 1.1 to explicitly allow patches on risc0 deps (github#45)
This is reflected in https://github.com/risc0/risc0-foundry-template/blob/main/Cargo.toml#L20-L24 for example, I think this should be acceptable practice here and in https://github.com/boundless-xyz/boundless-foundry-template/blob/main/Cargo.toml#L22-L23 it is already --------- Co-authored-by: Parker Thompson <[email protected]>
1 parent 2e9cb04 commit d4552fb

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- name: install cargo risczero
7070
uses: ./.github/actions/bininstall-risc0
7171
with:
72-
risczero-version: '1.1.1'
72+
risczero-version: '1.1'
7373
toolchain-version: 'r0.1.79.0-2'
7474

7575
- name: install cargo-sort
@@ -206,7 +206,7 @@ jobs:
206206
- name: install cargo risczero
207207
uses: ./.github/actions/bininstall-risc0
208208
with:
209-
risczero-version: '1.1.1'
209+
risczero-version: '1.1'
210210
toolchain-version: 'r0.1.79.0-2'
211211

212212
- name: install cargo-sort

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ aws-sdk-s3 = "1.34" # used for minio for max compatibility
3636
axum = "0.7"
3737
axum-extra = { version = "0.9" }
3838
bincode = "1.3"
39-
bonsai-sdk = { version = "1.1.1", features = ["non_blocking"] }
39+
bonsai-sdk = { version = "1.1", features = ["non_blocking"] }
4040
bs58 = "0.5"
4141
bytemuck = "1.16"
4242
clap = { version = "4.5", features = ["derive", "env"] }
@@ -48,11 +48,11 @@ postcard = { version = "1.0" }
4848
rand = { version = "0.8" }
4949
redis = { version = "0.25", features = ["tokio-comp"] }
5050
reqwest = "0.12"
51-
risc0-binfmt = "1.1.1"
52-
risc0-build = { version = "1.1.1", features = ["docker"] }
53-
risc0-build-ethereum = "1.1.1"
54-
risc0-ethereum-contracts = "1.1.1"
55-
risc0-zkvm = { version = "1.1.1", default-features = false }
51+
risc0-binfmt = "1.1"
52+
risc0-build = { version = "1.1", features = ["docker"] }
53+
risc0-build-ethereum = "1.1"
54+
risc0-ethereum-contracts = "1.1"
55+
risc0-zkvm = { version = "1.1", default-features = false }
5656
serde = { version = "1.0", features = ["derive"] }
5757
serde_json = "1.0"
5858
serde_yaml = "0.9"

broker.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ max_file_size = 50_000_000
1111

1212
[prover]
1313
status_poll_ms = 1000
14-
bonsai_r0_zkvm_ver = "1.1.1"
14+
bonsai_r0_zkvm_ver = "1.1"
1515
req_retry_count = 3
1616
# set_builder_guest_path = "./target/riscv-guest/riscv32im-risc0-zkvm-elf/release/set-builder-guest"
1717
# assessor_set_guest_path = "./target/riscv-guest/riscv32im-risc0-zkvm-elf/release/assessor-guest"

crates/guest/assessor/assessor-guest/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ alloy-sol-types = { version = "0.8", features = ["eip712-serde"] }
1212
assessor = { path = "../../../assessor" }
1313
boundless-market = { path = "../../../boundless-market", default-features = false }
1414
postcard = "1.0"
15-
risc0-zkvm = { version = "1.1.1", default-features = false, features = ["std"] }
15+
risc0-zkvm = { version = "1.1", default-features = false, features = ["std"] }
1616

1717
[patch.crates-io]
1818
# use optimized risc0 circuit

crates/guest/set-builder/set-builder-guest/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77

88
[dependencies]
99
aggregation-set = { path = "../../../aggregation-set", default-features = false }
10-
risc0-zkvm = { version = "1.1.1", default-features = false, features = ["std"] }
10+
risc0-zkvm = { version = "1.1", default-features = false, features = ["std"] }
1111

1212
[patch.crates-io]
1313
# use optimized risc0 circuit

crates/guest/util/echo/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ edition = "2021"
66
[workspace]
77

88
[dependencies]
9-
risc0-zkvm = { version = "1.1.1", default-features = false, features = ["std"] }
9+
risc0-zkvm = { version = "1.1", default-features = false, features = ["std"] }

dockerfiles/broker.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN \
1919
# --mount=type=cache,target=/usr/local/cargo/registry/ \
2020
source ./sccache-config.sh && \
2121
cargo install --version 1.6.9 cargo-binstall && \
22-
cargo binstall -y --force cargo-risczero --version 1.1.1 && \
22+
cargo binstall -y --force cargo-risczero --version 1.1 && \
2323
cargo risczero install
2424

2525
FROM init AS builder

examples/counter/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ risc0-zkvm = { version = "1.1", default-features = false }
2121

2222
# risc0-ethereum dependencies.
2323
risc0-build-ethereum = { version = "1.1" }
24-
risc0-ethereum-contracts = { git = "https://github.com/risc0/risc0-ethereum", tag = "v1.1.1" }
24+
risc0-ethereum-contracts = { git = "https://github.com/risc0/risc0-ethereum", tag = "v1.1.4" }
2525

2626
alloy = { version = "0.3" }
2727
alloy-primitives = { version = "0.8", default-features = false, features = ["rlp", "serde", "std"] }

0 commit comments

Comments
 (0)