Skip to content

feat: goat osaka hardfork #6

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

Merged
eigmax merged 1 commit into from
Dec 24, 2025
Merged

feat: goat osaka hardfork #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1,424 changes: 521 additions & 903 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

105 changes: 56 additions & 49 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,29 @@ zkm-sdk = { git = "https://github.com/ProjectZKM/Ziren" }
# zkm-prover = { path = "../Ziren/crates/prover" }
# zkm-sdk = { path = "../Ziren/crates/sdk" }

# reth goat
reth-primitives-traits = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-evm = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-evm-ethereum = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-optimism-evm = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-optimism-primitives = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-storage-errors = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-trie = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-chainspec = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-optimism-chainspec = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-execution-types = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-errors = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-ethereum-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-ethereum-primitives = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false, features = ["serde"] }
reth-optimism-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
reth-optimism-forks = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
# reth
reth-primitives-traits = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-consensus-common = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-evm = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-evm-ethereum = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-optimism-evm = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-optimism-primitives = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-storage-errors = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-trie = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-chainspec = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-optimism-chainspec = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-execution-types = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-errors = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-ethereum-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-ethereum-primitives = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false, features = ["serde"] }
reth-optimism-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
reth-optimism-forks = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }

# reth-primitives-traits = { path = "../patch/reth/crates/primitives-traits", default-features = false }
# reth-consensus = { path = "../patch/reth/crates/consensus/consensus", default-features = false }
# reth-evm = { path = "../patch/reth/crates/evm", default-features = false }
# reth-consensus-common = { path = "../patch/reth/crates/consensus/common", default-features = false }
# reth-evm = { path = "../patch/reth/crates/evm/evm", default-features = false }
# reth-evm-ethereum = { path = "../patch/reth/crates/ethereum/evm", default-features = false }
# reth-optimism-evm = { path = "../patch/reth/crates/optimism/evm", default-features = false }
# reth-optimism-primitives = { path = "../patch/reth/crates/optimism/primitives", default-features = false }
Expand All @@ -92,26 +94,26 @@ reth-optimism-forks = { git = "https://github.com/ziren-patches/reth", branch =
# reth-optimism-consensus = { path = "../patch/reth/crates/optimism/consensus", default-features = false }
# reth-optimism-forks = { path = "../patch/reth/crates/optimism/hardforks", default-features = false }

# revm goat
revm = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", features = [
# revm
revm = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", features = [
"serde",
"kzg-rs",
"bn",
], default-features = false }
revm-bytecode = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
revm-state = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
revm-primitives = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", features = [
revm-bytecode = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
revm-state = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
revm-primitives = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", features = [
"serde",
], default-features = false }
revm-interpreter = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
revm-precompile = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
revm-database-interface = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
op-revm = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
revm-inspectors = { git = "https://github.com/ziren-patches/revm-inspectors", branch = "patch-0.19.0" }
revm-interpreter = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
revm-precompile = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
revm-database = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
revm-database-interface = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
op-revm = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
revm-inspectors = { git = "https://github.com/ziren-patches/revm-inspectors", branch = "patch-0.32.0" }

# revm = { path = "../patch/revm/crates/revm", features = [
# "serde",
# "kzg-rs",
# "bn",
# ], default-features = false }
# revm-bytecode = { path = "../patch/revm/crates/bytecode", default-features = false }
# revm-state = { path = "../patch/revm/crates/state", default-features = false }
Expand All @@ -120,6 +122,7 @@ revm-inspectors = { git = "https://github.com/ziren-patches/revm-inspectors", br
# ], default-features = false }
# revm-interpreter = { path = "../patch/revm/crates/interpreter", default-features = false }
# revm-precompile = { path = "../patch/revm/crates/precompile", default-features = false }
# revm-database = { path = "../patch/revm/crates/database", default-features = false }
# revm-database-interface = { path = "../patch/revm/crates/database/interface", default-features = false }
# op-revm = { path = "../patch/revm/crates/optimism", default-features = false }
# revm-inspectors = { path = "../patch/revm-inspectors" }
Expand All @@ -130,26 +133,27 @@ alloy-primitives = { version = "1.0.0", default-features = false, features = ["s
alloy-rlp = "0.3.10"
alloy-trie = "0.8.1"

# alloy goat
alloy-evm = { git = "https://github.com/ziren-patches/evm", branch = "patch-0.4.0", default-features = false }
alloy-provider = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false, features = [
# alloy
alloy-evm = { git = "https://github.com/ziren-patches/evm", branch = "patch-0.23.0", default-features = false }
alloy-provider = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false, features = [
"reqwest",
"reqwest-rustls-tls",
] }
alloy-rpc-types = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false, features = [
alloy-rpc-types = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false, features = [
"eth",
] }
alloy-json-rpc = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
alloy-genesis = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
alloy-consensus = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false, features = ["serde", "serde-bincode-compat"] }
alloy-network = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
alloy-transport = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
alloy-transport-http = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", features = [
alloy-rpc-types-debug = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
alloy-json-rpc = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
alloy-genesis = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
alloy-consensus = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false, features = ["serde", "serde-bincode-compat"] }
alloy-network = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
alloy-transport = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
alloy-transport-http = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", features = [
"reqwest-rustls-tls",
], default-features = false }
alloy-transport-ws = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0" }
alloy-rpc-client = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
alloy-eips = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
alloy-transport-ws = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41" }
alloy-rpc-client = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
alloy-eips = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }

# alloy-evm = { path = "../patch/evm/crates/evm", default-features = false }
# alloy-provider = { path = "../patch/alloy/crates/provider", default-features = false, features = [
Expand All @@ -159,6 +163,7 @@ alloy-eips = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0
# alloy-rpc-types = { path = "../patch/alloy/crates/rpc-types", default-features = false, features = [
# "eth",
# ] }
# alloy-rpc-types-debug = { path = "../patch/alloy/crates/rpc-types-debug", default-features = false}
# alloy-json-rpc = { path = "../patch/alloy/crates/json-rpc", default-features = false }
# alloy-genesis = { path = "../patch/alloy/crates/genesis", default-features = false }
# alloy-consensus = { path = "../patch/alloy/crates/consensus", default-features = false, features = ["serde", "serde-bincode-compat"] }
Expand All @@ -172,16 +177,18 @@ alloy-eips = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0
# alloy-eips = { path = "../patch/alloy/crates/eips", default-features = false }

# op goat
alloy-op-evm = { git = "https://github.com/ziren-patches/evm", branch = "patch-0.4.0", default-features = false }
op-alloy-consensus = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.13.0" }
op-alloy-network = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.13.0" }
op-alloy-rpc-types = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.13.0" }
alloy-op-evm = { git = "https://github.com/ziren-patches/evm", branch = "patch-0.23.0", default-features = false }
op-alloy-consensus = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.22.0" }
op-alloy-network = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.22.0" }
op-alloy-rpc-types = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.22.0" }

# alloy-op-evm = { path = "../patch/evm/crates/evm", default-features = false }
# op-alloy-consensus = { path = "../patch/op-alloy/crates/consensus" }
# op-alloy-network = { path = "../patch/op-alloy/crates/network" }
# op-alloy-rpc-types = { path = "../patch/op-alloy/crates/rpc-types" }

kzg-rs = { git = "https://github.com/ziren-patches/kzg-rs", branch = "ziren" }

[workspace.lints]
rust.missing_debug_implementations = "warn"
rust.unreachable_pub = "warn"
Expand All @@ -191,8 +198,8 @@ rustdoc.all = "warn"

[patch.crates-io]
# Precompile patches
sha2 = { git = "https://github.com/ziren-patches/RustCrypto-hashes", branch = "patch-sha2-0.10.8", package = "sha2" }
sha2 = { git = "https://github.com/ziren-patches/RustCrypto-hashes", branch = "patch-sha2-0.10.9", package = "sha2" }
bn = { git = "https://github.com/ziren-patches/bn", branch = "patch-0.6.0", package = "substrate-bn" }
k256 = { git = "https://github.com/ziren-patches/elliptic-curves", branch = "patch-k256-0.13.4" }
p256 = { git = "https://github.com/ziren-patches/elliptic-curves", branch = "patch-p256-0.13.2" }
alloy-primitives-v1-1-2 = { git = "https://github.com/ziren-patches/core.git", package = "alloy-primitives", branch = "patch-alloy-primitives-1.1.2" }
alloy-primitives-v1-4-1 = { git = "https://github.com/ziren-patches/core.git", package = "alloy-primitives", branch = "patch-alloy-primitives-1.4.1" }
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The client input (witness) generated by executing against RPC can be cached to s
cargo run -r --bin host -- --block-number <block-number> --chain-id <chain-id> --cache-dir /path/to/cache

# eg.
cargo run -r --bin host -- --block-number 18884864 --chain-id 1 --cache-dir ./bin/host
cargo run -r --bin host -- --block-number 9831027 --chain-id 48816 --cache-dir ./bin/host
```

Note that even when utilizing a cached input, the host still needs access to the chain ID to identify the network type, either through `--rpc-url` or `--chain-id`. To run the host completely offline, use `--chain-id` for this.
Expand Down
2 changes: 1 addition & 1 deletion bin/eth-proofs/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ async fn main() -> eyre::Result<()> {
let alerting_client = args.pager_duty_integration_key.map(AlertingClient::new);

let ws = WsConnect::new(args.ws_rpc_url);
let ws_provider = ProviderBuilder::new().on_ws(ws).await?;
let ws_provider = ProviderBuilder::new().connect_ws(ws).await?;
let http_provider = create_provider(args.http_rpc_url);
let debug_http_provider = create_provider(args.debug_http_rpc_url);

Expand Down
Loading