From 383a3ca8d39b9b40516abb4bed445b8410421fd1 Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Mon, 13 Jan 2025 04:04:19 +0100 Subject: [PATCH 1/3] fix bundle reverts --- Cargo.lock | 217 +++++++++--------- Cargo.toml | 46 ++-- crates/rbuilder/src/building/mod.rs | 19 +- crates/rbuilder/src/building/order_commit.rs | 187 ++++++++------- .../src/utils/provider_factory_reopen.rs | 3 +- 5 files changed, 247 insertions(+), 225 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 21182b81..01268bc7 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/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "alloy-serde", @@ -7899,7 +7899,7 @@ dependencies = [ [[package]] name = "reth" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "aquamarine", @@ -7982,7 +7982,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -8010,7 +8010,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "futures-core", @@ -8033,7 +8033,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "futures", "itertools 0.13.0", @@ -8067,9 +8067,10 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "aquamarine", + "bincode", "linked_hash_set", "metrics", "parking_lot 0.12.3", @@ -8100,7 +8101,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -8112,7 +8113,7 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-signer", "alloy-signer-local", @@ -8138,7 +8139,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-chains", "alloy-eips", @@ -8158,7 +8159,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "ahash", "backon", @@ -8212,7 +8213,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-tasks", "tokio", @@ -8222,7 +8223,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-eips", "alloy-primitives 0.8.7", @@ -8237,7 +8238,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8253,7 +8254,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -8264,7 +8265,7 @@ dependencies = [ [[package]] name = "reth-config" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "eyre", "humantime-serde", @@ -8278,7 +8279,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "auto_impl", "derive_more 1.0.0", @@ -8288,7 +8289,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-chainspec", "reth-consensus", @@ -8298,7 +8299,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8321,7 +8322,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "bytes", "derive_more 1.0.0", @@ -8352,7 +8353,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "arbitrary", "bytes", @@ -8375,7 +8376,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-genesis", "boyer-moore-magiclen", @@ -8401,7 +8402,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "arbitrary", "bytes", @@ -8415,7 +8416,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -8439,7 +8440,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -8463,7 +8464,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "data-encoding", @@ -8485,7 +8486,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "futures", @@ -8512,7 +8513,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "aes", "alloy-primitives 0.8.7", @@ -8543,7 +8544,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-chainspec", "reth-payload-primitives", @@ -8553,7 +8554,7 @@ dependencies = [ [[package]] name = "reth-engine-service" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "futures", "pin-project", @@ -8577,7 +8578,7 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "futures", "metrics", @@ -8612,7 +8613,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "eyre", "futures", @@ -8642,7 +8643,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", @@ -8655,7 +8656,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "bytes", @@ -8680,7 +8681,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-chains", "alloy-genesis", @@ -8696,7 +8697,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-chainspec", "reth-consensus", @@ -8708,7 +8709,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "reth-chainspec", @@ -8726,7 +8727,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-chains", "alloy-primitives 0.8.7", @@ -8746,7 +8747,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-basic-payload-builder", "reth-errors", @@ -8766,7 +8767,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "rayon", "reth-db-api", @@ -8776,7 +8777,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-eips", "auto_impl", @@ -8794,7 +8795,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-eips", "alloy-sol-types", @@ -8813,7 +8814,7 @@ dependencies = [ [[package]] name = "reth-evm-optimism" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-chainspec", "reth-ethereum-forks", @@ -8833,7 +8834,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-eips", "alloy-primitives 0.8.7", @@ -8849,7 +8850,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-execution-errors", "reth-primitives", @@ -8861,7 +8862,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "eyre", "futures", @@ -8888,7 +8889,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "reth-provider", @@ -8897,7 +8898,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "serde", "serde_json", @@ -8907,7 +8908,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "async-trait", "bytes", @@ -8928,7 +8929,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -8944,7 +8945,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "bindgen", "cc", @@ -8953,7 +8954,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "futures", "metrics", @@ -8965,7 +8966,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "proc-macro2", "quote", @@ -8976,7 +8977,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", ] @@ -8984,7 +8985,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "futures-util", "reqwest 0.12.5", @@ -8996,7 +8997,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "aquamarine", @@ -9044,7 +9045,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "alloy-rpc-types-admin", @@ -9067,7 +9068,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "auto_impl", "derive_more 1.0.0", @@ -9085,7 +9086,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -9100,7 +9101,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -9114,7 +9115,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "anyhow", "bincode", @@ -9134,7 +9135,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-chainspec", "reth-db-api", @@ -9152,7 +9153,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-network", "aquamarine", @@ -9210,7 +9211,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-genesis", "alloy-rpc-types-engine", @@ -9260,7 +9261,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "eyre", "reth-auto-seal-consensus", @@ -9284,7 +9285,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rpc-types-engine", "futures", @@ -9306,7 +9307,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "eyre", "http 1.1.0", @@ -9330,7 +9331,7 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-chainspec", "reth-consensus", @@ -9342,12 +9343,12 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" [[package]] name = "reth-optimism-rpc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "jsonrpsee-types 0.24.3", @@ -9379,7 +9380,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "futures-util", "metrics", @@ -9402,7 +9403,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-chain-state", "reth-chainspec", @@ -9418,7 +9419,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-chainspec", "reth-primitives", @@ -9429,7 +9430,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9466,7 +9467,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9490,7 +9491,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rpc-types-engine", "auto_impl", @@ -9529,7 +9530,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "itertools 0.13.0", @@ -9555,7 +9556,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "bytes", @@ -9569,7 +9570,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "reth-chainspec", "reth-consensus-common", @@ -9584,7 +9585,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-dyn-abi", "alloy-genesis", @@ -9640,7 +9641,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-json-rpc", "jsonrpsee 0.24.3", @@ -9654,7 +9655,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "http 1.1.0", "jsonrpsee 0.24.3", @@ -9687,7 +9688,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "async-trait", "jsonrpsee-core 0.24.3", @@ -9715,7 +9716,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-dyn-abi", "alloy-json-rpc", @@ -9752,7 +9753,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-sol-types", "derive_more 1.0.0", @@ -9790,7 +9791,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rpc-types-engine", "http 1.1.0", @@ -9803,7 +9804,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "jsonrpsee-core 0.24.3", @@ -9819,7 +9820,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "alloy-rpc-types", @@ -9839,7 +9840,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -9851,7 +9852,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "futures-util", "itertools 0.13.0", @@ -9885,7 +9886,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "aquamarine", @@ -9912,7 +9913,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "bytes", @@ -9925,7 +9926,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "parking_lot 0.12.3", @@ -9945,7 +9946,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-primitives 0.8.7", "clap", @@ -9957,7 +9958,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "auto_impl", "reth-chainspec", @@ -9973,7 +9974,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "derive_more 1.0.0", @@ -9984,7 +9985,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "auto_impl", "dyn-clone", @@ -10002,7 +10003,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "tokio", "tokio-stream", @@ -10012,7 +10013,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "clap", "eyre", @@ -10027,7 +10028,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "aquamarine", @@ -10059,7 +10060,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "auto_impl", @@ -10082,7 +10083,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -10105,7 +10106,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "auto_impl", @@ -10129,7 +10130,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=gwyneth_with_debug_shit_revm_and_inspector#1b8dd7803a8ea373940c5a62ea9b52e5e8eef5be" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" dependencies = [ "alloy-rlp", "derive_more 1.0.0", @@ -10153,7 +10154,7 @@ dependencies = [ [[package]] name = "revm" version = "14.0.1" -source = "git+https://github.com/taikoxyz/revm.git?branch=gwyneth-debug-shit#c668ef09dc9a9f18af55d4e453026a5d2b541122" +source = "git+https://github.com/taikoxyz/revm.git?branch=changeset#7e3953c0ef54f87643c1117a3b45c78a4a018772" dependencies = [ "auto_impl", "cfg-if", @@ -10167,7 +10168,7 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.6.0" -source = "git+https://github.com/taikoxyz/revm-inspectors.git?branch=main-rbuilder#95bcbfb09cfb7011cf0c3e360e3d7258bc8a8f84" +source = "git+https://github.com/taikoxyz/revm-inspectors.git?branch=main-rbuilder#c00d618ed1425308484564a75b07dfa3c45a4fd8" dependencies = [ "alloy-primitives 0.8.7", "alloy-rpc-types-eth", @@ -10183,7 +10184,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "10.0.1" -source = "git+https://github.com/taikoxyz/revm.git?branch=gwyneth-debug-shit#c668ef09dc9a9f18af55d4e453026a5d2b541122" +source = "git+https://github.com/taikoxyz/revm.git?branch=changeset#7e3953c0ef54f87643c1117a3b45c78a4a018772" dependencies = [ "revm-primitives", "serde", @@ -10192,7 +10193,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "11.0.1" -source = "git+https://github.com/taikoxyz/revm.git?branch=gwyneth-debug-shit#c668ef09dc9a9f18af55d4e453026a5d2b541122" +source = "git+https://github.com/taikoxyz/revm.git?branch=changeset#7e3953c0ef54f87643c1117a3b45c78a4a018772" dependencies = [ "aurora-engine-modexp", "blst", @@ -10210,7 +10211,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "9.0.1" -source = "git+https://github.com/taikoxyz/revm.git?branch=gwyneth-debug-shit#c668ef09dc9a9f18af55d4e453026a5d2b541122" +source = "git+https://github.com/taikoxyz/revm.git?branch=changeset#7e3953c0ef54f87643c1117a3b45c78a4a018772" dependencies = [ "alloy-eips", "alloy-primitives 0.8.7", diff --git a/Cargo.toml b/Cargo.toml index 099abb06..71135f8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,32 +85,32 @@ bincode = "1.3" # 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 = { git = "https://github.com/taikoxyz/revm.git", branch = "gwyneth-debug-shit" } -revm-primitives = { git = "https://github.com/taikoxyz/revm.git", branch = "gwyneth-debug-shit" } -revm-interpreter = { git = "https://github.com/taikoxyz/revm.git", branch = "gwyneth-debug-shit" } -revm-precompile = { git = "https://github.com/taikoxyz/revm.git", branch = "gwyneth-debug-shit" } +revm = { git = "https://github.com/taikoxyz/revm.git", branch = "changeset" } +revm-primitives = { git = "https://github.com/taikoxyz/revm.git", branch = "changeset" } +revm-interpreter = { git = "https://github.com/taikoxyz/revm.git", branch = "changeset" } +revm-precompile = { git = "https://github.com/taikoxyz/revm.git", branch = "changeset" } 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/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-db = {git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-db-common = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-errors = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-libmdbx = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-payload-builder = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-node-api = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-trie = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-trie-parallel = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-basic-payload-builder = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-node-core = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-primitives = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-provider = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-chainspec = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-evm = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-evm-ethereum = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-db-api = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-execution-errors = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } -reth-trie-db = { git = "https://github.com/taikoxyz/gwyneth", branch = "gwyneth_with_debug_shit_revm_and_inspector" } +reth = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-db = {git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-db-common = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-errors = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-libmdbx = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-payload-builder = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-node-api = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-trie = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-trie-parallel = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-basic-payload-builder = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-node-core = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-primitives = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-provider = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-chainspec = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-evm = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-evm-ethereum = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-db-api = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-execution-errors = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } +reth-trie-db = { git = "https://github.com/taikoxyz/gwyneth", branch = "changeset" } #reth = { path = "../../revm-dani/gwyneth/bin/reth" } #reth-db = { path = "../../revm-dani/gwyneth/crates/storage/db" } diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index b67c9b71..f65e139f 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -45,8 +45,8 @@ use reth_evm_ethereum::{eip6110::parse_deposits_from_receipts, revm_spec, EthEvm use reth_node_api::PayloadBuilderAttributes; use reth_payload_builder::{database::SyncCachedReads as CachedReads, EthPayloadBuilderAttributes}; use revm::{ - db::states::bundle_state::BundleRetention::{self, PlainState}, - primitives::{BlobExcessGasAndPrice, BlockEnv, CfgEnvWithHandlerCfg, SpecId}, + db::states::{bundle_state::BundleRetention::{self, PlainState}, reverts::Reverts}, + primitives::{BlobExcessGasAndPrice, BlockEnv, CfgEnvWithHandlerCfg, SpecId}, TransitionState, }; use serde::Deserialize; use std::{hash::Hash, str::FromStr, sync::Arc}; @@ -748,7 +748,7 @@ impl PartialBlock { let (cached_reads, bundle) = state.clone_bundle_and_cache(); let execution_outcome = ExecutionOutcome::new( - Some(ctx.chain_spec.chain.id()), + ctx.chain_spec.chain.id(), bundle, Receipts::from(vec![self .receipts @@ -769,8 +769,7 @@ impl PartialBlock { // Brecht: state root calculation // TODO Brecht: Fix - let mut root_hash_config = root_hash_config.clone(); - //root_hash_config.mode = RootHashMode::IgnoreParentHash; + let root_hash_config = root_hash_config.clone(); let state_root = calculate_state_root( provider_factories.get(&chain_id).unwrap().clone(), ctx.attributes.parent, @@ -823,6 +822,16 @@ impl PartialBlock { for chain_id in chain_ids { let mut execution_outcome = execution_outcome.filter_chain(chain_id); + execution_outcome.bundle.reverts = Reverts::default(); + + let mut transition_state = TransitionState::default(); + for trans in state.transitions.iter() { + let vec: Vec<(_, _)> = trans.transitions.clone().into_iter().collect(); + transition_state.add_transitions(vec); + } + execution_outcome.bundle.apply_transitions_and_create_reverts(transition_state, BundleRetention::Reverts); + println!("reverts: {:?}", execution_outcome.bundle.reverts); + let mut state_diff = execution_outcome_to_state_diff(&execution_outcome, B256::ZERO, self.gas_used); // Filter out accounts state_diff.accounts = state_diff.clone().accounts.into_iter().filter(|account| account.address != alloy_eips::eip4788::BEACON_ROOTS_ADDRESS && account.address != alloy_eips::eip2935::HISTORY_STORAGE_ADDRESS).collect::>(); diff --git a/crates/rbuilder/src/building/order_commit.rs b/crates/rbuilder/src/building/order_commit.rs index 62bab3bb..e7d74378 100644 --- a/crates/rbuilder/src/building/order_commit.rs +++ b/crates/rbuilder/src/building/order_commit.rs @@ -25,7 +25,7 @@ use reth_provider::{StateProvider, StateProviderBox}; use revm::{ db::{states::bundle_state::BundleRetention, BundleState}, inspector_handle_register, - primitives::{db::WrapDatabaseRef, EVMError, Env, ExecutionResult, InvalidTransaction, TxEnv}, DatabaseCommit, State, SyncDatabase as Database, + primitives::{db::WrapDatabaseRef, EVMError, Env, ExecutionResult, InvalidTransaction, TxEnv}, DatabaseCommit, State, SyncDatabase as Database, TransitionState, }; use revm_primitives::ChainAddress; @@ -39,6 +39,7 @@ pub struct BlockState { providers: HashMap>, cached_reads: CachedReads, bundle_state: Option, + pub transitions: Vec, } impl BlockState { @@ -53,6 +54,7 @@ impl BlockState { providers, cached_reads: CachedReads::default(), bundle_state: Some(BundleState::default()), + transitions: Vec::default(), } } @@ -361,6 +363,7 @@ impl<'a, 'b, Tracer: SimulationTracer> PartialBlockFork<'a, 'b, Tracer> { .rollbacks .checked_sub(rollback_point.rollobacks) .expect("incorrect rollback"); + self.state.transitions.pop(); let bundle_state = self.state.bundle_state.as_mut().expect("no bundle state"); bundle_state.revert(rollbacks); self.rollbacks = rollback_point.rollobacks; @@ -409,105 +412,113 @@ impl<'a, 'b, Tracer: SimulationTracer> PartialBlockFork<'a, 'b, Tracer> { let ctx = &ctx.chains[&tx_with_blobs.as_ref().chain_id().unwrap()]; - let mut db = self.state.new_db_ref(); - let tx = &tx_with_blobs.internal_tx_unsecure(); - if ctx.blocklist.contains(&tx.signer()) - || tx - .to() - .map(|to| ctx.blocklist.contains(&to)) - .unwrap_or(false) - { - return Ok(Err(TransactionErr::Blocklist)); - } + let (tx, transition_state) = { + let mut db = self.state.new_db_ref(); + let tx = &tx_with_blobs.internal_tx_unsecure(); + if ctx.blocklist.contains(&tx.signer()) + || tx + .to() + .map(|to| ctx.blocklist.contains(&to)) + .unwrap_or(false) + { + return Ok(Err(TransactionErr::Blocklist)); + } - match ctx - .block_env - .gas_limit - .checked_sub(U256::from(cumulative_gas_used + gas_reserved)) - { - Some(gas_left) => { - if tx.gas_limit() > gas_left.to::() { - return Ok(Err(TransactionErr::GasLeft)); + match ctx + .block_env + .gas_limit + .checked_sub(U256::from(cumulative_gas_used + gas_reserved)) + { + Some(gas_left) => { + if tx.gas_limit() > gas_left.to::() { + return Ok(Err(TransactionErr::GasLeft)); + } } + None => return Ok(Err(TransactionErr::GasLeft)), } - None => return Ok(Err(TransactionErr::GasLeft)), - } - let mut tx_env = TxEnv::default(); - let tx_signed = tx_with_blobs.internal_tx_unsecure().clone().into_signed(); - tx_signed.fill_tx_env(&mut tx_env, tx_signed.recover_signer().unwrap()); + let mut tx_env = TxEnv::default(); + let tx_signed = tx_with_blobs.internal_tx_unsecure().clone().into_signed(); + tx_signed.fill_tx_env(&mut tx_env, tx_signed.recover_signer().unwrap()); - let env = Env { - cfg: ctx.initialized_cfg.cfg_env.clone(), - block: ctx.block_env.clone(), - tx: tx_env, - }; + let env = Env { + cfg: ctx.initialized_cfg.cfg_env.clone(), + block: ctx.block_env.clone(), + tx: tx_env, + }; - let used_state_tracer = self.tracer.as_mut().and_then(|t| t.get_used_state_tracer()); - let mut rbuilder_inspector = RBuilderEVMInspector::new(tx, used_state_tracer); + let used_state_tracer = self.tracer.as_mut().and_then(|t| t.get_used_state_tracer()); + let mut rbuilder_inspector = RBuilderEVMInspector::new(tx, used_state_tracer); + + let mut env = env.clone(); + env.cfg.chain_id = tx.chain_id().unwrap(); + //println!("active remv chain_id: {}", env.cfg.chain_id); + + let mut evm = revm::Evm::builder() + .with_spec_id(ctx.spec_id) + .with_env(Box::new(env)) + .with_db(db.as_mut()) + .with_external_context(&mut rbuilder_inspector) + .append_handler_register(inspector_handle_register) + .build(); + let res = match evm.transact() { + Ok(res) => res, + Err(err) => match err { + EVMError::Transaction(tx_err) => { + return Ok(Err(TransactionErr::InvalidTransaction(tx_err))) + } + EVMError::Database(_) + | EVMError::Header(_) + | EVMError::Custom(_) + | EVMError::Precompile(_) => return Err(err.into()), + }, + }; + let mut db_context = evm.into_context(); + let db = &mut db_context.evm.db; + let access_list = rbuilder_inspector.into_access_list(); + if let Some(tracer) = &mut self.tracer { + tracer.gas_used(res.result.gas_used()); + } + if access_list + .flatten() + .any(|(a, _)| ctx.blocklist.contains(&a)) + { + return Ok(Err(TransactionErr::Blocklist)); + } + db.commit(res.state); + let stuff = db.transition_state.clone().unwrap_or_default(); + db.merge_transitions(BundleRetention::Reverts); + self.rollbacks += 1; - let mut env = env.clone(); - env.cfg.chain_id = tx.chain_id().unwrap(); - //println!("active remv chain_id: {}", env.cfg.chain_id); + // add gas used by the transaction to cumulative gas used, before creating the receipt + let gas_used = res.result.gas_used(); - let mut evm = revm::Evm::builder() - .with_spec_id(ctx.spec_id) - .with_env(Box::new(env)) - .with_db(db.as_mut()) - .with_external_context(&mut rbuilder_inspector) - .append_handler_register(inspector_handle_register) - .build(); - let res = match evm.transact() { - Ok(res) => res, - Err(err) => match err { - EVMError::Transaction(tx_err) => { - return Ok(Err(TransactionErr::InvalidTransaction(tx_err))) - } - EVMError::Database(_) - | EVMError::Header(_) - | EVMError::Custom(_) - | EVMError::Precompile(_) => return Err(err.into()), - }, - }; - let mut db_context = evm.into_context(); - let db = &mut db_context.evm.db; - let access_list = rbuilder_inspector.into_access_list(); - if let Some(tracer) = &mut self.tracer { - tracer.gas_used(res.result.gas_used()); - } - if access_list - .flatten() - .any(|(a, _)| ctx.blocklist.contains(&a)) - { - return Ok(Err(TransactionErr::Blocklist)); - } - db.commit(res.state); - db.merge_transitions(BundleRetention::Reverts); - self.rollbacks += 1; + cumulative_gas_used += gas_used; + cumulative_blob_gas_used += blob_gas_used; - // add gas used by the transaction to cumulative gas used, before creating the receipt - let gas_used = res.result.gas_used(); - - cumulative_gas_used += gas_used; - cumulative_blob_gas_used += blob_gas_used; + let receipt = Receipt { + tx_type: tx.tx_type(), + success: res.result.is_success(), + cumulative_gas_used, + logs: res.result.logs().to_vec(), + }; - let receipt = Receipt { - tx_type: tx.tx_type(), - success: res.result.is_success(), - cumulative_gas_used, - logs: res.result.logs().to_vec(), + (TransactionOk { + exec_result: res.result, + gas_used, + blob_gas_used, + cumulative_blob_gas_used, + cumulative_gas_used, + tx: tx_with_blobs.clone(), + nonce_updated: (tx.signer(), tx.nonce() + 1), + receipt, + } + , stuff) }; - Ok(Ok(TransactionOk { - exec_result: res.result, - gas_used, - blob_gas_used, - cumulative_blob_gas_used, - cumulative_gas_used, - tx: tx_with_blobs.clone(), - nonce_updated: (tx.signer(), tx.nonce() + 1), - receipt, - })) + self.state.transitions.push(transition_state); + + Ok(Ok(tx)) } /// block/timestamps check + commit_bundle_no_rollback + rollbacks diff --git a/crates/rbuilder/src/utils/provider_factory_reopen.rs b/crates/rbuilder/src/utils/provider_factory_reopen.rs index b2d996c2..d777c6eb 100644 --- a/crates/rbuilder/src/utils/provider_factory_reopen.rs +++ b/crates/rbuilder/src/utils/provider_factory_reopen.rs @@ -115,11 +115,12 @@ pub fn check_provider_factory_health( let num = current_block_number - i; let hash = provider_factory.block_hash(num)?; if hash.is_none() { - eyre::bail!( + println!( "Missing historical block hash for block {}, current block: {}", current_block_number - i, current_block_number ); + break; } if num == 0 { From ba11f47562d14a3e1bfe9782deae5d83dfa9d897 Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Mon, 13 Jan 2025 23:23:37 +0100 Subject: [PATCH 2/3] Fix reverts being per tx instead of per block --- Cargo.lock | 210 +++++++++---------- crates/rbuilder/src/building/mod.rs | 18 +- crates/rbuilder/src/building/order_commit.rs | 187 ++++++++--------- 3 files changed, 198 insertions(+), 217 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 01268bc7..0bbd0202 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/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "alloy-serde", @@ -5343,7 +5343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -6179,7 +6179,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", @@ -7899,7 +7899,7 @@ dependencies = [ [[package]] name = "reth" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "aquamarine", @@ -7982,7 +7982,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -8010,7 +8010,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "futures-core", @@ -8033,7 +8033,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "futures", "itertools 0.13.0", @@ -8067,7 +8067,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "aquamarine", "bincode", @@ -8101,7 +8101,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -8113,7 +8113,7 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-signer", "alloy-signer-local", @@ -8139,7 +8139,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-chains", "alloy-eips", @@ -8159,7 +8159,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "ahash", "backon", @@ -8213,7 +8213,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-tasks", "tokio", @@ -8223,7 +8223,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-eips", "alloy-primitives 0.8.7", @@ -8238,7 +8238,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8254,7 +8254,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -8265,7 +8265,7 @@ dependencies = [ [[package]] name = "reth-config" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "eyre", "humantime-serde", @@ -8279,7 +8279,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "auto_impl", "derive_more 1.0.0", @@ -8289,7 +8289,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-chainspec", "reth-consensus", @@ -8299,7 +8299,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8322,7 +8322,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "bytes", "derive_more 1.0.0", @@ -8353,7 +8353,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "arbitrary", "bytes", @@ -8376,7 +8376,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-genesis", "boyer-moore-magiclen", @@ -8402,7 +8402,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "arbitrary", "bytes", @@ -8416,7 +8416,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -8440,7 +8440,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -8464,7 +8464,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "data-encoding", @@ -8486,7 +8486,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "futures", @@ -8513,7 +8513,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "aes", "alloy-primitives 0.8.7", @@ -8544,7 +8544,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-chainspec", "reth-payload-primitives", @@ -8554,7 +8554,7 @@ dependencies = [ [[package]] name = "reth-engine-service" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "futures", "pin-project", @@ -8578,7 +8578,7 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "futures", "metrics", @@ -8613,7 +8613,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "eyre", "futures", @@ -8643,7 +8643,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", @@ -8656,7 +8656,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "bytes", @@ -8681,7 +8681,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-chains", "alloy-genesis", @@ -8697,7 +8697,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-chainspec", "reth-consensus", @@ -8709,7 +8709,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "reth-chainspec", @@ -8727,7 +8727,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-chains", "alloy-primitives 0.8.7", @@ -8747,7 +8747,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-basic-payload-builder", "reth-errors", @@ -8767,7 +8767,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "rayon", "reth-db-api", @@ -8777,7 +8777,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-eips", "auto_impl", @@ -8795,7 +8795,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-eips", "alloy-sol-types", @@ -8814,7 +8814,7 @@ dependencies = [ [[package]] name = "reth-evm-optimism" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-chainspec", "reth-ethereum-forks", @@ -8834,7 +8834,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-eips", "alloy-primitives 0.8.7", @@ -8850,7 +8850,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-execution-errors", "reth-primitives", @@ -8862,7 +8862,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "eyre", "futures", @@ -8889,7 +8889,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "reth-provider", @@ -8898,7 +8898,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "serde", "serde_json", @@ -8908,7 +8908,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "async-trait", "bytes", @@ -8929,7 +8929,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -8945,7 +8945,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "bindgen", "cc", @@ -8954,7 +8954,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "futures", "metrics", @@ -8966,7 +8966,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "proc-macro2", "quote", @@ -8977,7 +8977,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", ] @@ -8985,7 +8985,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "futures-util", "reqwest 0.12.5", @@ -8997,7 +8997,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "aquamarine", @@ -9045,7 +9045,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "alloy-rpc-types-admin", @@ -9068,7 +9068,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "auto_impl", "derive_more 1.0.0", @@ -9086,7 +9086,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "alloy-rlp", @@ -9101,7 +9101,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -9115,7 +9115,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "anyhow", "bincode", @@ -9135,7 +9135,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-chainspec", "reth-db-api", @@ -9153,7 +9153,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-network", "aquamarine", @@ -9211,7 +9211,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-genesis", "alloy-rpc-types-engine", @@ -9261,7 +9261,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "eyre", "reth-auto-seal-consensus", @@ -9285,7 +9285,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rpc-types-engine", "futures", @@ -9307,7 +9307,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "eyre", "http 1.1.0", @@ -9331,7 +9331,7 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-chainspec", "reth-consensus", @@ -9343,12 +9343,12 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" [[package]] name = "reth-optimism-rpc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "jsonrpsee-types 0.24.3", @@ -9380,7 +9380,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "futures-util", "metrics", @@ -9403,7 +9403,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-chain-state", "reth-chainspec", @@ -9419,7 +9419,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-chainspec", "reth-primitives", @@ -9430,7 +9430,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9467,7 +9467,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9491,7 +9491,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rpc-types-engine", "auto_impl", @@ -9530,7 +9530,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "itertools 0.13.0", @@ -9556,7 +9556,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "bytes", @@ -9570,7 +9570,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "reth-chainspec", "reth-consensus-common", @@ -9585,7 +9585,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-dyn-abi", "alloy-genesis", @@ -9641,7 +9641,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-json-rpc", "jsonrpsee 0.24.3", @@ -9655,7 +9655,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "http 1.1.0", "jsonrpsee 0.24.3", @@ -9688,7 +9688,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "async-trait", "jsonrpsee-core 0.24.3", @@ -9716,7 +9716,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-dyn-abi", "alloy-json-rpc", @@ -9753,7 +9753,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-sol-types", "derive_more 1.0.0", @@ -9791,7 +9791,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rpc-types-engine", "http 1.1.0", @@ -9804,7 +9804,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "jsonrpsee-core 0.24.3", @@ -9820,7 +9820,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "alloy-rpc-types", @@ -9840,7 +9840,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -9852,7 +9852,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "futures-util", "itertools 0.13.0", @@ -9886,7 +9886,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "aquamarine", @@ -9913,7 +9913,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "bytes", @@ -9926,7 +9926,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "parking_lot 0.12.3", @@ -9946,7 +9946,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-primitives 0.8.7", "clap", @@ -9958,7 +9958,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "auto_impl", "reth-chainspec", @@ -9974,7 +9974,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "derive_more 1.0.0", @@ -9985,7 +9985,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "auto_impl", "dyn-clone", @@ -10003,7 +10003,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "tokio", "tokio-stream", @@ -10013,7 +10013,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "clap", "eyre", @@ -10028,7 +10028,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "aquamarine", @@ -10060,7 +10060,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "auto_impl", @@ -10083,7 +10083,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -10106,7 +10106,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "auto_impl", @@ -10130,7 +10130,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.0.6" -source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#a185e8763dd675979b3bbbc3b260097500463e19" +source = "git+https://github.com/taikoxyz/gwyneth?branch=changeset#0836f7774f48fc2da75bac7a6e20672681745003" dependencies = [ "alloy-rlp", "derive_more 1.0.0", diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index f65e139f..aa5d5e89 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -822,16 +822,6 @@ impl PartialBlock { for chain_id in chain_ids { let mut execution_outcome = execution_outcome.filter_chain(chain_id); - execution_outcome.bundle.reverts = Reverts::default(); - - let mut transition_state = TransitionState::default(); - for trans in state.transitions.iter() { - let vec: Vec<(_, _)> = trans.transitions.clone().into_iter().collect(); - transition_state.add_transitions(vec); - } - execution_outcome.bundle.apply_transitions_and_create_reverts(transition_state, BundleRetention::Reverts); - println!("reverts: {:?}", execution_outcome.bundle.reverts); - let mut state_diff = execution_outcome_to_state_diff(&execution_outcome, B256::ZERO, self.gas_used); // Filter out accounts state_diff.accounts = state_diff.clone().accounts.into_iter().filter(|account| account.address != alloy_eips::eip4788::BEACON_ROOTS_ADDRESS && account.address != alloy_eips::eip2935::HISTORY_STORAGE_ADDRESS).collect::>(); @@ -840,9 +830,11 @@ impl PartialBlock { } if chain_id == super_ctx.parent_chain_id { + // The reverts will still contain the address but that's fine, we're never going to use that on L1 anyway execution_outcome.bundle.state = execution_outcome.bundle.state.into_iter().filter(|account| account.0.1 != ctx.block_env.coinbase.1).collect(); } + // Only make a block for chains that have changes if !state_diff.accounts.is_empty() { let ctx = &super_ctx.chains[&chain_id]; @@ -857,11 +849,11 @@ impl PartialBlock { )?; state_diff.state_root = state_root; + state_diff.transactions_root = transactions_root; + state_diff.bundle.reverts = reth_provider::merge_reverts(&state_diff.bundle.reverts); - //let extra_data = Bytes::from(serde_json::to_string(&state_diff).unwrap().into_bytes()); let extra_data = Bytes::from(bincode::serialize(&state_diff).unwrap()); - - println!("extra_data: {}", extra_data); + // println!("extra_data: {}", extra_data); let header = Header { parent_hash: ctx.attributes.parent, diff --git a/crates/rbuilder/src/building/order_commit.rs b/crates/rbuilder/src/building/order_commit.rs index e7d74378..62bab3bb 100644 --- a/crates/rbuilder/src/building/order_commit.rs +++ b/crates/rbuilder/src/building/order_commit.rs @@ -25,7 +25,7 @@ use reth_provider::{StateProvider, StateProviderBox}; use revm::{ db::{states::bundle_state::BundleRetention, BundleState}, inspector_handle_register, - primitives::{db::WrapDatabaseRef, EVMError, Env, ExecutionResult, InvalidTransaction, TxEnv}, DatabaseCommit, State, SyncDatabase as Database, TransitionState, + primitives::{db::WrapDatabaseRef, EVMError, Env, ExecutionResult, InvalidTransaction, TxEnv}, DatabaseCommit, State, SyncDatabase as Database, }; use revm_primitives::ChainAddress; @@ -39,7 +39,6 @@ pub struct BlockState { providers: HashMap>, cached_reads: CachedReads, bundle_state: Option, - pub transitions: Vec, } impl BlockState { @@ -54,7 +53,6 @@ impl BlockState { providers, cached_reads: CachedReads::default(), bundle_state: Some(BundleState::default()), - transitions: Vec::default(), } } @@ -363,7 +361,6 @@ impl<'a, 'b, Tracer: SimulationTracer> PartialBlockFork<'a, 'b, Tracer> { .rollbacks .checked_sub(rollback_point.rollobacks) .expect("incorrect rollback"); - self.state.transitions.pop(); let bundle_state = self.state.bundle_state.as_mut().expect("no bundle state"); bundle_state.revert(rollbacks); self.rollbacks = rollback_point.rollobacks; @@ -412,113 +409,105 @@ impl<'a, 'b, Tracer: SimulationTracer> PartialBlockFork<'a, 'b, Tracer> { let ctx = &ctx.chains[&tx_with_blobs.as_ref().chain_id().unwrap()]; - let (tx, transition_state) = { - let mut db = self.state.new_db_ref(); - let tx = &tx_with_blobs.internal_tx_unsecure(); - if ctx.blocklist.contains(&tx.signer()) - || tx - .to() - .map(|to| ctx.blocklist.contains(&to)) - .unwrap_or(false) - { - return Ok(Err(TransactionErr::Blocklist)); - } + let mut db = self.state.new_db_ref(); + let tx = &tx_with_blobs.internal_tx_unsecure(); + if ctx.blocklist.contains(&tx.signer()) + || tx + .to() + .map(|to| ctx.blocklist.contains(&to)) + .unwrap_or(false) + { + return Ok(Err(TransactionErr::Blocklist)); + } - match ctx - .block_env - .gas_limit - .checked_sub(U256::from(cumulative_gas_used + gas_reserved)) - { - Some(gas_left) => { - if tx.gas_limit() > gas_left.to::() { - return Ok(Err(TransactionErr::GasLeft)); - } + match ctx + .block_env + .gas_limit + .checked_sub(U256::from(cumulative_gas_used + gas_reserved)) + { + Some(gas_left) => { + if tx.gas_limit() > gas_left.to::() { + return Ok(Err(TransactionErr::GasLeft)); } - None => return Ok(Err(TransactionErr::GasLeft)), } + None => return Ok(Err(TransactionErr::GasLeft)), + } - let mut tx_env = TxEnv::default(); - let tx_signed = tx_with_blobs.internal_tx_unsecure().clone().into_signed(); - tx_signed.fill_tx_env(&mut tx_env, tx_signed.recover_signer().unwrap()); + let mut tx_env = TxEnv::default(); + let tx_signed = tx_with_blobs.internal_tx_unsecure().clone().into_signed(); + tx_signed.fill_tx_env(&mut tx_env, tx_signed.recover_signer().unwrap()); - let env = Env { - cfg: ctx.initialized_cfg.cfg_env.clone(), - block: ctx.block_env.clone(), - tx: tx_env, - }; + let env = Env { + cfg: ctx.initialized_cfg.cfg_env.clone(), + block: ctx.block_env.clone(), + tx: tx_env, + }; - let used_state_tracer = self.tracer.as_mut().and_then(|t| t.get_used_state_tracer()); - let mut rbuilder_inspector = RBuilderEVMInspector::new(tx, used_state_tracer); - - let mut env = env.clone(); - env.cfg.chain_id = tx.chain_id().unwrap(); - //println!("active remv chain_id: {}", env.cfg.chain_id); - - let mut evm = revm::Evm::builder() - .with_spec_id(ctx.spec_id) - .with_env(Box::new(env)) - .with_db(db.as_mut()) - .with_external_context(&mut rbuilder_inspector) - .append_handler_register(inspector_handle_register) - .build(); - let res = match evm.transact() { - Ok(res) => res, - Err(err) => match err { - EVMError::Transaction(tx_err) => { - return Ok(Err(TransactionErr::InvalidTransaction(tx_err))) - } - EVMError::Database(_) - | EVMError::Header(_) - | EVMError::Custom(_) - | EVMError::Precompile(_) => return Err(err.into()), - }, - }; - let mut db_context = evm.into_context(); - let db = &mut db_context.evm.db; - let access_list = rbuilder_inspector.into_access_list(); - if let Some(tracer) = &mut self.tracer { - tracer.gas_used(res.result.gas_used()); - } - if access_list - .flatten() - .any(|(a, _)| ctx.blocklist.contains(&a)) - { - return Ok(Err(TransactionErr::Blocklist)); - } - db.commit(res.state); - let stuff = db.transition_state.clone().unwrap_or_default(); - db.merge_transitions(BundleRetention::Reverts); - self.rollbacks += 1; + let used_state_tracer = self.tracer.as_mut().and_then(|t| t.get_used_state_tracer()); + let mut rbuilder_inspector = RBuilderEVMInspector::new(tx, used_state_tracer); - // add gas used by the transaction to cumulative gas used, before creating the receipt - let gas_used = res.result.gas_used(); + let mut env = env.clone(); + env.cfg.chain_id = tx.chain_id().unwrap(); + //println!("active remv chain_id: {}", env.cfg.chain_id); - cumulative_gas_used += gas_used; - cumulative_blob_gas_used += blob_gas_used; + let mut evm = revm::Evm::builder() + .with_spec_id(ctx.spec_id) + .with_env(Box::new(env)) + .with_db(db.as_mut()) + .with_external_context(&mut rbuilder_inspector) + .append_handler_register(inspector_handle_register) + .build(); + let res = match evm.transact() { + Ok(res) => res, + Err(err) => match err { + EVMError::Transaction(tx_err) => { + return Ok(Err(TransactionErr::InvalidTransaction(tx_err))) + } + EVMError::Database(_) + | EVMError::Header(_) + | EVMError::Custom(_) + | EVMError::Precompile(_) => return Err(err.into()), + }, + }; + let mut db_context = evm.into_context(); + let db = &mut db_context.evm.db; + let access_list = rbuilder_inspector.into_access_list(); + if let Some(tracer) = &mut self.tracer { + tracer.gas_used(res.result.gas_used()); + } + if access_list + .flatten() + .any(|(a, _)| ctx.blocklist.contains(&a)) + { + return Ok(Err(TransactionErr::Blocklist)); + } + db.commit(res.state); + db.merge_transitions(BundleRetention::Reverts); + self.rollbacks += 1; - let receipt = Receipt { - tx_type: tx.tx_type(), - success: res.result.is_success(), - cumulative_gas_used, - logs: res.result.logs().to_vec(), - }; + // add gas used by the transaction to cumulative gas used, before creating the receipt + let gas_used = res.result.gas_used(); - (TransactionOk { - exec_result: res.result, - gas_used, - blob_gas_used, - cumulative_blob_gas_used, - cumulative_gas_used, - tx: tx_with_blobs.clone(), - nonce_updated: (tx.signer(), tx.nonce() + 1), - receipt, - } - , stuff) - }; + cumulative_gas_used += gas_used; + cumulative_blob_gas_used += blob_gas_used; - self.state.transitions.push(transition_state); + let receipt = Receipt { + tx_type: tx.tx_type(), + success: res.result.is_success(), + cumulative_gas_used, + logs: res.result.logs().to_vec(), + }; - Ok(Ok(tx)) + Ok(Ok(TransactionOk { + exec_result: res.result, + gas_used, + blob_gas_used, + cumulative_blob_gas_used, + cumulative_gas_used, + tx: tx_with_blobs.clone(), + nonce_updated: (tx.signer(), tx.nonce() + 1), + receipt, + })) } /// block/timestamps check + commit_bundle_no_rollback + rollbacks From 46dc01e49fcdac1876b4a0dea631b081eb5c74e3 Mon Sep 17 00:00:00 2001 From: Brecht Devos Date: Mon, 13 Jan 2025 23:57:11 +0100 Subject: [PATCH 3/3] remove some sleeps and comments --- crates/rbuilder/src/building/builders/ordering_builder.rs | 2 +- crates/rbuilder/src/building/mod.rs | 2 -- crates/rbuilder/src/live_builder/mod.rs | 4 ++-- .../src/live_builder/order_input/txpool_fetcher.rs | 7 ++++--- crates/rbuilder/src/live_builder/simulation/sim_worker.rs | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/crates/rbuilder/src/building/builders/ordering_builder.rs b/crates/rbuilder/src/building/builders/ordering_builder.rs index 0229ddc6..017c5985 100644 --- a/crates/rbuilder/src/building/builders/ordering_builder.rs +++ b/crates/rbuilder/src/building/builders/ordering_builder.rs @@ -88,7 +88,7 @@ pub fn run_ordering_builder( let mut removed_orders = Vec::new(); let mut use_suggested_fee_recipient_as_coinbase = config.coinbase_payment; 'building: loop { - sleep(Duration::from_millis(1000)); + //sleep(Duration::from_millis(1000)); if input.cancel.is_cancelled() { break 'building; diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index aa5d5e89..08bdf72a 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -187,7 +187,6 @@ impl ChainBlockBuildingContext { extra_data: Vec, spec_id: Option, ) -> ChainBlockBuildingContext { - println!("from_attributes"); let attributes = EthPayloadBuilderAttributes::try_new( attributes.data.parent_block_hash, attributes.data.payload_attributes.clone(), @@ -742,7 +741,6 @@ impl PartialBlock { let requests_root = calculate_requests_root(&requests); (Some(requests.into()), Some(requests_root)) } else { - println!("prague not active"); (None, None) }; diff --git a/crates/rbuilder/src/live_builder/mod.rs b/crates/rbuilder/src/live_builder/mod.rs index 5017157c..50a7008a 100644 --- a/crates/rbuilder/src/live_builder/mod.rs +++ b/crates/rbuilder/src/live_builder/mod.rs @@ -253,9 +253,9 @@ impl ); // TODO(Brecht): hack to wait until latest L2 block is also created, which is later then when we get the payload build event - sleep(Duration::from_millis(4000)); + //sleep(Duration::from_millis(4000)); - println!("payload: {:?}", payload); + //println!("payload: {:?}", payload); // TODO: Brecht let mut chains = HashMap::default(); diff --git a/crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs b/crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs index 2f7df1c1..2f873772 100644 --- a/crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs +++ b/crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs @@ -42,7 +42,7 @@ pub async fn subscribe_to_txpool_with_blobs( let mut stream = pin!(stream); while let Some(tx_hash) = stream.next().await { - println!("Dani debug: Some txn arrived on {:?}", config.ipc_path); + println!("New tx arrived on {:?}!", config.ipc_path); // TODO: Skip L1 transactions for now because circular if config.ipc_path.to_str().unwrap() == "/tmp/reth.ipc" { @@ -77,7 +77,7 @@ pub async fn subscribe_to_txpool_with_blobs( trace!(order = ?order.id(), parse_duration_mus = parse_duration.as_micros(), "Mempool transaction received with blobs"); add_txfetcher_time_to_query(parse_duration); - println!("Dani debug: About to send order to results channel. Order ID: {:?}", order_id); + println!("About to send order to results channel. Order ID: {:?}", order_id); match results .send_timeout( ReplaceableOrderPoolCommand::Order(order), @@ -90,10 +90,11 @@ pub async fn subscribe_to_txpool_with_blobs( error!("Failed to send txpool tx to results channel, timeout"); } Err(SendTimeoutError::Closed(_)) => { + println!("Send timeout error: closed"); break; } } - println!("Dani debug: Successfully sent order to results channel. Order ID: {:?}", order_id); + println!("Successfully sent order to results channel. Order ID: {:?}", order_id); } // stream is closed, cancelling token because builder can't work without this stream diff --git a/crates/rbuilder/src/live_builder/simulation/sim_worker.rs b/crates/rbuilder/src/live_builder/simulation/sim_worker.rs index a74a7ab3..8b26fb6f 100644 --- a/crates/rbuilder/src/live_builder/simulation/sim_worker.rs +++ b/crates/rbuilder/src/live_builder/simulation/sim_worker.rs @@ -46,7 +46,7 @@ pub fn run_sim_worker( // contexts are created for a duration of the slot so this is not a problem sleep(Duration::from_millis(50)); } - sleep(Duration::from_millis(500)); + //sleep(Duration::from_millis(500)); }; println!("Brecht: simming 3");