Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to risc0 1.2.1-rc.0 #123

Merged
merged 12 commits into from
Dec 12, 2024
Merged

Update to risc0 1.2.1-rc.0 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f2744e9
bump version to 1.2 and update patch commit
austinabell Dec 9, 2024
789f139
update patch commit, broken docker build
austinabell Dec 9, 2024
96985e8
switch risc0-build to use unstable (will in future fix build issue)
austinabell Dec 9, 2024
88fb075
Update to risc0 1.2.1-rc.0
flaub Dec 10, 2024
9c1ac8f
Update to risc0 1.2.1-rc.0
flaub Dec 10, 2024
34e9e32
Update lock files, cache block
flaub Dec 10, 2024
b98febd
remove bogus block
flaub Dec 10, 2024
a8f1999
Update tiny-keccak rev
flaub Dec 10, 2024
66c30e3
switch k256 patch to tagged release
austinabell Dec 10, 2024
ff27a2e
Update to latest keccak
flaub Dec 12, 2024
2175381
Merge remote-tracking branch 'origin/flaub/1.2.1-rc.0' into flaub/1.2…
flaub Dec 12, 2024
dc24d37
Merge branch 'main' into flaub/1.2.1-rc.0
flaub Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
300 changes: 153 additions & 147 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 31 additions & 17 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[workspace]
resolver = "2"
members = [
"bin/*",
"crates/*",
"guests",
"testing/ef-tests",
]
members = ["bin/*", "crates/*", "guests", "testing/ef-tests"]

# Always optimize; building and running the guest takes much longer without optimization.
[profile.dev]
Expand All @@ -23,14 +18,18 @@ opt-level = 3

# RISC Zero
[workspace.dependencies.bonsai-sdk]
version = "1.1.3"
git = "https://github.com/risc0/risc0"
rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649"
features = ["non_blocking"]

[workspace.dependencies.risc0-build]
version = "1.1.3"
git = "https://github.com/risc0/risc0"
rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649"
features = ["unstable"]

[workspace.dependencies.risc0-zkvm]
version = "1.1.3"
git = "https://github.com/risc0/risc0"
rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649"
default-features = false

# External
Expand All @@ -48,18 +47,33 @@ op-alloy-provider = "0.4.0"
op-alloy-rpc-types = "0.4.0"

# Reth
reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] }
reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [
"std",
] }
reth-consensus = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd" }
reth-ethereum-consensus = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd" }
reth-evm = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] }
reth-evm-ethereum = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] }
reth-optimism-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] }
reth-evm = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [
"std",
] }
reth-evm-ethereum = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [
"std",
] }
reth-optimism-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [
"std",
] }
reth-optimism-consensus = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd" }
reth-optimism-evm = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false }
reth-optimism-forks = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false }
reth-primitives = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std", "alloy-compat"] }
reth-revm = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] }
reth-storage-errors = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] }
reth-primitives = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [
"std",
"alloy-compat",
] }
reth-revm = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [
"std",
] }
reth-storage-errors = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [
"std",
] }

# Zeth
zeth = { path = "crates/zeth" }
Expand Down Expand Up @@ -87,5 +101,5 @@ serde_json = { version = "1.0.128", features = ["alloc"] }
serde_with = "3.7.0"
thiserror = "1.0.64"
tiny-keccak = "2.0.2"
tokio = { version = "1.40.0", features = ["full"] }
tokio = { version = "1.41.0", features = ["full"] }
tracing = { version = "0.1.40", features = ["log"] }
Binary file added bin/ethereum/data/ethereum/1-21231350.json.gz
View file
Open in desktop
Binary file not shown.
86 changes: 56 additions & 30 deletions guests/reth-ethereum/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 11 additions & 6 deletions guests/reth-ethereum/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ edition = "2021"
[workspace]

[dependencies.risc0-zkvm]
version = "1.1.3"
git = "https://github.com/risc0/risc0"
rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649"
default-features = false
features = ["std"]
features = ["std", "unstable"]

[dependencies.risc0-zkvm-platform]
version = "1.1.3"
git = "https://github.com/risc0/risc0"
rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649"
features = ["sys-getenv"]

[dependencies.zeth-core]
Expand All @@ -27,10 +29,13 @@ anyhow = { version = "1.0.86", default-features = false }
c-kzg = { version = "=1.0.3", features = ["risc0-ffi"] }
lazy_static = "1.5.0"

reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] }
reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [
"std",
] }

[patch.crates-io]
c-kzg = { git = "https://github.com/risc0/c-kzg-4844.git", branch = "p1.0.3" }
crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" }
k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.1" }
sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.6-risczero.0" }
c-kzg = { git = "https://github.com/risc0/c-kzg-4844.git", branch = "p1.0.3" }
tiny-keccak = { git = "https://github.com/risc0/tiny-keccak", rev = "b93afa7dc803d2db6ddae7df15e9db5a79212ba0" }
Loading
Loading