Skip to content

Commit 725ad7f

Browse files
felicityinfelicityin
committed
feat: goat oska hardfork
1 parent eea6b5e commit 725ad7f

38 files changed

Lines changed: 2162 additions & 2256 deletions

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 56 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,29 @@ zkm-sdk = { git = "https://github.com/ProjectZKM/Ziren" }
5757
# zkm-prover = { path = "../Ziren/crates/prover" }
5858
# zkm-sdk = { path = "../Ziren/crates/sdk" }
5959

60-
# reth goat
61-
reth-primitives-traits = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
62-
reth-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
63-
reth-evm = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
64-
reth-evm-ethereum = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
65-
reth-optimism-evm = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
66-
reth-optimism-primitives = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
67-
reth-storage-errors = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
68-
reth-trie = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
69-
reth-chainspec = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
70-
reth-optimism-chainspec = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
71-
reth-execution-types = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
72-
reth-errors = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
73-
reth-ethereum-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
74-
reth-ethereum-primitives = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false, features = ["serde"] }
75-
reth-optimism-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
76-
reth-optimism-forks = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.3.10", default-features = false }
60+
# reth
61+
reth-primitives-traits = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
62+
reth-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
63+
reth-consensus-common = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
64+
reth-evm = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
65+
reth-evm-ethereum = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
66+
reth-optimism-evm = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
67+
reth-optimism-primitives = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
68+
reth-storage-errors = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
69+
reth-trie = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
70+
reth-chainspec = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
71+
reth-optimism-chainspec = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
72+
reth-execution-types = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
73+
reth-errors = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
74+
reth-ethereum-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
75+
reth-ethereum-primitives = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false, features = ["serde"] }
76+
reth-optimism-consensus = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
77+
reth-optimism-forks = { git = "https://github.com/ziren-patches/reth", branch = "patch-1.9.3", default-features = false }
7778

7879
# reth-primitives-traits = { path = "../patch/reth/crates/primitives-traits", default-features = false }
7980
# reth-consensus = { path = "../patch/reth/crates/consensus/consensus", default-features = false }
80-
# reth-evm = { path = "../patch/reth/crates/evm", default-features = false }
81+
# reth-consensus-common = { path = "../patch/reth/crates/consensus/common", default-features = false }
82+
# reth-evm = { path = "../patch/reth/crates/evm/evm", default-features = false }
8183
# reth-evm-ethereum = { path = "../patch/reth/crates/ethereum/evm", default-features = false }
8284
# reth-optimism-evm = { path = "../patch/reth/crates/optimism/evm", default-features = false }
8385
# reth-optimism-primitives = { path = "../patch/reth/crates/optimism/primitives", default-features = false }
@@ -92,26 +94,26 @@ reth-optimism-forks = { git = "https://github.com/ziren-patches/reth", branch =
9294
# reth-optimism-consensus = { path = "../patch/reth/crates/optimism/consensus", default-features = false }
9395
# reth-optimism-forks = { path = "../patch/reth/crates/optimism/hardforks", default-features = false }
9496

95-
# revm goat
96-
revm = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", features = [
97+
# revm
98+
revm = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", features = [
9799
"serde",
98-
"kzg-rs",
99100
"bn",
100101
], default-features = false }
101-
revm-bytecode = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
102-
revm-state = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
103-
revm-primitives = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", features = [
102+
revm-bytecode = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
103+
revm-state = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
104+
revm-primitives = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", features = [
104105
"serde",
105106
], default-features = false }
106-
revm-interpreter = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
107-
revm-precompile = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
108-
revm-database-interface = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
109-
op-revm = { git = "https://github.com/ziren-patches/revm", branch = "patch-22.0.0", default-features = false }
110-
revm-inspectors = { git = "https://github.com/ziren-patches/revm-inspectors", branch = "patch-0.19.0" }
107+
revm-interpreter = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
108+
revm-precompile = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
109+
revm-database = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
110+
revm-database-interface = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
111+
op-revm = { git = "https://github.com/ziren-patches/revm", branch = "patch-31.0.2", default-features = false }
112+
revm-inspectors = { git = "https://github.com/ziren-patches/revm-inspectors", branch = "patch-0.32.0" }
111113

112114
# revm = { path = "../patch/revm/crates/revm", features = [
113115
# "serde",
114-
# "kzg-rs",
116+
# "bn",
115117
# ], default-features = false }
116118
# revm-bytecode = { path = "../patch/revm/crates/bytecode", default-features = false }
117119
# revm-state = { path = "../patch/revm/crates/state", default-features = false }
@@ -120,6 +122,7 @@ revm-inspectors = { git = "https://github.com/ziren-patches/revm-inspectors", br
120122
# ], default-features = false }
121123
# revm-interpreter = { path = "../patch/revm/crates/interpreter", default-features = false }
122124
# revm-precompile = { path = "../patch/revm/crates/precompile", default-features = false }
125+
# revm-database = { path = "../patch/revm/crates/database", default-features = false }
123126
# revm-database-interface = { path = "../patch/revm/crates/database/interface", default-features = false }
124127
# op-revm = { path = "../patch/revm/crates/optimism", default-features = false }
125128
# revm-inspectors = { path = "../patch/revm-inspectors" }
@@ -130,26 +133,27 @@ alloy-primitives = { version = "1.0.0", default-features = false, features = ["s
130133
alloy-rlp = "0.3.10"
131134
alloy-trie = "0.8.1"
132135

133-
# alloy goat
134-
alloy-evm = { git = "https://github.com/ziren-patches/evm", branch = "patch-0.4.0", default-features = false }
135-
alloy-provider = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false, features = [
136+
# alloy
137+
alloy-evm = { git = "https://github.com/ziren-patches/evm", branch = "patch-0.23.0", default-features = false }
138+
alloy-provider = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false, features = [
136139
"reqwest",
137140
"reqwest-rustls-tls",
138141
] }
139-
alloy-rpc-types = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false, features = [
142+
alloy-rpc-types = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false, features = [
140143
"eth",
141144
] }
142-
alloy-json-rpc = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
143-
alloy-genesis = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
144-
alloy-consensus = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false, features = ["serde", "serde-bincode-compat"] }
145-
alloy-network = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
146-
alloy-transport = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
147-
alloy-transport-http = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", features = [
145+
alloy-rpc-types-debug = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
146+
alloy-json-rpc = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
147+
alloy-genesis = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
148+
alloy-consensus = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false, features = ["serde", "serde-bincode-compat"] }
149+
alloy-network = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
150+
alloy-transport = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
151+
alloy-transport-http = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", features = [
148152
"reqwest-rustls-tls",
149153
], default-features = false }
150-
alloy-transport-ws = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0" }
151-
alloy-rpc-client = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
152-
alloy-eips = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0.14.0", default-features = false }
154+
alloy-transport-ws = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41" }
155+
alloy-rpc-client = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
156+
alloy-eips = { git = "https://github.com/ziren-patches/alloy", branch = "patch-1.0.41", default-features = false }
153157

154158
# alloy-evm = { path = "../patch/evm/crates/evm", default-features = false }
155159
# alloy-provider = { path = "../patch/alloy/crates/provider", default-features = false, features = [
@@ -159,6 +163,7 @@ alloy-eips = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0
159163
# alloy-rpc-types = { path = "../patch/alloy/crates/rpc-types", default-features = false, features = [
160164
# "eth",
161165
# ] }
166+
# alloy-rpc-types-debug = { path = "../patch/alloy/crates/rpc-types-debug", default-features = false}
162167
# alloy-json-rpc = { path = "../patch/alloy/crates/json-rpc", default-features = false }
163168
# alloy-genesis = { path = "../patch/alloy/crates/genesis", default-features = false }
164169
# alloy-consensus = { path = "../patch/alloy/crates/consensus", default-features = false, features = ["serde", "serde-bincode-compat"] }
@@ -172,16 +177,18 @@ alloy-eips = { git = "https://github.com/ziren-patches/alloy", branch = "patch-0
172177
# alloy-eips = { path = "../patch/alloy/crates/eips", default-features = false }
173178

174179
# op goat
175-
alloy-op-evm = { git = "https://github.com/ziren-patches/evm", branch = "patch-0.4.0", default-features = false }
176-
op-alloy-consensus = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.13.0" }
177-
op-alloy-network = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.13.0" }
178-
op-alloy-rpc-types = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.13.0" }
180+
alloy-op-evm = { git = "https://github.com/ziren-patches/evm", branch = "patch-0.23.0", default-features = false }
181+
op-alloy-consensus = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.22.0" }
182+
op-alloy-network = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.22.0" }
183+
op-alloy-rpc-types = { git = "https://github.com/ziren-patches/op-alloy", branch = "patch-0.22.0" }
179184

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

190+
kzg-rs = { git = "https://github.com/ziren-patches/kzg-rs", branch = "ziren" }
191+
185192
[workspace.lints]
186193
rust.missing_debug_implementations = "warn"
187194
rust.unreachable_pub = "warn"
@@ -191,8 +198,8 @@ rustdoc.all = "warn"
191198

192199
[patch.crates-io]
193200
# Precompile patches
194-
sha2 = { git = "https://github.com/ziren-patches/RustCrypto-hashes", branch = "patch-sha2-0.10.8", package = "sha2" }
201+
sha2 = { git = "https://github.com/ziren-patches/RustCrypto-hashes", branch = "patch-sha2-0.10.9", package = "sha2" }
195202
bn = { git = "https://github.com/ziren-patches/bn", branch = "patch-0.6.0", package = "substrate-bn" }
196203
k256 = { git = "https://github.com/ziren-patches/elliptic-curves", branch = "patch-k256-0.13.4" }
197204
p256 = { git = "https://github.com/ziren-patches/elliptic-curves", branch = "patch-p256-0.13.2" }
198-
alloy-primitives-v1-1-2 = { git = "https://github.com/ziren-patches/core.git", package = "alloy-primitives", branch = "patch-alloy-primitives-1.1.2" }
205+
alloy-primitives-v1-4-1 = { git = "https://github.com/ziren-patches/core.git", package = "alloy-primitives", branch = "patch-alloy-primitives-1.4.1" }

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The client input (witness) generated by executing against RPC can be cached to s
4747
cargo run -r --bin host -- --block-number <block-number> --chain-id <chain-id> --cache-dir /path/to/cache
4848

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

5353
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.

‎bin/eth-proofs/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ async fn main() -> eyre::Result<()> {
5555
let alerting_client = args.pager_duty_integration_key.map(AlertingClient::new);
5656

5757
let ws = WsConnect::new(args.ws_rpc_url);
58-
let ws_provider = ProviderBuilder::new().on_ws(ws).await?;
58+
let ws_provider = ProviderBuilder::new().connect_ws(ws).await?;
5959
let http_provider = create_provider(args.http_rpc_url);
6060
let debug_http_provider = create_provider(args.debug_http_rpc_url);
6161

0 commit comments

Comments
 (0)