From 61cc705cc258208055da751aa008865fb9e9dc3c Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Tue, 8 Oct 2024 23:08:38 +0200 Subject: [PATCH 1/9] Use gwyneth-reth for multi-chain block building! --- Cargo.lock | 298 ++++++++++-------- Cargo.toml | 35 +- crates/rbuilder/Cargo.toml | 6 +- .../src/backtest/backtest_build_block.rs | 2 +- crates/rbuilder/src/backtest/execute.rs | 4 +- .../resim_landed_block.rs | 4 + .../rbuilder/src/bin/debug-bench-machine.rs | 4 +- .../builders/block_building_helper.rs | 19 +- .../builders/mock_block_building_helper.rs | 10 +- crates/rbuilder/src/building/builders/mod.rs | 4 +- .../src/building/builders/ordering_builder.rs | 10 +- crates/rbuilder/src/building/evm_inspector.rs | 36 ++- crates/rbuilder/src/building/mod.rs | 18 +- crates/rbuilder/src/building/order_commit.rs | 33 +- crates/rbuilder/src/building/payout_tx.rs | 6 +- crates/rbuilder/src/building/sim.rs | 4 +- crates/rbuilder/src/live_builder/cli.rs | 4 +- crates/rbuilder/src/live_builder/config.rs | 4 +- .../src/live_builder/simulation/sim_worker.rs | 4 +- 19 files changed, 299 insertions(+), 206 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 939f5d6e..94377477 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -444,7 +444,6 @@ checksum = "d9ae4c4fbd37d9996f501fbc7176405aab97ae3a5772789be06ef0e7c4dad6dd" dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-rpc-types-trace", "alloy-serde", "serde", ] @@ -629,6 +628,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71c4d842beb7a6686d04125603bc57614d5ed78bf95e4753274db3db4ba95214" dependencies = [ + "alloy-json-abi", "alloy-sol-macro-input", "const-hex", "heck 0.5.0", @@ -647,11 +647,13 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1306e8d3c9e6e6ecf7a39ffaf7291e73a5f655a2defd366ee92c2efebcdf7fee" dependencies = [ + "alloy-json-abi", "const-hex", "dunce", "heck 0.5.0", "proc-macro2", "quote", + "serde_json", "syn 2.0.72", "syn-solidity", ] @@ -1365,7 +1367,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.11.0", "lazy_static", "lazycell", "proc-macro2", @@ -3874,6 +3876,60 @@ dependencies = [ "subtle", ] +[[package]] +name = "gwyneth" +version = "1.0.6" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +dependencies = [ + "alloy-rlp", + "alloy-serde", + "alloy-sol-types", + "eyre", + "futures", + "futures-util", + "jsonrpsee 0.24.3", + "reth-auto-seal-consensus", + "reth-basic-payload-builder", + "reth-beacon-consensus", + "reth-chainspec", + "reth-consensus", + "reth-db", + "reth-errors", + "reth-ethereum-engine-primitives", + "reth-ethereum-payload-builder", + "reth-evm", + "reth-evm-ethereum", + "reth-execution-types", + "reth-exex", + "reth-network", + "reth-node-api", + "reth-node-builder", + "reth-node-core", + "reth-node-ethereum", + "reth-node-events", + "reth-payload-builder", + "reth-primitives", + "reth-provider", + "reth-revm", + "reth-rpc", + "reth-rpc-api", + "reth-rpc-engine-api", + "reth-rpc-layer", + "reth-rpc-types", + "reth-tasks", + "reth-tokio-util", + "reth-tracing", + "reth-transaction-pool", + "reth-trie", + "revm", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tracing", +] + [[package]] name = "h2" version = "0.3.26" @@ -4630,15 +4686,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -6107,7 +6154,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 2.0.72", @@ -7803,7 +7850,7 @@ dependencies = [ [[package]] name = "reth" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "aquamarine", @@ -7813,6 +7860,7 @@ dependencies = [ "eyre", "fdlimit", "futures", + "gwyneth", "itertools 0.13.0", "libc", "metrics-process", @@ -7834,6 +7882,7 @@ dependencies = [ "reth-errors", "reth-ethereum-payload-builder", "reth-evm", + "reth-execution-errors", "reth-execution-types", "reth-exex", "reth-fs-util", @@ -7884,7 +7933,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -7912,7 +7961,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "futures-core", @@ -7935,7 +7984,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "futures", "itertools 0.13.0", @@ -7969,7 +8018,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "aquamarine", "linked_hash_set", @@ -8000,7 +8049,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -8012,7 +8061,7 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-signer", "alloy-signer-local", @@ -8038,7 +8087,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-chains", "alloy-eips", @@ -8058,7 +8107,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "ahash", "backon", @@ -8112,7 +8161,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-tasks", "tokio", @@ -8122,7 +8171,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-eips", "alloy-primitives 0.8.0", @@ -8137,7 +8186,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8153,7 +8202,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -8164,7 +8213,7 @@ dependencies = [ [[package]] name = "reth-config" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "eyre", "humantime-serde", @@ -8178,7 +8227,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "auto_impl", "derive_more 1.0.0", @@ -8188,7 +8237,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-chainspec", "reth-consensus", @@ -8198,7 +8247,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8221,7 +8270,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "bytes", "derive_more 1.0.0", @@ -8252,7 +8301,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "arbitrary", "bytes", @@ -8275,7 +8324,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-genesis", "boyer-moore-magiclen", @@ -8301,7 +8350,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "arbitrary", "bytes", @@ -8315,7 +8364,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "alloy-rlp", @@ -8339,7 +8388,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "alloy-rlp", @@ -8363,7 +8412,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "data-encoding", @@ -8385,7 +8434,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "futures", @@ -8412,7 +8461,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "aes", "alloy-primitives 0.8.0", @@ -8443,7 +8492,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-chainspec", "reth-payload-primitives", @@ -8453,7 +8502,7 @@ dependencies = [ [[package]] name = "reth-engine-service" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "futures", "pin-project", @@ -8477,7 +8526,7 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "futures", "metrics", @@ -8512,7 +8561,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "eyre", "futures", @@ -8542,7 +8591,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", @@ -8555,7 +8604,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "bytes", @@ -8580,7 +8629,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-chains", "alloy-genesis", @@ -8596,7 +8645,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-chainspec", "reth-consensus", @@ -8608,7 +8657,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "reth-chainspec", @@ -8626,7 +8675,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-chains", "alloy-primitives 0.8.0", @@ -8646,7 +8695,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-basic-payload-builder", "reth-errors", @@ -8666,7 +8715,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "rayon", "reth-db-api", @@ -8676,7 +8725,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-eips", "auto_impl", @@ -8694,7 +8743,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-eips", "alloy-sol-types", @@ -8706,13 +8755,14 @@ dependencies = [ "reth-primitives", "reth-prune-types", "reth-revm", + "reth-storage-api", "revm-primitives", ] [[package]] name = "reth-evm-optimism" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-chainspec", "reth-ethereum-forks", @@ -8732,7 +8782,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-eips", "alloy-primitives 0.8.0", @@ -8748,7 +8798,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-execution-errors", "reth-primitives", @@ -8759,7 +8809,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "eyre", "futures", @@ -8786,7 +8836,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "reth-provider", @@ -8795,7 +8845,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "serde", "serde_json", @@ -8805,7 +8855,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "async-trait", "bytes", @@ -8826,7 +8876,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -8842,7 +8892,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "bindgen", "cc", @@ -8851,7 +8901,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "futures", "metrics", @@ -8863,7 +8913,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "proc-macro2", "quote", @@ -8874,7 +8924,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", ] @@ -8882,7 +8932,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "futures-util", "reqwest 0.12.5", @@ -8894,7 +8944,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "aquamarine", @@ -8942,7 +8992,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "alloy-rpc-types-admin", @@ -8965,7 +9015,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "auto_impl", "derive_more 1.0.0", @@ -8983,7 +9033,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "alloy-rlp", @@ -8998,7 +9048,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -9012,7 +9062,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "anyhow", "bincode", @@ -9032,7 +9082,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-chainspec", "reth-db-api", @@ -9050,7 +9100,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-network", "aquamarine", @@ -9066,6 +9116,7 @@ dependencies = [ "reth-config", "reth-consensus", "reth-consensus-debug-client", + "reth-db", "reth-db-api", "reth-db-common", "reth-downloaders", @@ -9107,7 +9158,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-genesis", "alloy-rpc-types-engine", @@ -9157,7 +9208,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "eyre", "reth-auto-seal-consensus", @@ -9181,7 +9232,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rpc-types-engine", "futures", @@ -9203,7 +9254,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "eyre", "http 1.1.0", @@ -9227,7 +9278,7 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-chainspec", "reth-consensus", @@ -9239,12 +9290,12 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" [[package]] name = "reth-optimism-rpc" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "jsonrpsee-types 0.24.3", @@ -9276,7 +9327,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "futures-util", "metrics", @@ -9287,6 +9338,7 @@ dependencies = [ "reth-payload-primitives", "reth-primitives", "reth-provider", + "reth-revm", "reth-rpc-types", "reth-transaction-pool", "thiserror", @@ -9298,7 +9350,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-chain-state", "reth-chainspec", @@ -9314,7 +9366,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-chainspec", "reth-primitives", @@ -9325,7 +9377,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9361,7 +9413,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9385,7 +9437,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rpc-types-engine", "auto_impl", @@ -9424,7 +9476,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "itertools 0.13.0", @@ -9450,7 +9502,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "bytes", @@ -9464,7 +9516,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "reth-chainspec", "reth-consensus-common", @@ -9479,7 +9531,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-dyn-abi", "alloy-genesis", @@ -9535,7 +9587,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-json-rpc", "jsonrpsee 0.24.3", @@ -9549,7 +9601,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "http 1.1.0", "jsonrpsee 0.24.3", @@ -9582,7 +9634,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "async-trait", "jsonrpsee-core 0.24.3", @@ -9610,7 +9662,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-dyn-abi", "alloy-json-rpc", @@ -9647,7 +9699,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-sol-types", "derive_more 1.0.0", @@ -9685,7 +9737,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rpc-types-engine", "http 1.1.0", @@ -9698,7 +9750,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "jsonrpsee-core 0.24.3", @@ -9714,7 +9766,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "alloy-rpc-types", @@ -9734,7 +9786,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -9746,7 +9798,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "futures-util", "itertools 0.13.0", @@ -9780,7 +9832,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "aquamarine", @@ -9807,7 +9859,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "bytes", @@ -9820,7 +9872,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "parking_lot 0.12.3", @@ -9840,7 +9892,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-primitives 0.8.0", "clap", @@ -9852,7 +9904,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "auto_impl", "reth-chainspec", @@ -9868,7 +9920,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "derive_more 1.0.0", @@ -9879,7 +9931,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "auto_impl", "dyn-clone", @@ -9897,7 +9949,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "tokio", "tokio-stream", @@ -9907,7 +9959,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "clap", "eyre", @@ -9922,7 +9974,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "aquamarine", @@ -9954,7 +10006,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "auto_impl", @@ -9976,7 +10028,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -9999,7 +10051,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "auto_impl", @@ -10023,7 +10075,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-rlp", "derive_more 1.0.0", @@ -10047,8 +10099,7 @@ dependencies = [ [[package]] name = "revm" version = "14.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f719e28cc6fdd086f8bc481429e587740d20ad89729cec3f5f5dd7b655474df" +source = "git+https://github.com/taikoxyz/revm.git?branch=v43-gwyneth#959611e7a6ceeb693acffe00ba8e4d976591479f" dependencies = [ "auto_impl", "cfg-if", @@ -10062,11 +10113,11 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48184032103bb23788e42e42c7c85207f5b0b8a248b09ea8f5233077f35ab56e" +source = "git+https://github.com/taikoxyz/revm-inspectors.git?branch=main-rbuilder#a7db16ce222d58eac84cfeeed4b5a9541dadc1d0" dependencies = [ "alloy-primitives 0.8.0", - "alloy-rpc-types", + "alloy-rpc-types-eth", + "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", "colorchoice", @@ -10078,8 +10129,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "10.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "959ecbc36802de6126852479844737f20194cf8e6718e0c30697d306a2cca916" +source = "git+https://github.com/taikoxyz/revm.git?branch=v43-gwyneth#959611e7a6ceeb693acffe00ba8e4d976591479f" dependencies = [ "revm-primitives", "serde", @@ -10088,8 +10138,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e25f604cb9db593ca3013be8c00f310d6790ccb1b7d8fbbdd4660ec8888043a" +source = "git+https://github.com/taikoxyz/revm.git?branch=v43-gwyneth#959611e7a6ceeb693acffe00ba8e4d976591479f" dependencies = [ "aurora-engine-modexp", "blst", @@ -10107,8 +10156,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "9.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccb981ede47ccf87c68cebf1ba30cdbb7ec935233ea305f3dfff4c1e10ae541" +source = "git+https://github.com/taikoxyz/revm.git?branch=v43-gwyneth#959611e7a6ceeb693acffe00ba8e4d976591479f" dependencies = [ "alloy-eips", "alloy-primitives 0.8.0", diff --git a/Cargo.toml b/Cargo.toml index 351ba6d5..ca7627aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,4 +76,37 @@ alloy-rpc-types-engine = { version = "0.3.0", features = [ alloy-rpc-types-eth = { version = "0.3.0" } alloy-signer-local = { version = "0.3.0" } alloy-sol-types = { version = "0.8.0", default-features = false } -#alloy-contract = { version = "0.3.0", default-features = false } + +[patch.crates-io] +revm = { git = "https://github.com/taikoxyz/revm.git", branch = "v43-gwyneth", features = [ + "std", + "secp256k1", + "blst", +], default-features = false } +revm-primitives = { git = "https://github.com/taikoxyz/revm.git", branch = "v43-gwyneth", features = [ + "std", +], default-features = false } +revm-interpreter = { git = "https://github.com/taikoxyz/revm.git", branch = "v43-gwyneth" } +revm-precompile = { git = "https://github.com/taikoxyz/revm.git", branch = "v43-gwyneth" } +revm-inspectors = { git = "https://github.com/taikoxyz/revm-inspectors.git", branch = "main-rbuilder" } + +[patch."https://github.com/paradigmxyz/reth"] +reth = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-db = {git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-db-common = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-errors = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-libmdbx = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-payload-builder = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-node-api = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-trie = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-trie-parallel = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-basic-payload-builder = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-node-core = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-primitives = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-provider = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-chainspec = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-evm = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-evm-ethereum = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-db-api = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-execution-errors = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } +reth-trie-db = { git = "https://github.com/taikoxyz/taiko-reth", branch = "rbuilderV3" } diff --git a/crates/rbuilder/Cargo.toml b/crates/rbuilder/Cargo.toml index 66ab0590..8476fb93 100644 --- a/crates/rbuilder/Cargo.toml +++ b/crates/rbuilder/Cargo.toml @@ -7,11 +7,10 @@ build = "build.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -alloy-sol-types.workspace = true -#alloy-contract.workspace = true + ethers = { version = "2.0", features = ["ws", "rustls", "ipc"] } -web3 = "0.19.0" ethers-providers = { version = "2.0", features = ["ipc"] } +web3 = "0.19.0" rlp = "0.6.1" tokio = "1.38.0" serde = "1.0.188" @@ -56,6 +55,7 @@ alloy-consensus.workspace = true alloy-serde.workspace = true alloy-signer-local.workspace = true alloy-eips.workspace = true +alloy-sol-types.workspace = true ethereum_ssz_derive.workspace = true ethereum_ssz.workspace = true diff --git a/crates/rbuilder/src/backtest/backtest_build_block.rs b/crates/rbuilder/src/backtest/backtest_build_block.rs index 8062f565..8d460d28 100644 --- a/crates/rbuilder/src/backtest/backtest_build_block.rs +++ b/crates/rbuilder/src/backtest/backtest_build_block.rs @@ -344,7 +344,7 @@ fn print_onchain_block_data( println!( " {:>4} address: {:?>24}, key: {:?}", txs_to_idx.get(tx).unwrap(), - slot.address, + slot.address.1, slot.key ); } diff --git a/crates/rbuilder/src/backtest/execute.rs b/crates/rbuilder/src/backtest/execute.rs index 3fc77dde..2e1865c7 100644 --- a/crates/rbuilder/src/backtest/execute.rs +++ b/crates/rbuilder/src/backtest/execute.rs @@ -15,7 +15,7 @@ use alloy_primitives::{Address, U256}; use reth::providers::ProviderFactory; use reth_chainspec::ChainSpec; use reth_db::{database::Database, DatabaseEnv}; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use serde::{Deserialize, Serialize}; use std::sync::Arc; @@ -151,7 +151,7 @@ pub fn backtest_simulate_block( let simulated_total_gas = sim_orders.iter().map(|o| o.sim_value.gas_used).sum(); let mut builder_outputs = Vec::new(); - let mut cached_reads = Some(CachedReads::default()); + let mut cached_reads = Some(SyncCachedReads::default()); for building_algorithm_name in builders_names { let input = BacktestSimulateBlockInput { ctx: ctx.clone(), diff --git a/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs b/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs index cf600dbe..e8f2138f 100644 --- a/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs +++ b/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs @@ -6,10 +6,12 @@ use crate::utils::{extract_onchain_block_txs, find_suggested_fee_recipient}; use ahash::{HashMap, HashSet}; use alloy_primitives::{B256, I256}; use eyre::Context; +use reth::blockchain_tree::chain; use reth_chainspec::ChainSpec; use reth_db::DatabaseEnv; use reth_primitives::{Receipt, TransactionSignedEcRecovered, TxHash}; use reth_provider::ProviderFactory; +use revm_primitives::ChainAddress; use std::sync::Arc; #[derive(Debug)] @@ -60,6 +62,8 @@ pub fn sim_historical_block( let mut cumulative_blob_gas_used = 0; let mut written_slots: HashMap> = HashMap::default(); + let coinbase = ChainAddress(chain_spec.chain.id(), coinbase); + for (idx, tx) in txs.into_iter().enumerate() { let coinbase_balance_before = state.balance(coinbase)?; let mut accumulator_tracer = AccumulatorSimulationTracer::default(); diff --git a/crates/rbuilder/src/bin/debug-bench-machine.rs b/crates/rbuilder/src/bin/debug-bench-machine.rs index 5f9464c4..dd29b829 100644 --- a/crates/rbuilder/src/bin/debug-bench-machine.rs +++ b/crates/rbuilder/src/bin/debug-bench-machine.rs @@ -13,7 +13,7 @@ use rbuilder::{ utils::{extract_onchain_block_txs, find_suggested_fee_recipient, http_provider}, }; use reth::providers::BlockNumReader; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use reth_provider::StateProvider; use std::{path::PathBuf, sync::Arc, time::Instant}; use tracing::{debug, info}; @@ -85,7 +85,7 @@ async fn main() -> eyre::Result<()> { let mut build_times_ms = Vec::new(); let mut finalize_time_ms = Vec::new(); - let mut cached_reads = Some(CachedReads::default()); + let mut cached_reads = Some(SyncCachedReads::default()); for _ in 0..cli.iters { let ctx = ctx.clone(); let txs = txs.clone(); diff --git a/crates/rbuilder/src/building/builders/block_building_helper.rs b/crates/rbuilder/src/building/builders/block_building_helper.rs index 74e34ef3..d3aeec03 100644 --- a/crates/rbuilder/src/building/builders/block_building_helper.rs +++ b/crates/rbuilder/src/building/builders/block_building_helper.rs @@ -6,9 +6,10 @@ use ahash::HashMap; use alloy_primitives::U256; use reth::tasks::pool::BlockingTaskPool; use reth_db::database::Database; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use reth_primitives::format_ether; use reth_provider::{BlockNumReader, ProviderFactory, StateProvider}; +use revm_primitives::ChainAddress; use time::OffsetDateTime; use tokio_util::sync::CancellationToken; use tracing::{debug, error, trace}; @@ -68,7 +69,7 @@ pub trait BlockBuildingHelper: Send + Sync { ) -> Result; /// Useful if we want to give away this object but keep on building some other way. - fn clone_cached_reads(&self) -> CachedReads; + fn clone_cached_reads(&self) -> SyncCachedReads; /// BuiltBlockTrace for current state. fn built_block_trace(&self) -> &BuiltBlockTrace; @@ -77,7 +78,7 @@ pub trait BlockBuildingHelper: Send + Sync { fn building_context(&self) -> &BlockBuildingContext; /// Updates the cached reads for the block state. - fn update_cached_reads(&mut self, cached_reads: CachedReads); + fn update_cached_reads(&mut self, cached_reads: SyncCachedReads); } /// Implementation of BlockBuildingHelper based on a ProviderFactory @@ -141,7 +142,7 @@ impl BlockBuildingHelperError { pub struct FinalizeBlockResult { pub block: Block, /// Since finalize_block eats the object we need the cached_reads in case we create a new - pub cached_reads: CachedReads, + pub cached_reads: SyncCachedReads, } impl BlockBuildingHelperFromDB { @@ -156,7 +157,7 @@ impl BlockBuildingHelperFromDB { root_hash_task_pool: BlockingTaskPool, root_hash_config: RootHashConfig, building_ctx: HashMap, - cached_reads: Option, + cached_reads: Option, builder_name: String, discard_txs: bool, enforce_sorting: Option, @@ -283,7 +284,7 @@ impl BlockBuildingHelperFromDB { // we check the fee_recipient delta and make our bid include that! This is supposed to be what the relay will check. let fee_recipient_balance_after = self .block_state - .balance(self.building_ctx[&self.origin_chain_id].attributes.suggested_fee_recipient)?; + .balance(ChainAddress(self.origin_chain_id, self.building_ctx[&self.origin_chain_id].attributes.suggested_fee_recipient))?; let fee_recipient_balance_diff = fee_recipient_balance_after .checked_sub(self._fee_recipient_balance_start) .unwrap_or_default(); @@ -364,7 +365,7 @@ impl BlockBuildingHelper for BlockBuildingHelper let sim_gas_used = self.partial_block.tracer.used_gas; let mut blocks = HashMap::default(); - let mut cached_reads = CachedReads::default(); + let mut cached_reads = SyncCachedReads::default(); for (chain_id, provider_factory) in self.provider_factory.iter() { // TODO Brecht: fix if *chain_id == 160010 { @@ -443,7 +444,7 @@ impl BlockBuildingHelper for BlockBuildingHelper }) } - fn clone_cached_reads(&self) -> CachedReads { + fn clone_cached_reads(&self) -> SyncCachedReads { self.block_state.clone_cached_reads() } @@ -459,7 +460,7 @@ impl BlockBuildingHelper for BlockBuildingHelper Box::new(self.clone()) } - fn update_cached_reads(&mut self, cached_reads: CachedReads) { + fn update_cached_reads(&mut self, cached_reads: SyncCachedReads) { self.block_state = self.block_state.clone().with_cached_reads(cached_reads); } } diff --git a/crates/rbuilder/src/building/builders/mock_block_building_helper.rs b/crates/rbuilder/src/building/builders/mock_block_building_helper.rs index 3850a391..af72f8f2 100644 --- a/crates/rbuilder/src/building/builders/mock_block_building_helper.rs +++ b/crates/rbuilder/src/building/builders/mock_block_building_helper.rs @@ -6,7 +6,7 @@ use crate::{ primitives::SimulatedOrder, }; use alloy_primitives::U256; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use reth_primitives::SealedBlock; use time::OffsetDateTime; @@ -85,12 +85,12 @@ impl BlockBuildingHelper for MockBlockBuildingHelper { Ok(FinalizeBlockResult { block, - cached_reads: CachedReads::default(), + cached_reads: SyncCachedReads::default(), }) } - fn clone_cached_reads(&self) -> CachedReads { - CachedReads::default() + fn clone_cached_reads(&self) -> SyncCachedReads { + SyncCachedReads::default() } fn built_block_trace(&self) -> &BuiltBlockTrace { @@ -101,7 +101,7 @@ impl BlockBuildingHelper for MockBlockBuildingHelper { &self.block_building_context } - fn update_cached_reads(&mut self, _cached_reads: CachedReads) { + fn update_cached_reads(&mut self, _cached_reads: SyncCachedReads) { unimplemented!() } } diff --git a/crates/rbuilder/src/building/builders/mod.rs b/crates/rbuilder/src/building/builders/mod.rs index 52e1261c..c5b9c7c7 100644 --- a/crates/rbuilder/src/building/builders/mod.rs +++ b/crates/rbuilder/src/building/builders/mod.rs @@ -19,7 +19,7 @@ use reth::{ tasks::pool::BlockingTaskPool, }; use reth_db::database::Database; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use std::sync::Arc; use tokio::sync::{broadcast, broadcast::error::TryRecvError}; use tokio_util::sync::CancellationToken; @@ -230,7 +230,7 @@ pub struct BacktestSimulateBlockInput<'a, DB> { pub sbundle_mergeabe_signers: Vec
, pub sim_orders: &'a Vec, pub provider_factory: ProviderFactory, - pub cached_reads: Option, + pub cached_reads: Option, } /// Handles error from block filling stage. diff --git a/crates/rbuilder/src/building/builders/ordering_builder.rs b/crates/rbuilder/src/building/builders/ordering_builder.rs index 964a6356..71f0c567 100644 --- a/crates/rbuilder/src/building/builders/ordering_builder.rs +++ b/crates/rbuilder/src/building/builders/ordering_builder.rs @@ -23,7 +23,7 @@ use tokio_util::sync::CancellationToken; use crate::{roothash::RootHashConfig, utils::check_provider_factory_health}; use reth::tasks::pool::BlockingTaskPool; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use serde::Deserialize; use std::{os::unix::fs::lchown, time::{Duration, Instant}}; use tracing::{error, info_span, trace}; @@ -131,7 +131,7 @@ pub fn run_ordering_builder( pub fn backtest_simulate_block( ordering_config: OrderingBuilderConfig, input: BacktestSimulateBlockInput<'_, DB>, -) -> eyre::Result<(Block, CachedReads)> { +) -> eyre::Result<(Block, SyncCachedReads)> { let mut provider_factories = HashMap::default(); provider_factories.insert(input.ctx.chain_spec.chain.id(), input.provider_factory.clone()); @@ -186,7 +186,7 @@ pub struct OrderingBuilderContext { root_hash_config: RootHashConfig, // caches - cached_reads: Option, + cached_reads: Option, // scratchpad failed_orders: HashSet, @@ -215,14 +215,14 @@ impl OrderingBuilderContext { } } - pub fn with_cached_reads(self, cached_reads: CachedReads) -> Self { + pub fn with_cached_reads(self, cached_reads: SyncCachedReads) -> Self { Self { cached_reads: Some(cached_reads), ..self } } - pub fn take_cached_reads(&mut self) -> Option { + pub fn take_cached_reads(&mut self) -> Option { self.cached_reads.take() } diff --git a/crates/rbuilder/src/building/evm_inspector.rs b/crates/rbuilder/src/building/evm_inspector.rs index 073c5889..4c212145 100644 --- a/crates/rbuilder/src/building/evm_inspector.rs +++ b/crates/rbuilder/src/building/evm_inspector.rs @@ -3,13 +3,14 @@ use alloy_primitives::{Address, B256, U256}; use reth_primitives::TransactionSignedEcRecovered; use revm::{ interpreter::{opcode, CallInputs, CallOutcome, Interpreter}, - Database, EvmContext, Inspector, + Database, EvmContext, Inspector, SyncDatabase, }; use revm_inspectors::access_list::AccessListInspector; +use revm_primitives::ChainAddress; #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)] pub struct SlotKey { - pub address: Address, + pub address: ChainAddress, pub key: B256, } @@ -23,12 +24,12 @@ pub struct UsedStateTrace { /// write slot values contains last write pub written_slot_values: HashMap, /// balance of first read - pub read_balances: HashMap, + pub read_balances: HashMap, /// number of `wei` sent or received during execution - pub received_amount: HashMap, - pub sent_amount: HashMap, - pub created_contracts: Vec
, - pub destructed_contracts: Vec
, + pub received_amount: HashMap, + pub sent_amount: HashMap, + pub created_contracts: Vec, + pub destructed_contracts: Vec, } #[derive(Debug, Clone, Default)] @@ -36,7 +37,7 @@ enum NextStepAction { #[default] None, ReadSloadKeyResult(B256), - ReadBalanceResult(Address), + ReadBalanceResult(ChainAddress), } #[derive(Debug)] @@ -57,16 +58,17 @@ impl<'a> UsedStateEVMInspector<'a> { /// Txs with the same nonce are in conflict and origin address is EOA that does not have storage. /// We convert nonce change to the slot 0 read and write of the signer fn use_tx_nonce(&mut self, tx: &TransactionSignedEcRecovered) { + let signer = ChainAddress(tx.chain_id().unwrap(), tx.signer()); self.used_state_trace.read_slot_values.insert( SlotKey { - address: tx.signer(), + address: signer, key: Default::default(), }, U256::from(tx.nonce()).into(), ); self.used_state_trace.written_slot_values.insert( SlotKey { - address: tx.signer(), + address: signer, key: Default::default(), }, U256::from(tx.nonce() + 1).into(), @@ -76,7 +78,7 @@ impl<'a> UsedStateEVMInspector<'a> { impl<'a, DB> Inspector for UsedStateEVMInspector<'a> where - DB: Database, + DB: SyncDatabase, { fn step(&mut self, interpreter: &mut Interpreter, _: &mut EvmContext) { match std::mem::take(&mut self.next_step_action) { @@ -134,7 +136,7 @@ where opcode::BALANCE => { if let Ok(addr) = interpreter.stack().peek(0) { let addr = Address::from_word(B256::from(addr.to_be_bytes())); - self.next_step_action = NextStepAction::ReadBalanceResult(addr); + self.next_step_action = NextStepAction::ReadBalanceResult(ChainAddress(interpreter.chain_id, addr)); } } opcode::SELFBALANCE => { @@ -165,17 +167,17 @@ where fn create_end( &mut self, - _: &mut EvmContext, + ctx: &mut EvmContext, _: &revm::interpreter::CreateInputs, outcome: revm::interpreter::CreateOutcome, ) -> revm::interpreter::CreateOutcome { if let Some(addr) = outcome.address { - self.used_state_trace.created_contracts.push(addr); + self.used_state_trace.created_contracts.push(ChainAddress(ctx.env.cfg.chain_id, addr)); } outcome } - fn selfdestruct(&mut self, contract: Address, target: Address, value: U256) { + fn selfdestruct(&mut self, contract: ChainAddress, target: ChainAddress, value: U256) { // selfdestruct can be called multiple times during transaction execution if self .used_state_trace @@ -238,7 +240,7 @@ impl<'a> RBuilderEVMInspector<'a> { impl<'a, DB> Inspector for RBuilderEVMInspector<'a> where - DB: Database, + DB: SyncDatabase, UsedStateEVMInspector<'a>: Inspector, { #[inline] @@ -277,7 +279,7 @@ where } #[inline] - fn selfdestruct(&mut self, contract: Address, target: Address, value: U256) { + fn selfdestruct(&mut self, contract: ChainAddress, target: ChainAddress, value: U256) { if let Some(used_state_inspector) = &mut self.used_state_inspector { used_state_inspector.selfdestruct(contract, target, value) } diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index 09bffb1e..7f68a523 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -13,6 +13,7 @@ pub mod tracers; pub use block_orders::BlockOrders; use eth_sparse_mpt::SparseTrieSharedCache; use reth_primitives::proofs::calculate_requests_root; +use revm_primitives::ChainAddress; use crate::{ primitives::{Order, OrderId, SimValue, SimulatedOrder, TransactionSignedEcRecoveredWithBlobs}, @@ -41,7 +42,7 @@ use reth_evm::system_calls::{ }; use reth_evm_ethereum::{eip6110::parse_deposits_from_receipts, revm_spec, EthEvmConfig}; use reth_node_api::PayloadBuilderAttributes; -use reth_payload_builder::{database::CachedReads, EthPayloadBuilderAttributes}; +use reth_payload_builder::{database::{CachedReads, SyncCachedReads}, EthPayloadBuilderAttributes}; use revm::{ db::states::bundle_state::BundleRetention::{self, PlainState}, primitives::{BlobExcessGasAndPrice, BlockEnv, CfgEnvWithHandlerCfg, SpecId}, @@ -100,7 +101,7 @@ impl BlockBuildingContext { ) .expect("PayloadBuilderAttributes::try_new"); let (initialized_cfg, mut block_env) = attributes.cfg_and_block_env(&chain_spec, parent); - block_env.coinbase = signer.address; + block_env.coinbase = ChainAddress(chain_spec.chain.id(), signer.address); if let Some(desired_limit) = prefer_gas_limit { block_env.gas_limit = U256::from(calc_gas_limit(block_env.gas_limit.to(), desired_limit)); @@ -172,7 +173,7 @@ impl BlockBuildingContext { }; let block_env = BlockEnv { number: U256::from(block_number), - coinbase, + coinbase: ChainAddress(chain_spec.chain.id(), coinbase), timestamp: U256::from(onchain_block.header.timestamp), difficulty: onchain_block.header.difficulty, prevrandao: onchain_block.header.mix_hash, @@ -250,7 +251,7 @@ impl BlockBuildingContext { pub fn modify_use_suggested_fee_recipient_as_coinbase(&mut self) { self.builder_signer = None; - self.block_env.coinbase = self.attributes.suggested_fee_recipient; + self.block_env.coinbase = ChainAddress(self.chain_spec.chain.id(), self.attributes.suggested_fee_recipient); } pub fn timestamp(&self) -> OffsetDateTime { @@ -263,7 +264,7 @@ impl BlockBuildingContext { } pub fn coinbase_is_suggested_fee_recipient(&self) -> bool { - self.block_env.coinbase == self.attributes.suggested_fee_recipient + self.block_env.coinbase == ChainAddress(self.chain_spec.chain.id(), self.attributes.suggested_fee_recipient) } } @@ -404,7 +405,7 @@ impl ExecutionError { pub struct FinalizeResult { pub sealed_block: SealedBlock, - pub cached_reads: CachedReads, + pub cached_reads: SyncCachedReads, // sidecars for all txs in SealedBlock pub txs_blob_sidecars: Vec>, } @@ -552,7 +553,7 @@ impl PartialBlock { //println!("insert_proposer_payout_tx: builder_signer: {:?}", builder_signer); self.free_reserved_gas(); let nonce = state - .nonce(builder_signer.address) + .nonce(ChainAddress(ctx.chain_spec.chain.id(), builder_signer.address)) .map_err(CriticalCommitOrderError::Reth)?; let tx = create_payout_tx( ctx.chain_spec.as_ref(), @@ -649,6 +650,7 @@ impl PartialBlock { let (cached_reads, bundle) = state.clone_bundle_and_cache(); let execution_outcome = ExecutionOutcome::new( + Some(ctx.chain_spec.chain.id()), bundle, Receipts::from(vec![self .receipts @@ -715,7 +717,7 @@ impl PartialBlock { let header = Header { parent_hash: ctx.attributes.parent, ommers_hash: EMPTY_OMMER_ROOT_HASH, - beneficiary: ctx.block_env.coinbase, + beneficiary: ctx.block_env.coinbase.1, state_root, transactions_root, receipts_root, diff --git a/crates/rbuilder/src/building/order_commit.rs b/crates/rbuilder/src/building/order_commit.rs index a12ebe00..0fba3af6 100644 --- a/crates/rbuilder/src/building/order_commit.rs +++ b/crates/rbuilder/src/building/order_commit.rs @@ -12,9 +12,9 @@ use crate::{ use alloy_primitives::{Address, B256, U256}; -use reth::revm::database::StateProviderDatabase; +use reth::revm::database::{StateProviderDatabase, SyncStateProviderDatabase}; use reth_errors::ProviderError; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use reth_primitives::{ constants::eip4844::{DATA_GAS_PER_BLOB, MAX_DATA_GAS_PER_BLOCK}, transaction::FillTxEnv, @@ -24,9 +24,9 @@ use reth_provider::{StateProvider, StateProviderBox}; use revm::{ db::{states::bundle_state::BundleRetention, BundleState}, inspector_handle_register, - primitives::{db::WrapDatabaseRef, EVMError, Env, ExecutionResult, InvalidTransaction, TxEnv}, - Database, DatabaseCommit, State, + primitives::{db::WrapDatabaseRef, EVMError, Env, ExecutionResult, InvalidTransaction, TxEnv}, DatabaseCommit, State, SyncDatabase as Database, }; +use revm_primitives::ChainAddress; use crate::building::evm_inspector::{RBuilderEVMInspector, UsedStateTrace}; use std::{sync::Arc}; @@ -36,7 +36,7 @@ use thiserror::Error; #[derive(Clone)] pub struct BlockState { providers: HashMap>, - cached_reads: CachedReads, + cached_reads: SyncCachedReads, bundle_state: Option, } @@ -50,7 +50,7 @@ impl BlockState { pub fn new_arc(providers: HashMap>) -> Self { Self { providers, - cached_reads: CachedReads::default(), + cached_reads: SyncCachedReads::default(), bundle_state: Some(BundleState::default()), } } @@ -69,7 +69,7 @@ impl BlockState { self.providers[&chain_id].clone() } - pub fn with_cached_reads(mut self, cached_reads: CachedReads) -> Self { + pub fn with_cached_reads(mut self, cached_reads:SyncCachedReads) -> Self { self.cached_reads = cached_reads; self } @@ -79,11 +79,11 @@ impl BlockState { self } - pub fn into_parts(self) -> (CachedReads, BundleState, HashMap>) { + pub fn into_parts(self) -> (SyncCachedReads, BundleState, HashMap>) { (self.cached_reads, self.bundle_state.unwrap(), self.providers) } - pub fn clone_bundle_and_cache(&self) -> (CachedReads, BundleState) { + pub fn clone_bundle_and_cache(&self) -> (SyncCachedReads, BundleState) { ( self.cached_reads.clone(), self.bundle_state.clone().unwrap(), @@ -92,7 +92,10 @@ impl BlockState { pub fn new_db_ref(&mut self) -> BlockStateDBRef + '_> { // TODO: Brecht fix - let state_provider = StateProviderDatabase::new(&self.providers[&167010]); + let state_provider = SyncStateProviderDatabase::new( + Some(167010), + StateProviderDatabase(&self.providers[&167010]) + ); let cachedb = WrapDatabaseRef(self.cached_reads.as_db(state_provider)); let bundle_state = self.bundle_state.take().unwrap(); let db = State::builder() @@ -103,7 +106,7 @@ impl BlockState { BlockStateDBRef::new(db, &mut self.bundle_state) } - pub fn balance(&mut self, address: Address) -> Result { + pub fn balance(&mut self, address: ChainAddress) -> Result { let mut db = self.new_db_ref(); Ok(db .as_mut() @@ -112,7 +115,7 @@ impl BlockState { .unwrap_or_default()) } - pub fn nonce(&mut self, address: Address) -> Result { + pub fn nonce(&mut self, address: ChainAddress) -> Result { let mut db = self.new_db_ref(); Ok(db .as_mut() @@ -121,7 +124,7 @@ impl BlockState { .unwrap_or_default()) } - pub fn code_hash(&mut self, address: Address) -> Result { + pub fn code_hash(&mut self, address: ChainAddress) -> Result { let mut db = self.new_db_ref(); Ok(db .as_mut() @@ -130,7 +133,7 @@ impl BlockState { .unwrap_or_else(|| KECCAK_EMPTY)) } - pub fn clone_cached_reads(&self) -> CachedReads { + pub fn clone_cached_reads(&self) -> SyncCachedReads { self.cached_reads.clone() } } @@ -688,7 +691,7 @@ impl<'a, 'b, Tracer: SimulationTracer> PartialBlockFork<'a, 'b, Tracer> { return Ok(Err(BundleErr::NoSigner)); }; - let nonce = self.state.nonce(builder_signer.address)?; + let nonce = self.state.nonce(ChainAddress(ctx.chain_spec.chain.id(), builder_signer.address))?; let payout_tx = match create_payout_tx( ctx.chain_spec.as_ref(), ctx.block_env.basefee, diff --git a/crates/rbuilder/src/building/payout_tx.rs b/crates/rbuilder/src/building/payout_tx.rs index 739b62ce..4d0973e9 100644 --- a/crates/rbuilder/src/building/payout_tx.rs +++ b/crates/rbuilder/src/building/payout_tx.rs @@ -8,7 +8,7 @@ use reth_primitives::{ transaction::FillTxEnv, Transaction, TransactionSignedEcRecovered, TxEip1559, TxKind as TransactionKind, KECCAK_EMPTY, }; -use revm_primitives::{EVMError, Env, ExecutionResult, TxEnv}; +use revm_primitives::{ChainAddress, EVMError, Env, ExecutionResult, TxEnv}; pub fn create_payout_tx( chain_spec: &ChainSpec, @@ -55,7 +55,7 @@ pub fn insert_test_payout_tx( println!("builder_signer: {:?}", builder_signer); - let nonce = state.nonce(builder_signer.address)?; + let nonce = state.nonce(ChainAddress(ctx.chain_spec.chain.id(), builder_signer.address))?; let mut cfg = ctx.initialized_cfg.clone(); // disable balance check so we can estimate the gas cost without having any funds @@ -119,7 +119,7 @@ pub fn estimate_payout_gas_limit( gas_used: u64, ) -> Result { tracing::trace!(address = ?to, "Estimating payout gas"); - if state.code_hash(to)? == KECCAK_EMPTY { + if state.code_hash(ChainAddress(ctx.chain_spec.chain.id(), to))? == KECCAK_EMPTY { return Ok(21_000); } diff --git a/crates/rbuilder/src/building/sim.rs b/crates/rbuilder/src/building/sim.rs index 6f504262..e4fbf0b6 100644 --- a/crates/rbuilder/src/building/sim.rs +++ b/crates/rbuilder/src/building/sim.rs @@ -13,7 +13,7 @@ use rand::seq::SliceRandom; use reth::providers::ProviderFactory; use reth_db::database::Database; use reth_errors::ProviderError; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use reth_provider::StateProvider; use std::{ cmp::{max, min, Ordering}, @@ -338,7 +338,7 @@ pub fn simulate_all_orders_with_sim_tree( ctx.chain_spec.chain.id(), Arc::::from(factory.history_by_block_hash(ctx.attributes.parent)?), ); - let mut cache_reads = Some(CachedReads::default()); + let mut cache_reads = Some(SyncCachedReads::default()); loop { // mix new orders into the sim_tree if randomize_insertion && !orders.is_empty() { diff --git a/crates/rbuilder/src/live_builder/cli.rs b/crates/rbuilder/src/live_builder/cli.rs index aa30060e..d4932a67 100644 --- a/crates/rbuilder/src/live_builder/cli.rs +++ b/crates/rbuilder/src/live_builder/cli.rs @@ -2,7 +2,7 @@ use std::{path::PathBuf, sync::Arc}; use clap::Parser; use reth_db::DatabaseEnv; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use tokio::signal::ctrl_c; use tokio_util::sync::CancellationToken; @@ -52,7 +52,7 @@ pub trait LiveBuilderConfig: std::fmt::Debug + serde::de::DeserializeOwned { &self, building_algorithm_name: &str, input: BacktestSimulateBlockInput<'_, Arc>, - ) -> eyre::Result<(Block, CachedReads)>; + ) -> eyre::Result<(Block, SyncCachedReads)>; } /// print_version_info func that will be called on command Cli::Version diff --git a/crates/rbuilder/src/live_builder/config.rs b/crates/rbuilder/src/live_builder/config.rs index 968bc7a0..b20571d3 100644 --- a/crates/rbuilder/src/live_builder/config.rs +++ b/crates/rbuilder/src/live_builder/config.rs @@ -46,7 +46,7 @@ use eyre::Context; use reth::tasks::pool::BlockingTaskPool; use reth_chainspec::{Chain, ChainSpec, NamedChain}; use reth_db::DatabaseEnv; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use reth_primitives::StaticFileSegment; use reth_provider::StaticFileProviderFactory; use serde::Deserialize; @@ -364,7 +364,7 @@ impl LiveBuilderConfig for Config { &self, building_algorithm_name: &str, input: BacktestSimulateBlockInput<'_, Arc>, - ) -> eyre::Result<(Block, CachedReads)> { + ) -> eyre::Result<(Block, SyncCachedReads)> { let builder_cfg = self.builder(building_algorithm_name)?; match builder_cfg.builder { SpecificBuilderConfig::OrderingBuilder(config) => { diff --git a/crates/rbuilder/src/live_builder/simulation/sim_worker.rs b/crates/rbuilder/src/live_builder/simulation/sim_worker.rs index a711f4fa..b6ad9b6d 100644 --- a/crates/rbuilder/src/live_builder/simulation/sim_worker.rs +++ b/crates/rbuilder/src/live_builder/simulation/sim_worker.rs @@ -10,7 +10,7 @@ use crate::{ }; use ahash::HashMap; use reth_db::database::Database; -use reth_payload_builder::database::CachedReads; +use reth_payload_builder::database::{CachedReads, SyncCachedReads}; use std::{ sync::{Arc, Mutex}, thread::sleep, @@ -59,7 +59,7 @@ pub fn run_sim_worker( } }; - let mut cached_reads = CachedReads::default(); + let mut cached_reads = SyncCachedReads::default(); let mut last_sim_finished = Instant::now(); while let Ok(task) = current_sim_context.requests.recv() { let sim_thread_wait_time = last_sim_finished.elapsed(); From 2cdbd6de1144a56b49f7654ddf9bcff3a4c05743 Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Wed, 9 Oct 2024 00:50:41 +0200 Subject: [PATCH 2/9] update alloy to fix issue with std in 0.8.0 --- Cargo.lock | 249 ++++++++++++++++++++++++++++++++--------------------- Cargo.toml | 12 +-- 2 files changed, 152 insertions(+), 109 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 94377477..1afe797c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,7 +126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4177d135789e282e925092be8939d421b701c6d92c0a16679faa659d9166289d" dependencies = [ "alloy-eips", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "alloy-serde", "arbitrary", @@ -141,7 +141,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba5b68572f5dfa99ede0a491d658c9842626c956b840d0b97d0bbc9637742504" dependencies = [ "alloy-json-abi", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-sol-type-parser", "alloy-sol-types", "const-hex", @@ -158,7 +158,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "arbitrary", "rand 0.8.5", @@ -171,7 +171,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37d319bb544ca6caeab58c39cea8921c55d924d4f68f2c60f24f914673f9a74a" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "arbitrary", "k256 0.13.3", @@ -187,7 +187,7 @@ checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" dependencies = [ "alloy-eip2930", "alloy-eip7702", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "alloy-serde", "arbitrary", @@ -206,18 +206,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b85dfc693e4a1193f0372a8f789df12ab51fcbe7be0733baa04939a86dd813b" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-serde", "serde", ] [[package]] name = "alloy-json-abi" -version = "0.8.0" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "299d2a937b6c60968df3dad2a988b0f0e03277b344639a4f7a31bd68e6285e59" +checksum = "03c66eec1acdd96b39b995b8f5ee5239bc0c871d62c527ae1ac9fd1d7fecd455" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-sol-type-parser", "serde", "serde_json", @@ -229,7 +229,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4207166c79cfdf7f3bed24bbc84f5c7c5d4db1970f8c82e3fcc76257f16d2166" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-sol-types", "serde", "serde_json", @@ -247,7 +247,7 @@ dependencies = [ "alloy-eips", "alloy-json-rpc", "alloy-network-primitives", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rpc-types-eth", "alloy-serde", "alloy-signer", @@ -264,7 +264,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396c07726030fa0f9dab5da8c71ccd69d5eb74a7fe1072b7ae453a67e4fe553e" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-serde", "serde", ] @@ -276,7 +276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c847311cc7386684ef38ab404069d795bee07da945f63d884265436870a17276" dependencies = [ "alloy-genesis", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "k256 0.13.3", "serde_json", "tempfile", @@ -309,9 +309,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.0" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a767e59c86900dd7c3ce3ecef04f3ace5ac9631ee150beb8b7d22f7fa3bbb2d7" +checksum = "8ecb848c43f6b06ae3de2e4a67496cbbabd78ae87db0f1248934f15d76192c6a" dependencies = [ "alloy-rlp", "arbitrary", @@ -319,17 +319,23 @@ dependencies = [ "cfg-if", "const-hex", "derive_arbitrary", - "derive_more 0.99.18", + "derive_more 1.0.0", + "foldhash", "getrandom 0.2.15", + "hashbrown 0.15.0", "hex-literal", + "indexmap 2.6.0", "itoa", "k256 0.13.3", "keccak-asm", + "paste", "proptest", "proptest-derive", "rand 0.8.5", "ruint", + "rustc-hash 2.0.0", "serde", + "sha3", "tiny-keccak", ] @@ -345,7 +351,7 @@ dependencies = [ "alloy-json-rpc", "alloy-network", "alloy-network-primitives", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-eth", @@ -377,7 +383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa73f976e7b6341f3f8a404241cf04f883d40212cd4f2633c66d99de472e262c" dependencies = [ "alloy-json-rpc", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-transport", "bimap", "futures", @@ -418,7 +424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02378418a429f8a14a0ad8ffaa15b2d25ff34914fc4a1e366513c6a3800e03b3" dependencies = [ "alloy-json-rpc", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-pubsub", "alloy-transport", "alloy-transport-http", @@ -455,7 +461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "594b7cb723759c7b438c95a3bbd2e391760c03ee857443070758aaf2593ae84e" dependencies = [ "alloy-genesis", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "serde", "serde_json", ] @@ -466,7 +472,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "140b079c6fda14d9586432bf988b46ac0e04871ca313c9e00aa85cc808105e8a" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-serde", "serde", ] @@ -478,7 +484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e7081d2206dca51ce23a06338d78d9b536931cc3f15134fc1c6535eb2b77f18" dependencies = [ "alloy-eips", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rpc-types-engine", "ethereum_ssz", "ethereum_ssz_derive", @@ -495,7 +501,7 @@ checksum = "1464c4dd646e1bdfde86ae65ce5ba168dbb29180b478011fe87117ae46b1629b" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "alloy-serde", "derive_more 1.0.0", @@ -516,7 +522,7 @@ dependencies = [ "alloy-consensus", "alloy-eips", "alloy-network-primitives", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "alloy-serde", "alloy-sol-types", @@ -534,7 +540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e8cb848b66617f7d58b576bfc416854c4e9ae8d35e14f5077c0c779048f280" dependencies = [ "alloy-eips", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-serde", "serde", "serde_json", @@ -546,7 +552,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16cca915e0aab3b2657b4f9efe02eb88e5483905fb6d244749652aae14e5f92e" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rpc-types-eth", "alloy-serde", "serde", @@ -560,7 +566,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68eede4bd722bb872222efbbfbccc8f9b86e597143934b8ce556d3e0487bb662" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rpc-types-eth", "alloy-serde", "serde", @@ -572,7 +578,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae417978015f573b4a8c02af17f88558fb22e3fccd12e8a910cf6a2ff331cfcb" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "arbitrary", "serde", "serde_json", @@ -584,7 +590,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750c9b61ac0646f8f4a61231c2732a337b2c829866fc9a191b96b7eedf80ffe" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "async-trait", "auto_impl", "elliptic-curve 0.13.8", @@ -600,7 +606,7 @@ checksum = "7c640f9343e8f741f837c345c5ea30239ba77938b3691b884c736834853bd16c" dependencies = [ "alloy-consensus", "alloy-network", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-signer", "async-trait", "k256 0.13.3", @@ -610,13 +616,13 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.8.0" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183bcfc0f3291d9c41a3774172ee582fb2ce6eb6569085471d8f225de7bb86fc" +checksum = "661c516eb1fa3294cc7f2fb8955b3b609d639c282ac81a4eedb14d3046db503a" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.72", @@ -624,16 +630,16 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.8.0" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c4d842beb7a6686d04125603bc57614d5ed78bf95e4753274db3db4ba95214" +checksum = "ecbabb8fc3d75a0c2cea5215be22e7a267e3efde835b0f2a8922f5e3f5d47683" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", "const-hex", "heck 0.5.0", - "indexmap 2.2.6", - "proc-macro-error", + "indexmap 2.6.0", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.72", @@ -643,9 +649,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.8.0" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1306e8d3c9e6e6ecf7a39ffaf7291e73a5f655a2defd366ee92c2efebcdf7fee" +checksum = "16517f2af03064485150d89746b8ffdcdbc9b6eeb3d536fb66efd7c2846fbc75" dependencies = [ "alloy-json-abi", "const-hex", @@ -660,9 +666,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "0.8.0" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4691da83dce9c9b4c775dd701c87759f173bd3021cbf2e60cde00c5fe6d7241" +checksum = "c07ebb0c1674ff8cbb08378d7c2e0e27919d2a2dae07ad3bca26174deda8d389" dependencies = [ "serde", "winnow 0.6.15", @@ -670,12 +676,12 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.0" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "577e262966e92112edbd15b1b2c0947cc434d6e8311df96d3329793fe8047da9" +checksum = "8e448d879903624863f608c552d10efb0e0905ddbee98b0049412799911eb062" dependencies = [ "alloy-json-abi", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-sol-macro", "const-hex", "serde", @@ -758,7 +764,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "398a977d774db13446b8cead8cfa9517aebf9e03fc8a1512892dc1e03e70bb04" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "arbitrary", "derive_arbitrary", @@ -2958,7 +2964,7 @@ name = "eth-sparse-mpt" version = "0.1.0" source = "git+https://github.com/flashbots/eth-sparse-mpt?rev=664759b#664759b53d92e64d9a2e902100691b7ff4945ece" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "alloy-trie", "hash-db", @@ -3058,7 +3064,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e999563461faea0ab9bc0024e5e66adcee35881f3d5062f52f31a4070fe1522" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "itertools 0.13.0", "smallvec", ] @@ -3476,6 +3482,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -3942,7 +3954,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3961,7 +3973,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.2.6", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -4014,6 +4026,16 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "foldhash", + "serde", +] + [[package]] name = "hashers" version = "1.0.1" @@ -4546,12 +4568,13 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ + "arbitrary", "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -5638,7 +5661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" dependencies = [ "base64 0.22.1", - "indexmap 2.2.6", + "indexmap 2.6.0", "metrics", "metrics-util", "quanta", @@ -5670,7 +5693,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.14.5", - "indexmap 2.2.6", + "indexmap 2.6.0", "metrics", "num_cpus", "ordered-float", @@ -6154,7 +6177,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.72", @@ -6218,7 +6241,7 @@ checksum = "3041068147bb9abce8973644991e11c075fa8a7931a272bc8eb935971a2d03d7" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "alloy-serde", "derive_more 1.0.0", @@ -6235,7 +6258,7 @@ dependencies = [ "alloy-consensus", "alloy-eips", "alloy-network", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rpc-types-eth", "op-alloy-consensus", "op-alloy-rpc-types", @@ -6248,7 +6271,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f57a192b16bd94296637616908a5701d4318d6c2c5119c93a1df5442ec97c13" dependencies = [ "alloy-network", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rpc-types-eth", "alloy-serde", "op-alloy-consensus", @@ -6262,7 +6285,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ea246be3da604d2f68e86cc510cf05219db0ed24273ebd59d86065971ba0e3f" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rpc-types-engine", "alloy-serde", "serde", @@ -6580,7 +6603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.6.0", ] [[package]] @@ -6845,7 +6868,7 @@ dependencies = [ "comfy-table", "either", "hashbrown 0.14.5", - "indexmap 2.2.6", + "indexmap 2.6.0", "num-traits", "once_cell", "polars-arrow", @@ -6936,7 +6959,7 @@ dependencies = [ "argminmax", "arrow2", "either", - "indexmap 2.2.6", + "indexmap 2.6.0", "memchr", "polars-arrow", "polars-core", @@ -7144,7 +7167,7 @@ checksum = "70c501afe3a2e25c9bd219aa56ec1e04cdb3fcdd763055be268778c13fa82c1f" dependencies = [ "autocfg", "equivalent", - "indexmap 2.2.6", + "indexmap 2.6.0", ] [[package]] @@ -7190,6 +7213,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -7410,6 +7455,7 @@ dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.4", + "serde", ] [[package]] @@ -7539,7 +7585,7 @@ dependencies = [ "alloy-json-rpc", "alloy-network", "alloy-node-bindings", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-provider", "alloy-pubsub", "alloy-rlp", @@ -8092,7 +8138,7 @@ dependencies = [ "alloy-chains", "alloy-eips", "alloy-genesis", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-trie", "auto_impl", "derive_more 1.0.0", @@ -8174,7 +8220,7 @@ version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-eips", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "eyre", "libc", "rand 0.8.5", @@ -8191,7 +8237,7 @@ dependencies = [ "alloy-consensus", "alloy-eips", "alloy-genesis", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-trie", "bytes", "modular-bitfield", @@ -8366,7 +8412,7 @@ name = "reth-discv4" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "discv5", "enr 0.12.1", @@ -8390,7 +8436,7 @@ name = "reth-discv5" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "derive_more 1.0.0", "discv5", @@ -8414,7 +8460,7 @@ name = "reth-dns-discovery" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "data-encoding", "enr 0.12.1", "linked_hash_set", @@ -8464,7 +8510,7 @@ version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "aes", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "block-padding", "byteorder", @@ -8678,7 +8724,7 @@ version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-chains", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "arbitrary", "auto_impl", @@ -8785,7 +8831,7 @@ version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ "alloy-eips", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "derive_more 1.0.0", "nybbles", @@ -8838,7 +8884,7 @@ name = "reth-exex-types" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "reth-provider", ] @@ -8882,7 +8928,7 @@ dependencies = [ "byteorder", "dashmap 6.0.1", "derive_more 1.0.0", - "indexmap 2.2.6", + "indexmap 2.6.0", "parking_lot 0.12.3", "reth-mdbx-sys", "thiserror", @@ -8926,7 +8972,7 @@ name = "reth-net-banlist" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", ] [[package]] @@ -8994,7 +9040,7 @@ name = "reth-network-api" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rpc-types-admin", "auto_impl", "derive_more 1.0.0", @@ -9035,7 +9081,7 @@ name = "reth-network-peers" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "enr 0.12.1", "secp256k1 0.29.0", @@ -9297,7 +9343,7 @@ name = "reth-optimism-rpc" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "jsonrpsee-types 0.24.3", "op-alloy-network", "parking_lot 0.12.3", @@ -9382,7 +9428,7 @@ dependencies = [ "alloy-consensus", "alloy-eips", "alloy-genesis", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "alloy-rpc-types", "alloy-serde", @@ -9418,7 +9464,7 @@ dependencies = [ "alloy-consensus", "alloy-eips", "alloy-genesis", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "alloy-rpc-types-eth", "arbitrary", @@ -9478,7 +9524,7 @@ name = "reth-prune" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "itertools 0.13.0", "metrics", "rayon", @@ -9504,7 +9550,7 @@ name = "reth-prune-types" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "bytes", "derive_more 1.0.0", "modular-bitfield", @@ -9536,7 +9582,7 @@ dependencies = [ "alloy-dyn-abi", "alloy-genesis", "alloy-network", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "async-trait", "derive_more 1.0.0", @@ -9752,7 +9798,7 @@ name = "reth-rpc-server-types" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "jsonrpsee-core 0.24.3", "jsonrpsee-types 0.24.3", "reth-errors", @@ -9768,7 +9814,7 @@ name = "reth-rpc-types" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rpc-types", "alloy-rpc-types-admin", "alloy-rpc-types-anvil", @@ -9834,7 +9880,7 @@ name = "reth-stages-api" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "aquamarine", "auto_impl", "futures-util", @@ -9861,7 +9907,7 @@ name = "reth-stages-types" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "bytes", "modular-bitfield", "reth-codecs", @@ -9874,7 +9920,7 @@ name = "reth-static-file" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "parking_lot 0.12.3", "rayon", "reth-db", @@ -9894,7 +9940,7 @@ name = "reth-static-file-types" version = "1.0.6" source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "clap", "derive_more 1.0.0", "serde", @@ -10032,7 +10078,7 @@ source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc dependencies = [ "alloy-consensus", "alloy-genesis", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rlp", "alloy-trie", "arbitrary", @@ -10115,7 +10161,7 @@ name = "revm-inspectors" version = "0.6.0" source = "git+https://github.com/taikoxyz/revm-inspectors.git?branch=main-rbuilder#a7db16ce222d58eac84cfeeed4b5a9541dadc1d0" dependencies = [ - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "alloy-rpc-types-eth", "alloy-rpc-types-trace", "alloy-sol-types", @@ -10159,7 +10205,7 @@ version = "9.0.1" source = "git+https://github.com/taikoxyz/revm.git?branch=v43-gwyneth#959611e7a6ceeb693acffe00ba8e4d976591479f" dependencies = [ "alloy-eips", - "alloy-primitives 0.8.0", + "alloy-primitives 0.8.7", "auto_impl", "bitflags 2.6.0", "bitvec", @@ -10372,6 +10418,9 @@ name = "rustc-hash" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +dependencies = [ + "rand 0.8.5", +] [[package]] name = "rustc-hex" @@ -10861,7 +10910,7 @@ version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -10909,7 +10958,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -11349,7 +11398,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.2.6", + "indexmap 2.6.0", "log", "memchr", "native-tls", @@ -11762,9 +11811,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.0" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284c41c2919303438fcf8dede4036fd1e82d4fc0fbb2b279bd2a1442c909ca92" +checksum = "20e7b52ad118b2153644eea95c6fc740b6c1555b2344fdab763fc9de4075f665" dependencies = [ "paste", "proc-macro2", @@ -12231,7 +12280,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "toml_datetime", "winnow 0.5.40", ] @@ -12242,7 +12291,7 @@ version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", diff --git a/Cargo.toml b/Cargo.toml index ca7627aa..08ee0513 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,17 +75,11 @@ alloy-rpc-types-engine = { version = "0.3.0", features = [ ] } alloy-rpc-types-eth = { version = "0.3.0" } alloy-signer-local = { version = "0.3.0" } -alloy-sol-types = { version = "0.8.0", default-features = false } +alloy-sol-types = { version = "0.8.2", default-features = false } [patch.crates-io] -revm = { git = "https://github.com/taikoxyz/revm.git", branch = "v43-gwyneth", features = [ - "std", - "secp256k1", - "blst", -], default-features = false } -revm-primitives = { git = "https://github.com/taikoxyz/revm.git", branch = "v43-gwyneth", features = [ - "std", -], default-features = false } +revm = { git = "https://github.com/taikoxyz/revm.git", branch = "v43-gwyneth" } +revm-primitives = { git = "https://github.com/taikoxyz/revm.git", branch = "v43-gwyneth" } revm-interpreter = { git = "https://github.com/taikoxyz/revm.git", branch = "v43-gwyneth" } revm-precompile = { git = "https://github.com/taikoxyz/revm.git", branch = "v43-gwyneth" } revm-inspectors = { git = "https://github.com/taikoxyz/revm-inspectors.git", branch = "main-rbuilder" } From d389c411aede29de11924cadb0a62cc7e509b51d Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Wed, 9 Oct 2024 01:57:42 +0200 Subject: [PATCH 3/9] update reth --- Cargo.lock | 214 ++++++++++++++++++++++++++--------------------------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1afe797c..f1c7b451 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -136,16 +136,16 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.8.0" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5b68572f5dfa99ede0a491d658c9842626c956b840d0b97d0bbc9637742504" +checksum = "f95d76a38cae906fd394a5afb0736aaceee5432efe76addfd71048e623e208af" dependencies = [ "alloy-json-abi", "alloy-primitives 0.8.7", "alloy-sol-type-parser", "alloy-sol-types", "const-hex", - "derive_more 0.99.18", + "derive_more 1.0.0", "itoa", "serde", "serde_json", @@ -3891,7 +3891,7 @@ dependencies = [ [[package]] name = "gwyneth" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "alloy-serde", @@ -6177,7 +6177,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 2.0.72", @@ -7896,7 +7896,7 @@ dependencies = [ [[package]] name = "reth" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "aquamarine", @@ -7979,7 +7979,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -8007,7 +8007,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "futures-core", @@ -8030,7 +8030,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "futures", "itertools 0.13.0", @@ -8064,7 +8064,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "aquamarine", "linked_hash_set", @@ -8095,7 +8095,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -8107,7 +8107,7 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-signer", "alloy-signer-local", @@ -8133,7 +8133,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-chains", "alloy-eips", @@ -8153,7 +8153,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "ahash", "backon", @@ -8207,7 +8207,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-tasks", "tokio", @@ -8217,7 +8217,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-eips", "alloy-primitives 0.8.7", @@ -8232,7 +8232,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8248,7 +8248,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -8259,7 +8259,7 @@ dependencies = [ [[package]] name = "reth-config" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "eyre", "humantime-serde", @@ -8273,7 +8273,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "auto_impl", "derive_more 1.0.0", @@ -8283,7 +8283,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-chainspec", "reth-consensus", @@ -8293,7 +8293,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8316,7 +8316,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "bytes", "derive_more 1.0.0", @@ -8347,7 +8347,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "arbitrary", "bytes", @@ -8370,7 +8370,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-genesis", "boyer-moore-magiclen", @@ -8396,7 +8396,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "arbitrary", "bytes", @@ -8410,7 +8410,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -8434,7 +8434,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -8458,7 +8458,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "data-encoding", @@ -8480,7 +8480,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "futures", @@ -8507,7 +8507,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "aes", "alloy-primitives 0.8.7", @@ -8538,7 +8538,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-chainspec", "reth-payload-primitives", @@ -8548,7 +8548,7 @@ dependencies = [ [[package]] name = "reth-engine-service" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "futures", "pin-project", @@ -8572,7 +8572,7 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "futures", "metrics", @@ -8607,7 +8607,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "eyre", "futures", @@ -8637,7 +8637,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", @@ -8650,7 +8650,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "bytes", @@ -8675,7 +8675,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-chains", "alloy-genesis", @@ -8691,7 +8691,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-chainspec", "reth-consensus", @@ -8703,7 +8703,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "reth-chainspec", @@ -8721,7 +8721,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-chains", "alloy-primitives 0.8.7", @@ -8741,7 +8741,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-basic-payload-builder", "reth-errors", @@ -8761,7 +8761,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "rayon", "reth-db-api", @@ -8771,7 +8771,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-eips", "auto_impl", @@ -8789,7 +8789,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-eips", "alloy-sol-types", @@ -8808,7 +8808,7 @@ dependencies = [ [[package]] name = "reth-evm-optimism" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-chainspec", "reth-ethereum-forks", @@ -8828,7 +8828,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-eips", "alloy-primitives 0.8.7", @@ -8844,7 +8844,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-execution-errors", "reth-primitives", @@ -8855,7 +8855,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "eyre", "futures", @@ -8882,7 +8882,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "reth-provider", @@ -8891,7 +8891,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "serde", "serde_json", @@ -8901,7 +8901,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "async-trait", "bytes", @@ -8922,7 +8922,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -8938,7 +8938,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "bindgen", "cc", @@ -8947,7 +8947,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "futures", "metrics", @@ -8959,7 +8959,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "proc-macro2", "quote", @@ -8970,7 +8970,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", ] @@ -8978,7 +8978,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "futures-util", "reqwest 0.12.5", @@ -8990,7 +8990,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "aquamarine", @@ -9038,7 +9038,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "alloy-rpc-types-admin", @@ -9061,7 +9061,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "auto_impl", "derive_more 1.0.0", @@ -9079,7 +9079,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -9094,7 +9094,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -9108,7 +9108,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "anyhow", "bincode", @@ -9128,7 +9128,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-chainspec", "reth-db-api", @@ -9146,7 +9146,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-network", "aquamarine", @@ -9204,7 +9204,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-genesis", "alloy-rpc-types-engine", @@ -9254,7 +9254,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "eyre", "reth-auto-seal-consensus", @@ -9278,7 +9278,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rpc-types-engine", "futures", @@ -9300,7 +9300,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "eyre", "http 1.1.0", @@ -9324,7 +9324,7 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-chainspec", "reth-consensus", @@ -9336,12 +9336,12 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" [[package]] name = "reth-optimism-rpc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "jsonrpsee-types 0.24.3", @@ -9373,7 +9373,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "futures-util", "metrics", @@ -9396,7 +9396,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-chain-state", "reth-chainspec", @@ -9412,7 +9412,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-chainspec", "reth-primitives", @@ -9423,7 +9423,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9459,7 +9459,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9483,7 +9483,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rpc-types-engine", "auto_impl", @@ -9522,7 +9522,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "itertools 0.13.0", @@ -9548,7 +9548,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "bytes", @@ -9562,7 +9562,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "reth-chainspec", "reth-consensus-common", @@ -9577,7 +9577,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-dyn-abi", "alloy-genesis", @@ -9633,7 +9633,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-json-rpc", "jsonrpsee 0.24.3", @@ -9647,7 +9647,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "http 1.1.0", "jsonrpsee 0.24.3", @@ -9680,7 +9680,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "async-trait", "jsonrpsee-core 0.24.3", @@ -9708,7 +9708,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-dyn-abi", "alloy-json-rpc", @@ -9745,7 +9745,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-sol-types", "derive_more 1.0.0", @@ -9783,7 +9783,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rpc-types-engine", "http 1.1.0", @@ -9796,7 +9796,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "jsonrpsee-core 0.24.3", @@ -9812,7 +9812,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "alloy-rpc-types", @@ -9832,7 +9832,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -9844,7 +9844,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "futures-util", "itertools 0.13.0", @@ -9878,7 +9878,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "aquamarine", @@ -9905,7 +9905,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "bytes", @@ -9918,7 +9918,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "parking_lot 0.12.3", @@ -9938,7 +9938,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-primitives 0.8.7", "clap", @@ -9950,7 +9950,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "auto_impl", "reth-chainspec", @@ -9966,7 +9966,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "derive_more 1.0.0", @@ -9977,7 +9977,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "auto_impl", "dyn-clone", @@ -9995,7 +9995,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "tokio", "tokio-stream", @@ -10005,7 +10005,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "clap", "eyre", @@ -10020,7 +10020,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "aquamarine", @@ -10052,7 +10052,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "auto_impl", @@ -10074,7 +10074,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -10097,7 +10097,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "auto_impl", @@ -10121,7 +10121,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#b699a7fcc81f970b98929d28180e7859bdf39dce" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" dependencies = [ "alloy-rlp", "derive_more 1.0.0", From 2e1c73a708c422c67f3bb449841ac001c88f122a Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Wed, 9 Oct 2024 17:05:14 +0200 Subject: [PATCH 4/9] prints! --- crates/rbuilder/src/building/mod.rs | 3 +++ crates/rbuilder/src/building/order_commit.rs | 1 + 2 files changed, 4 insertions(+) diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index 7f68a523..252301f9 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -766,6 +766,7 @@ impl PartialBlock { ) -> eyre::Result<()> { let evm_config = EthEvmConfig::default(); let mut db = state.new_db_ref(); + println!("pre_block_beacon_root_contract_call"); pre_block_beacon_root_contract_call( db.as_mut(), &evm_config, @@ -774,6 +775,7 @@ impl PartialBlock { &ctx.block_env, ctx.attributes.parent_beacon_block_root(), )?; + println!("pre_block_blockhashes_contract_call"); pre_block_blockhashes_contract_call( db.as_mut(), &evm_config, @@ -782,6 +784,7 @@ impl PartialBlock { &ctx.block_env, ctx.attributes.parent, )?; + println!("merge_transitions"); db.as_mut().merge_transitions(BundleRetention::Reverts); Ok(()) } diff --git a/crates/rbuilder/src/building/order_commit.rs b/crates/rbuilder/src/building/order_commit.rs index 0fba3af6..2759a70b 100644 --- a/crates/rbuilder/src/building/order_commit.rs +++ b/crates/rbuilder/src/building/order_commit.rs @@ -91,6 +91,7 @@ impl BlockState { } pub fn new_db_ref(&mut self) -> BlockStateDBRef + '_> { + println!("Setting up a db for {:?}", self.providers); // TODO: Brecht fix let state_provider = SyncStateProviderDatabase::new( Some(167010), From df1ccdce83e285129cd14d9b5b93660c8f2f301d Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Wed, 9 Oct 2024 17:30:20 +0200 Subject: [PATCH 5/9] pass in multiple dbs --- crates/rbuilder/src/building/order_commit.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/crates/rbuilder/src/building/order_commit.rs b/crates/rbuilder/src/building/order_commit.rs index 2759a70b..825107cd 100644 --- a/crates/rbuilder/src/building/order_commit.rs +++ b/crates/rbuilder/src/building/order_commit.rs @@ -93,11 +93,12 @@ impl BlockState { pub fn new_db_ref(&mut self) -> BlockStateDBRef + '_> { println!("Setting up a db for {:?}", self.providers); // TODO: Brecht fix - let state_provider = SyncStateProviderDatabase::new( - Some(167010), - StateProviderDatabase(&self.providers[&167010]) - ); - let cachedb = WrapDatabaseRef(self.cached_reads.as_db(state_provider)); + //let state_provider = SyncStateProviderDatabase::new( + // Some(167010), + // StateProviderDatabase(&self.providers[&167010]) + //); + let state_providers = SyncStateProviderDatabase(self.providers.iter().map(|(chain_id, provider)| (*chain_id, StateProviderDatabase(provider))).collect()); + let cachedb = WrapDatabaseRef(self.cached_reads.as_db(state_providers)); let bundle_state = self.bundle_state.take().unwrap(); let db = State::builder() .with_database(cachedb) From 55a8a135e4aaef52a2ea9a2d99a7284aa157804e Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Wed, 9 Oct 2024 17:50:36 +0200 Subject: [PATCH 6/9] update reth --- Cargo.lock | 209 ++++++++++--------- crates/rbuilder/src/building/order_commit.rs | 2 +- 2 files changed, 106 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f1c7b451..2e2db38c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3891,7 +3891,7 @@ dependencies = [ [[package]] name = "gwyneth" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "alloy-serde", @@ -3925,6 +3925,7 @@ dependencies = [ "reth-revm", "reth-rpc", "reth-rpc-api", + "reth-rpc-builder", "reth-rpc-engine-api", "reth-rpc-layer", "reth-rpc-types", @@ -6177,7 +6178,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.72", @@ -7896,7 +7897,7 @@ dependencies = [ [[package]] name = "reth" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "aquamarine", @@ -7979,7 +7980,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -8007,7 +8008,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "futures-core", @@ -8030,7 +8031,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "futures", "itertools 0.13.0", @@ -8064,7 +8065,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "aquamarine", "linked_hash_set", @@ -8095,7 +8096,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -8107,7 +8108,7 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-signer", "alloy-signer-local", @@ -8133,7 +8134,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-chains", "alloy-eips", @@ -8153,7 +8154,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "ahash", "backon", @@ -8207,7 +8208,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-tasks", "tokio", @@ -8217,7 +8218,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-eips", "alloy-primitives 0.8.7", @@ -8232,7 +8233,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8248,7 +8249,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -8259,7 +8260,7 @@ dependencies = [ [[package]] name = "reth-config" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "eyre", "humantime-serde", @@ -8273,7 +8274,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "auto_impl", "derive_more 1.0.0", @@ -8283,7 +8284,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-chainspec", "reth-consensus", @@ -8293,7 +8294,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8316,7 +8317,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "bytes", "derive_more 1.0.0", @@ -8347,7 +8348,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "arbitrary", "bytes", @@ -8370,7 +8371,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-genesis", "boyer-moore-magiclen", @@ -8396,7 +8397,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "arbitrary", "bytes", @@ -8410,7 +8411,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -8434,7 +8435,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -8458,7 +8459,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "data-encoding", @@ -8480,7 +8481,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "futures", @@ -8507,7 +8508,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "aes", "alloy-primitives 0.8.7", @@ -8538,7 +8539,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-chainspec", "reth-payload-primitives", @@ -8548,7 +8549,7 @@ dependencies = [ [[package]] name = "reth-engine-service" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "futures", "pin-project", @@ -8572,7 +8573,7 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "futures", "metrics", @@ -8607,7 +8608,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "eyre", "futures", @@ -8637,7 +8638,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", @@ -8650,7 +8651,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "bytes", @@ -8675,7 +8676,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-chains", "alloy-genesis", @@ -8691,7 +8692,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-chainspec", "reth-consensus", @@ -8703,7 +8704,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "reth-chainspec", @@ -8721,7 +8722,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-chains", "alloy-primitives 0.8.7", @@ -8741,7 +8742,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-basic-payload-builder", "reth-errors", @@ -8761,7 +8762,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "rayon", "reth-db-api", @@ -8771,7 +8772,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-eips", "auto_impl", @@ -8789,7 +8790,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-eips", "alloy-sol-types", @@ -8808,7 +8809,7 @@ dependencies = [ [[package]] name = "reth-evm-optimism" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-chainspec", "reth-ethereum-forks", @@ -8828,7 +8829,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-eips", "alloy-primitives 0.8.7", @@ -8844,7 +8845,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-execution-errors", "reth-primitives", @@ -8855,7 +8856,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "eyre", "futures", @@ -8882,7 +8883,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "reth-provider", @@ -8891,7 +8892,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "serde", "serde_json", @@ -8901,7 +8902,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "async-trait", "bytes", @@ -8922,7 +8923,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -8938,7 +8939,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "bindgen", "cc", @@ -8947,7 +8948,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "futures", "metrics", @@ -8959,7 +8960,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "proc-macro2", "quote", @@ -8970,7 +8971,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", ] @@ -8978,7 +8979,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "futures-util", "reqwest 0.12.5", @@ -8990,7 +8991,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "aquamarine", @@ -9038,7 +9039,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "alloy-rpc-types-admin", @@ -9061,7 +9062,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "auto_impl", "derive_more 1.0.0", @@ -9079,7 +9080,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -9094,7 +9095,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -9108,7 +9109,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "anyhow", "bincode", @@ -9128,7 +9129,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-chainspec", "reth-db-api", @@ -9146,7 +9147,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-network", "aquamarine", @@ -9204,7 +9205,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-genesis", "alloy-rpc-types-engine", @@ -9254,7 +9255,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "eyre", "reth-auto-seal-consensus", @@ -9278,7 +9279,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rpc-types-engine", "futures", @@ -9300,7 +9301,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "eyre", "http 1.1.0", @@ -9324,7 +9325,7 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-chainspec", "reth-consensus", @@ -9336,12 +9337,12 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" [[package]] name = "reth-optimism-rpc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "jsonrpsee-types 0.24.3", @@ -9373,7 +9374,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "futures-util", "metrics", @@ -9396,7 +9397,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-chain-state", "reth-chainspec", @@ -9412,7 +9413,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-chainspec", "reth-primitives", @@ -9423,7 +9424,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9459,7 +9460,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9483,7 +9484,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rpc-types-engine", "auto_impl", @@ -9522,7 +9523,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "itertools 0.13.0", @@ -9548,7 +9549,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "bytes", @@ -9562,7 +9563,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "reth-chainspec", "reth-consensus-common", @@ -9577,7 +9578,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-dyn-abi", "alloy-genesis", @@ -9633,7 +9634,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-json-rpc", "jsonrpsee 0.24.3", @@ -9647,7 +9648,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "http 1.1.0", "jsonrpsee 0.24.3", @@ -9680,7 +9681,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "async-trait", "jsonrpsee-core 0.24.3", @@ -9708,7 +9709,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-dyn-abi", "alloy-json-rpc", @@ -9745,7 +9746,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-sol-types", "derive_more 1.0.0", @@ -9783,7 +9784,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rpc-types-engine", "http 1.1.0", @@ -9796,7 +9797,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "jsonrpsee-core 0.24.3", @@ -9812,7 +9813,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "alloy-rpc-types", @@ -9832,7 +9833,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -9844,7 +9845,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "futures-util", "itertools 0.13.0", @@ -9878,7 +9879,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "aquamarine", @@ -9905,7 +9906,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "bytes", @@ -9918,7 +9919,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "parking_lot 0.12.3", @@ -9938,7 +9939,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-primitives 0.8.7", "clap", @@ -9950,7 +9951,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "auto_impl", "reth-chainspec", @@ -9966,7 +9967,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "derive_more 1.0.0", @@ -9977,7 +9978,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "auto_impl", "dyn-clone", @@ -9995,7 +9996,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "tokio", "tokio-stream", @@ -10005,7 +10006,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "clap", "eyre", @@ -10020,7 +10021,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "aquamarine", @@ -10052,7 +10053,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "auto_impl", @@ -10074,7 +10075,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -10097,7 +10098,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "auto_impl", @@ -10121,7 +10122,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.0.6" -source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#a764b2f55132df461201c06c861f6b34c84d2a45" +source = "git+https://github.com/taikoxyz/taiko-reth?branch=rbuilderV3#34856df2299b9715a3829f898e1bec32a3358674" dependencies = [ "alloy-rlp", "derive_more 1.0.0", diff --git a/crates/rbuilder/src/building/order_commit.rs b/crates/rbuilder/src/building/order_commit.rs index 825107cd..de34df0b 100644 --- a/crates/rbuilder/src/building/order_commit.rs +++ b/crates/rbuilder/src/building/order_commit.rs @@ -91,7 +91,7 @@ impl BlockState { } pub fn new_db_ref(&mut self) -> BlockStateDBRef + '_> { - println!("Setting up a db for {:?}", self.providers); + // println!("Setting up a db for {:?}", self.providers); // TODO: Brecht fix //let state_provider = SyncStateProviderDatabase::new( // Some(167010), From 7930a72ad6f8d3fad57b4c9200899fdf23360dcd Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Wed, 9 Oct 2024 19:22:23 +0200 Subject: [PATCH 7/9] remove unnecessary prints --- crates/rbuilder/src/building/mod.rs | 3 --- crates/rbuilder/src/building/order_commit.rs | 6 ------ 2 files changed, 9 deletions(-) diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index 252301f9..7f68a523 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -766,7 +766,6 @@ impl PartialBlock { ) -> eyre::Result<()> { let evm_config = EthEvmConfig::default(); let mut db = state.new_db_ref(); - println!("pre_block_beacon_root_contract_call"); pre_block_beacon_root_contract_call( db.as_mut(), &evm_config, @@ -775,7 +774,6 @@ impl PartialBlock { &ctx.block_env, ctx.attributes.parent_beacon_block_root(), )?; - println!("pre_block_blockhashes_contract_call"); pre_block_blockhashes_contract_call( db.as_mut(), &evm_config, @@ -784,7 +782,6 @@ impl PartialBlock { &ctx.block_env, ctx.attributes.parent, )?; - println!("merge_transitions"); db.as_mut().merge_transitions(BundleRetention::Reverts); Ok(()) } diff --git a/crates/rbuilder/src/building/order_commit.rs b/crates/rbuilder/src/building/order_commit.rs index de34df0b..98edc26f 100644 --- a/crates/rbuilder/src/building/order_commit.rs +++ b/crates/rbuilder/src/building/order_commit.rs @@ -91,12 +91,6 @@ impl BlockState { } pub fn new_db_ref(&mut self) -> BlockStateDBRef + '_> { - // println!("Setting up a db for {:?}", self.providers); - // TODO: Brecht fix - //let state_provider = SyncStateProviderDatabase::new( - // Some(167010), - // StateProviderDatabase(&self.providers[&167010]) - //); let state_providers = SyncStateProviderDatabase(self.providers.iter().map(|(chain_id, provider)| (*chain_id, StateProviderDatabase(provider))).collect()); let cachedb = WrapDatabaseRef(self.cached_reads.as_db(state_providers)); let bundle_state = self.bundle_state.take().unwrap(); From a2e6ec3d183cd7d8b8677c81444136c74d0fd462 Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Wed, 9 Oct 2024 19:48:18 +0200 Subject: [PATCH 8/9] just a commit to trigger compiliation hopefully --- crates/rbuilder/src/proposing/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/rbuilder/src/proposing/mod.rs b/crates/rbuilder/src/proposing/mod.rs index 20a0281e..ca02871b 100644 --- a/crates/rbuilder/src/proposing/mod.rs +++ b/crates/rbuilder/src/proposing/mod.rs @@ -66,7 +66,7 @@ impl BlockProposer { } pub async fn propose_block(&self, request: &SubmitBlockRequest) -> Result<()> { - println!("Dani debug: Trying to propose blocks"); + println!("propose_block"); let execution_payload = request.execution_payload(); From 6ec85890e6b1ff484152086bd50d8eebaefd9e2e Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Fri, 11 Oct 2024 16:25:37 +0200 Subject: [PATCH 9/9] minimize diff --- crates/rbuilder/src/backtest/execute.rs | 4 ++-- crates/rbuilder/src/bin/debug-bench-machine.rs | 6 ++---- .../building/builders/block_building_helper.rs | 16 ++++++++-------- .../builders/mock_block_building_helper.rs | 10 +++++----- crates/rbuilder/src/building/builders/mod.rs | 4 ++-- .../src/building/builders/ordering_builder.rs | 10 +++++----- crates/rbuilder/src/building/mod.rs | 4 ++-- crates/rbuilder/src/building/order_commit.rs | 14 +++++++------- crates/rbuilder/src/building/sim.rs | 4 ++-- crates/rbuilder/src/live_builder/cli.rs | 4 ++-- crates/rbuilder/src/live_builder/config.rs | 4 ++-- .../src/live_builder/simulation/sim_worker.rs | 4 ++-- 12 files changed, 41 insertions(+), 43 deletions(-) diff --git a/crates/rbuilder/src/backtest/execute.rs b/crates/rbuilder/src/backtest/execute.rs index 2e1865c7..c2c2f757 100644 --- a/crates/rbuilder/src/backtest/execute.rs +++ b/crates/rbuilder/src/backtest/execute.rs @@ -15,7 +15,7 @@ use alloy_primitives::{Address, U256}; use reth::providers::ProviderFactory; use reth_chainspec::ChainSpec; use reth_db::{database::Database, DatabaseEnv}; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use serde::{Deserialize, Serialize}; use std::sync::Arc; @@ -151,7 +151,7 @@ pub fn backtest_simulate_block( let simulated_total_gas = sim_orders.iter().map(|o| o.sim_value.gas_used).sum(); let mut builder_outputs = Vec::new(); - let mut cached_reads = Some(SyncCachedReads::default()); + let mut cached_reads = Some(CachedReads::default()); for building_algorithm_name in builders_names { let input = BacktestSimulateBlockInput { ctx: ctx.clone(), diff --git a/crates/rbuilder/src/bin/debug-bench-machine.rs b/crates/rbuilder/src/bin/debug-bench-machine.rs index dd29b829..04c0d705 100644 --- a/crates/rbuilder/src/bin/debug-bench-machine.rs +++ b/crates/rbuilder/src/bin/debug-bench-machine.rs @@ -2,8 +2,6 @@ //! This only works when reth node is stopped and the chain moved forward form its synced state //! It downloads block aftre the last one synced and re-executes all the txs in it. use alloy_provider::Provider; -use ahash::HashMap; -use alloy_primitives::{B256, U256}; use clap::Parser; use eyre::Context; use itertools::Itertools; @@ -13,7 +11,7 @@ use rbuilder::{ utils::{extract_onchain_block_txs, find_suggested_fee_recipient, http_provider}, }; use reth::providers::BlockNumReader; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use reth_provider::StateProvider; use std::{path::PathBuf, sync::Arc, time::Instant}; use tracing::{debug, info}; @@ -85,7 +83,7 @@ async fn main() -> eyre::Result<()> { let mut build_times_ms = Vec::new(); let mut finalize_time_ms = Vec::new(); - let mut cached_reads = Some(SyncCachedReads::default()); + let mut cached_reads = Some(CachedReads::default()); for _ in 0..cli.iters { let ctx = ctx.clone(); let txs = txs.clone(); diff --git a/crates/rbuilder/src/building/builders/block_building_helper.rs b/crates/rbuilder/src/building/builders/block_building_helper.rs index d3aeec03..5d2b0879 100644 --- a/crates/rbuilder/src/building/builders/block_building_helper.rs +++ b/crates/rbuilder/src/building/builders/block_building_helper.rs @@ -6,7 +6,7 @@ use ahash::HashMap; use alloy_primitives::U256; use reth::tasks::pool::BlockingTaskPool; use reth_db::database::Database; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use reth_primitives::format_ether; use reth_provider::{BlockNumReader, ProviderFactory, StateProvider}; use revm_primitives::ChainAddress; @@ -69,7 +69,7 @@ pub trait BlockBuildingHelper: Send + Sync { ) -> Result; /// Useful if we want to give away this object but keep on building some other way. - fn clone_cached_reads(&self) -> SyncCachedReads; + fn clone_cached_reads(&self) -> CachedReads; /// BuiltBlockTrace for current state. fn built_block_trace(&self) -> &BuiltBlockTrace; @@ -78,7 +78,7 @@ pub trait BlockBuildingHelper: Send + Sync { fn building_context(&self) -> &BlockBuildingContext; /// Updates the cached reads for the block state. - fn update_cached_reads(&mut self, cached_reads: SyncCachedReads); + fn update_cached_reads(&mut self, cached_reads: CachedReads); } /// Implementation of BlockBuildingHelper based on a ProviderFactory @@ -142,7 +142,7 @@ impl BlockBuildingHelperError { pub struct FinalizeBlockResult { pub block: Block, /// Since finalize_block eats the object we need the cached_reads in case we create a new - pub cached_reads: SyncCachedReads, + pub cached_reads: CachedReads, } impl BlockBuildingHelperFromDB { @@ -157,7 +157,7 @@ impl BlockBuildingHelperFromDB { root_hash_task_pool: BlockingTaskPool, root_hash_config: RootHashConfig, building_ctx: HashMap, - cached_reads: Option, + cached_reads: Option, builder_name: String, discard_txs: bool, enforce_sorting: Option, @@ -365,7 +365,7 @@ impl BlockBuildingHelper for BlockBuildingHelper let sim_gas_used = self.partial_block.tracer.used_gas; let mut blocks = HashMap::default(); - let mut cached_reads = SyncCachedReads::default(); + let mut cached_reads = CachedReads::default(); for (chain_id, provider_factory) in self.provider_factory.iter() { // TODO Brecht: fix if *chain_id == 160010 { @@ -444,7 +444,7 @@ impl BlockBuildingHelper for BlockBuildingHelper }) } - fn clone_cached_reads(&self) -> SyncCachedReads { + fn clone_cached_reads(&self) -> CachedReads { self.block_state.clone_cached_reads() } @@ -460,7 +460,7 @@ impl BlockBuildingHelper for BlockBuildingHelper Box::new(self.clone()) } - fn update_cached_reads(&mut self, cached_reads: SyncCachedReads) { + fn update_cached_reads(&mut self, cached_reads: CachedReads) { self.block_state = self.block_state.clone().with_cached_reads(cached_reads); } } diff --git a/crates/rbuilder/src/building/builders/mock_block_building_helper.rs b/crates/rbuilder/src/building/builders/mock_block_building_helper.rs index af72f8f2..91be116a 100644 --- a/crates/rbuilder/src/building/builders/mock_block_building_helper.rs +++ b/crates/rbuilder/src/building/builders/mock_block_building_helper.rs @@ -6,7 +6,7 @@ use crate::{ primitives::SimulatedOrder, }; use alloy_primitives::U256; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use reth_primitives::SealedBlock; use time::OffsetDateTime; @@ -85,12 +85,12 @@ impl BlockBuildingHelper for MockBlockBuildingHelper { Ok(FinalizeBlockResult { block, - cached_reads: SyncCachedReads::default(), + cached_reads: CachedReads::default(), }) } - fn clone_cached_reads(&self) -> SyncCachedReads { - SyncCachedReads::default() + fn clone_cached_reads(&self) -> CachedReads { + CachedReads::default() } fn built_block_trace(&self) -> &BuiltBlockTrace { @@ -101,7 +101,7 @@ impl BlockBuildingHelper for MockBlockBuildingHelper { &self.block_building_context } - fn update_cached_reads(&mut self, _cached_reads: SyncCachedReads) { + fn update_cached_reads(&mut self, _cached_reads: CachedReads) { unimplemented!() } } diff --git a/crates/rbuilder/src/building/builders/mod.rs b/crates/rbuilder/src/building/builders/mod.rs index c5b9c7c7..1330e9d0 100644 --- a/crates/rbuilder/src/building/builders/mod.rs +++ b/crates/rbuilder/src/building/builders/mod.rs @@ -19,7 +19,7 @@ use reth::{ tasks::pool::BlockingTaskPool, }; use reth_db::database::Database; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use std::sync::Arc; use tokio::sync::{broadcast, broadcast::error::TryRecvError}; use tokio_util::sync::CancellationToken; @@ -230,7 +230,7 @@ pub struct BacktestSimulateBlockInput<'a, DB> { pub sbundle_mergeabe_signers: Vec
, pub sim_orders: &'a Vec, pub provider_factory: ProviderFactory, - pub cached_reads: Option, + pub cached_reads: Option, } /// Handles error from block filling stage. diff --git a/crates/rbuilder/src/building/builders/ordering_builder.rs b/crates/rbuilder/src/building/builders/ordering_builder.rs index 71f0c567..d908d572 100644 --- a/crates/rbuilder/src/building/builders/ordering_builder.rs +++ b/crates/rbuilder/src/building/builders/ordering_builder.rs @@ -23,7 +23,7 @@ use tokio_util::sync::CancellationToken; use crate::{roothash::RootHashConfig, utils::check_provider_factory_health}; use reth::tasks::pool::BlockingTaskPool; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use serde::Deserialize; use std::{os::unix::fs::lchown, time::{Duration, Instant}}; use tracing::{error, info_span, trace}; @@ -131,7 +131,7 @@ pub fn run_ordering_builder( pub fn backtest_simulate_block( ordering_config: OrderingBuilderConfig, input: BacktestSimulateBlockInput<'_, DB>, -) -> eyre::Result<(Block, SyncCachedReads)> { +) -> eyre::Result<(Block, CachedReads)> { let mut provider_factories = HashMap::default(); provider_factories.insert(input.ctx.chain_spec.chain.id(), input.provider_factory.clone()); @@ -186,7 +186,7 @@ pub struct OrderingBuilderContext { root_hash_config: RootHashConfig, // caches - cached_reads: Option, + cached_reads: Option, // scratchpad failed_orders: HashSet, @@ -215,14 +215,14 @@ impl OrderingBuilderContext { } } - pub fn with_cached_reads(self, cached_reads: SyncCachedReads) -> Self { + pub fn with_cached_reads(self, cached_reads: CachedReads) -> Self { Self { cached_reads: Some(cached_reads), ..self } } - pub fn take_cached_reads(&mut self) -> Option { + pub fn take_cached_reads(&mut self) -> Option { self.cached_reads.take() } diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index 7f68a523..240ff9d2 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -42,7 +42,7 @@ use reth_evm::system_calls::{ }; use reth_evm_ethereum::{eip6110::parse_deposits_from_receipts, revm_spec, EthEvmConfig}; use reth_node_api::PayloadBuilderAttributes; -use reth_payload_builder::{database::{CachedReads, SyncCachedReads}, EthPayloadBuilderAttributes}; +use reth_payload_builder::{database::SyncCachedReads as CachedReads, EthPayloadBuilderAttributes}; use revm::{ db::states::bundle_state::BundleRetention::{self, PlainState}, primitives::{BlobExcessGasAndPrice, BlockEnv, CfgEnvWithHandlerCfg, SpecId}, @@ -405,7 +405,7 @@ impl ExecutionError { pub struct FinalizeResult { pub sealed_block: SealedBlock, - pub cached_reads: SyncCachedReads, + pub cached_reads: CachedReads, // sidecars for all txs in SealedBlock pub txs_blob_sidecars: Vec>, } diff --git a/crates/rbuilder/src/building/order_commit.rs b/crates/rbuilder/src/building/order_commit.rs index 98edc26f..3810732d 100644 --- a/crates/rbuilder/src/building/order_commit.rs +++ b/crates/rbuilder/src/building/order_commit.rs @@ -14,7 +14,7 @@ use alloy_primitives::{Address, B256, U256}; use reth::revm::database::{StateProviderDatabase, SyncStateProviderDatabase}; use reth_errors::ProviderError; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use reth_primitives::{ constants::eip4844::{DATA_GAS_PER_BLOB, MAX_DATA_GAS_PER_BLOCK}, transaction::FillTxEnv, @@ -36,7 +36,7 @@ use thiserror::Error; #[derive(Clone)] pub struct BlockState { providers: HashMap>, - cached_reads: SyncCachedReads, + cached_reads: CachedReads, bundle_state: Option, } @@ -50,7 +50,7 @@ impl BlockState { pub fn new_arc(providers: HashMap>) -> Self { Self { providers, - cached_reads: SyncCachedReads::default(), + cached_reads: CachedReads::default(), bundle_state: Some(BundleState::default()), } } @@ -69,7 +69,7 @@ impl BlockState { self.providers[&chain_id].clone() } - pub fn with_cached_reads(mut self, cached_reads:SyncCachedReads) -> Self { + pub fn with_cached_reads(mut self, cached_reads:CachedReads) -> Self { self.cached_reads = cached_reads; self } @@ -79,11 +79,11 @@ impl BlockState { self } - pub fn into_parts(self) -> (SyncCachedReads, BundleState, HashMap>) { + pub fn into_parts(self) -> (CachedReads, BundleState, HashMap>) { (self.cached_reads, self.bundle_state.unwrap(), self.providers) } - pub fn clone_bundle_and_cache(&self) -> (SyncCachedReads, BundleState) { + pub fn clone_bundle_and_cache(&self) -> (CachedReads, BundleState) { ( self.cached_reads.clone(), self.bundle_state.clone().unwrap(), @@ -129,7 +129,7 @@ impl BlockState { .unwrap_or_else(|| KECCAK_EMPTY)) } - pub fn clone_cached_reads(&self) -> SyncCachedReads { + pub fn clone_cached_reads(&self) -> CachedReads { self.cached_reads.clone() } } diff --git a/crates/rbuilder/src/building/sim.rs b/crates/rbuilder/src/building/sim.rs index e4fbf0b6..eeb726d0 100644 --- a/crates/rbuilder/src/building/sim.rs +++ b/crates/rbuilder/src/building/sim.rs @@ -13,7 +13,7 @@ use rand::seq::SliceRandom; use reth::providers::ProviderFactory; use reth_db::database::Database; use reth_errors::ProviderError; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use reth_provider::StateProvider; use std::{ cmp::{max, min, Ordering}, @@ -338,7 +338,7 @@ pub fn simulate_all_orders_with_sim_tree( ctx.chain_spec.chain.id(), Arc::::from(factory.history_by_block_hash(ctx.attributes.parent)?), ); - let mut cache_reads = Some(SyncCachedReads::default()); + let mut cache_reads = Some(CachedReads::default()); loop { // mix new orders into the sim_tree if randomize_insertion && !orders.is_empty() { diff --git a/crates/rbuilder/src/live_builder/cli.rs b/crates/rbuilder/src/live_builder/cli.rs index d4932a67..45d32c87 100644 --- a/crates/rbuilder/src/live_builder/cli.rs +++ b/crates/rbuilder/src/live_builder/cli.rs @@ -2,7 +2,7 @@ use std::{path::PathBuf, sync::Arc}; use clap::Parser; use reth_db::DatabaseEnv; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use tokio::signal::ctrl_c; use tokio_util::sync::CancellationToken; @@ -52,7 +52,7 @@ pub trait LiveBuilderConfig: std::fmt::Debug + serde::de::DeserializeOwned { &self, building_algorithm_name: &str, input: BacktestSimulateBlockInput<'_, Arc>, - ) -> eyre::Result<(Block, SyncCachedReads)>; + ) -> eyre::Result<(Block, CachedReads)>; } /// print_version_info func that will be called on command Cli::Version diff --git a/crates/rbuilder/src/live_builder/config.rs b/crates/rbuilder/src/live_builder/config.rs index b20571d3..0743a6d5 100644 --- a/crates/rbuilder/src/live_builder/config.rs +++ b/crates/rbuilder/src/live_builder/config.rs @@ -46,7 +46,7 @@ use eyre::Context; use reth::tasks::pool::BlockingTaskPool; use reth_chainspec::{Chain, ChainSpec, NamedChain}; use reth_db::DatabaseEnv; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use reth_primitives::StaticFileSegment; use reth_provider::StaticFileProviderFactory; use serde::Deserialize; @@ -364,7 +364,7 @@ impl LiveBuilderConfig for Config { &self, building_algorithm_name: &str, input: BacktestSimulateBlockInput<'_, Arc>, - ) -> eyre::Result<(Block, SyncCachedReads)> { + ) -> eyre::Result<(Block, CachedReads)> { let builder_cfg = self.builder(building_algorithm_name)?; match builder_cfg.builder { SpecificBuilderConfig::OrderingBuilder(config) => { diff --git a/crates/rbuilder/src/live_builder/simulation/sim_worker.rs b/crates/rbuilder/src/live_builder/simulation/sim_worker.rs index b6ad9b6d..5426279a 100644 --- a/crates/rbuilder/src/live_builder/simulation/sim_worker.rs +++ b/crates/rbuilder/src/live_builder/simulation/sim_worker.rs @@ -10,7 +10,7 @@ use crate::{ }; use ahash::HashMap; use reth_db::database::Database; -use reth_payload_builder::database::{CachedReads, SyncCachedReads}; +use reth_payload_builder::database::SyncCachedReads as CachedReads; use std::{ sync::{Arc, Mutex}, thread::sleep, @@ -59,7 +59,7 @@ pub fn run_sim_worker( } }; - let mut cached_reads = SyncCachedReads::default(); + let mut cached_reads = CachedReads::default(); let mut last_sim_finished = Instant::now(); while let Ok(task) = current_sim_context.requests.recv() { let sim_thread_wait_time = last_sim_finished.elapsed();