diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 0a81af3a933..4b46899275f 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -11971,7 +11971,7 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "reth-basic-payload-builder" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -11998,7 +11998,7 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12029,7 +12029,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-chains", "alloy-consensus 2.4.2", @@ -12049,7 +12049,7 @@ dependencies = [ [[package]] name = "reth-cli" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-genesis", "clap", @@ -12062,7 +12062,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-chains", "alloy-consensus 2.4.2", @@ -12152,7 +12152,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "reth-tasks", "tokio", @@ -12162,7 +12162,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -12215,7 +12215,7 @@ dependencies = [ [[package]] name = "reth-config" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "eyre", "humantime-serde", @@ -12232,7 +12232,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eip7928 0.4.10", @@ -12246,7 +12246,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12259,7 +12259,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12284,7 +12284,7 @@ dependencies = [ [[package]] name = "reth-db" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "derive_more 2.1.1", @@ -12313,7 +12313,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12340,7 +12340,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-genesis", @@ -12370,7 +12370,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -12385,7 +12385,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -12410,7 +12410,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -12434,7 +12434,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "dashmap", @@ -12458,7 +12458,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12495,7 +12495,7 @@ dependencies = [ [[package]] name = "reth-e2e-test-utils" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12554,7 +12554,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "aes 0.8.4", "alloy-primitives", @@ -12581,7 +12581,7 @@ dependencies = [ [[package]] name = "reth-engine-local" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-primitives", @@ -12604,7 +12604,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12631,7 +12631,7 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eip7928 0.4.10", @@ -12687,7 +12687,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-primitives", @@ -12717,7 +12717,7 @@ dependencies = [ [[package]] name = "reth-era" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12735,7 +12735,7 @@ dependencies = [ [[package]] name = "reth-era-downloader" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "bytes", @@ -12751,7 +12751,7 @@ dependencies = [ [[package]] name = "reth-era-utils" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-primitives", @@ -12775,7 +12775,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -12786,7 +12786,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-chains", "alloy-primitives", @@ -12815,7 +12815,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-chains", "alloy-consensus 2.4.2", @@ -12841,7 +12841,7 @@ dependencies = [ [[package]] name = "reth-ethereum" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth 2.4.2", @@ -12882,7 +12882,7 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "clap", "eyre", @@ -12905,7 +12905,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12921,7 +12921,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -12937,7 +12937,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -12951,7 +12951,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12981,7 +12981,7 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -12994,7 +12994,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "rayon", "reth-db-api", @@ -13004,7 +13004,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eip7928 0.4.10", @@ -13030,7 +13030,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -13050,7 +13050,7 @@ dependencies = [ [[package]] name = "reth-execution-cache" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "fixed-cache", @@ -13068,7 +13068,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-evm", "alloy-primitives", @@ -13081,7 +13081,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -13100,7 +13100,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -13138,7 +13138,7 @@ dependencies = [ [[package]] name = "reth-exex-test-utils" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eips 2.5.0", "eyre", @@ -13170,7 +13170,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -13184,7 +13184,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "serde", "serde_json", @@ -13194,7 +13194,7 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-primitives", @@ -13220,7 +13220,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "bytes", "futures", @@ -13240,7 +13240,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "bitflags 2.11.1", "byteorder", @@ -13257,7 +13257,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "bindgen", "cc", @@ -13266,7 +13266,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "futures", "libc", @@ -13280,7 +13280,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "ipnet", @@ -13289,7 +13289,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "futures-util", "if-addrs 0.14.0", @@ -13303,7 +13303,7 @@ dependencies = [ [[package]] name = "reth-network" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -13362,7 +13362,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-primitives", @@ -13387,7 +13387,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eip7928 0.4.10", @@ -13411,7 +13411,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -13426,7 +13426,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -13440,7 +13440,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "anyhow", "bincode 1.3.3", @@ -13458,7 +13458,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -13482,7 +13482,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -13550,7 +13550,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -13605,7 +13605,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -13658,7 +13658,7 @@ dependencies = [ [[package]] name = "reth-node-ethstats" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-primitives", @@ -13682,7 +13682,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -13706,7 +13706,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "bytes", "eyre", @@ -13736,7 +13736,7 @@ dependencies = [ [[package]] name = "reth-node-types" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "reth-chainspec", "reth-db-api", @@ -14097,6 +14097,7 @@ dependencies = [ "reth-trie-common", "reth-trie-db", "revm", + "rstest", "serde", "serde_json", "tokio", @@ -14200,6 +14201,7 @@ name = "reth-optimism-rpc" version = "2.0.0" dependencies = [ "alloy-consensus 2.4.2", + "alloy-eip7928 0.4.10", "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", @@ -14211,6 +14213,7 @@ dependencies = [ "alloy-rpc-types-debug", "alloy-rpc-types-engine", "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-trace", "alloy-serde 2.5.0", "alloy-transport", "alloy-transport-http", @@ -14260,6 +14263,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "revm", + "revm-inspectors", "rstest", "serde", "serde_json", @@ -14379,7 +14383,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-primitives", @@ -14403,7 +14407,7 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "pin-project", "reth-payload-primitives", @@ -14415,7 +14419,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -14438,7 +14442,7 @@ dependencies = [ [[package]] name = "reth-payload-util" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-primitives", @@ -14448,7 +14452,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-rpc-types-engine", @@ -14492,7 +14496,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eip7928 0.4.10", @@ -14542,7 +14546,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-primitives", @@ -14569,7 +14573,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "arbitrary", @@ -14585,7 +14589,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -14600,7 +14604,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-dyn-abi", @@ -14676,7 +14680,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eips 2.5.0", "alloy-genesis", @@ -14706,7 +14710,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-network 2.4.2", "alloy-provider", @@ -14749,7 +14753,7 @@ dependencies = [ [[package]] name = "reth-rpc-convert" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-evm", @@ -14769,7 +14773,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -14800,7 +14804,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-dyn-abi", @@ -14813,6 +14817,7 @@ dependencies = [ "alloy-rlp", "alloy-rpc-types-eth 2.4.2", "alloy-rpc-types-mev", + "alloy-rpc-types-trace", "alloy-serde 2.5.0", "async-trait", "auto_impl", @@ -14847,7 +14852,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-chains", "alloy-consensus 2.4.2", @@ -14897,7 +14902,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-rpc-types-engine", "http 1.4.0", @@ -14913,7 +14918,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -14943,7 +14948,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eip7928 0.4.10", @@ -14995,7 +15000,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -15023,7 +15028,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "arbitrary", @@ -15037,7 +15042,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "parking_lot", @@ -15057,7 +15062,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "clap", @@ -15072,7 +15077,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eip7928 0.4.10", @@ -15098,7 +15103,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -15115,7 +15120,7 @@ dependencies = [ [[package]] name = "reth-storage-overlay" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -15143,7 +15148,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "crossbeam-utils", "dashmap", @@ -15164,7 +15169,7 @@ dependencies = [ [[package]] name = "reth-testing-utils" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -15180,7 +15185,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "tokio", "tokio-stream", @@ -15190,7 +15195,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "clap", "eyre", @@ -15210,7 +15215,7 @@ dependencies = [ [[package]] name = "reth-tracing-otlp" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "base64 0.22.1", "clap", @@ -15229,7 +15234,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -15274,7 +15279,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-eips 2.5.0", @@ -15300,7 +15305,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-consensus 2.4.2", "alloy-primitives", @@ -15328,7 +15333,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "reth-db-api", @@ -15344,7 +15349,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-evm", "alloy-primitives", @@ -15367,7 +15372,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse" version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-1#89e32ef290c40de76fa635749b1f0b24859e5e35" +source = "git+https://github.com/ethereum-optimism/reth?rev=e6d32dc3ec34af42101db52f9ec21082ca6c9147#e6d32dc3ec34af42101db52f9ec21082ca6c9147" dependencies = [ "alloy-primitives", "alloy-trie", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index a4f0f0aa673..c1d33dc3a7e 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -364,79 +364,79 @@ reth-rpc-traits = { version = "0.7.0", default-features = false } reth-zstd-compressors = { version = "0.7.0", default-features = false } # ==================== RETH CRATES (git) ==================== -reth = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-basic-payload-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-chain-state = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-chainspec = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-cli = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-cli-commands = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-cli-runner = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-cli-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-consensus = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-consensus-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-db = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-db-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-db-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-downloaders = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-e2e-test-utils = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-engine-local = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-engine-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-engine-tree = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-eth-wire = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-eth-wire-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-ethereum-cli = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-ethereum-consensus = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-ethereum-forks = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-ethereum-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-evm = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-evm-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-exex = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-exex-test-utils = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-execution-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-execution-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-fs-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-ipc = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-metrics = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-network = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-network-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-network-peers = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-node-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-node-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-node-core = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-node-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-node-events = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-node-metrics = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-payload-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-payload-builder-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-payload-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-payload-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-payload-validator = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-provider = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-prune = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-prune-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-revm = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-rpc = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-rpc-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-rpc-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-rpc-engine-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-rpc-eth-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-rpc-eth-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-rpc-server-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-stages = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-stages-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-static-file = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-static-file-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-storage-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-storage-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-storage-overlay = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-tasks = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-tracing = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-transaction-pool = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-trie = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } -reth-trie-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1", default-features = false } -reth-trie-db = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-1" } +reth = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-basic-payload-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-chain-state = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-chainspec = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-cli = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-cli-commands = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-cli-runner = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-cli-util = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-consensus = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-consensus-common = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-db = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-db-api = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-db-common = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-downloaders = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-e2e-test-utils = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-engine-local = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-engine-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-engine-tree = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-errors = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-eth-wire = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-eth-wire-types = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-ethereum = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-ethereum-cli = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-ethereum-consensus = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-ethereum-forks = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-ethereum-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-evm = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-evm-ethereum = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-exex = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-exex-test-utils = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-execution-errors = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-execution-types = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-fs-util = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-ipc = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-metrics = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-network = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-network-api = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-network-peers = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-node-api = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-node-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-node-core = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-node-ethereum = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-node-events = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-node-metrics = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-payload-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-payload-builder-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-payload-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-payload-util = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-payload-validator = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-provider = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-prune = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-prune-types = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-revm = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-rpc = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-rpc-api = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-rpc-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-rpc-engine-api = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-rpc-eth-api = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-rpc-eth-types = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-rpc-server-types = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-stages = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-stages-types = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-static-file = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-static-file-types = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-storage-api = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-storage-errors = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-storage-overlay = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-tasks = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-tracing = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-transaction-pool = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-trie = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } +reth-trie-common = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147", default-features = false } +reth-trie-db = { git = "https://github.com/ethereum-optimism/reth", rev = "e6d32dc3ec34af42101db52f9ec21082ca6c9147" } # ==================== REVM (latest: op-reth versions) ==================== revm = { version = "43.0.2", default-features = false } diff --git a/rust/deny.toml b/rust/deny.toml index e73d0cc4ee8..2e501ae417c 100644 --- a/rust/deny.toml +++ b/rust/deny.toml @@ -85,6 +85,7 @@ registries = [] [sources] allow-git = [ + "https://github.com/ethereum-optimism/reth-core", "https://github.com/paradigmxyz/reth", # Maintenance fork carrying patches not yet included in the selected upstream release. "https://github.com/ethereum-optimism/reth", diff --git a/rust/op-reth/crates/node/Cargo.toml b/rust/op-reth/crates/node/Cargo.toml index 405c23e29b3..fc82dddd431 100644 --- a/rust/op-reth/crates/node/Cargo.toml +++ b/rust/op-reth/crates/node/Cargo.toml @@ -113,6 +113,7 @@ alloy-rpc-types-admin.workspace = true alloy-signer-local.workspace = true futures.workspace = true jsonrpsee.workspace = true +rstest.workspace = true metrics-util = { workspace = true, features = ["debugging"] } # Fatal-signal handler in tests/it/crash_backtrace.rs. libc.workspace = true diff --git a/rust/op-reth/crates/node/tests/it/debug_trace_post_exec.rs b/rust/op-reth/crates/node/tests/it/debug_trace_post_exec.rs index 0cbcd40ea85..9cf33cda80e 100644 --- a/rust/op-reth/crates/node/tests/it/debug_trace_post_exec.rs +++ b/rust/op-reth/crates/node/tests/it/debug_trace_post_exec.rs @@ -1,55 +1,79 @@ -//! `debug_trace*` over blocks containing an SDM post-exec (0x7d) transaction. +//! RPC replay over blocks containing an SDM post-exec (0x7d) transaction. //! -//! The RPC trace path replays each transaction directly through the EVM instead of going through -//! the block executor, so it only works on post-exec transactions because `OpEvm::transact_raw` -//! short-circuits them with the consensus-defined no-op result. Without that, tracing any block -//! that carries a 0x7d tx fails whole-block ([the bug]): the replayed post-exec tx env inherited -//! revm's mainnet default chain id, and no honest env for a zero-gas-limit transaction passes -//! validation either. +//! The settlement of an SDM refund (canonical gas, sender credit, fee-vault debits) only happens +//! inside the block executor, so every RPC path that replays block transactions must go through it. +//! A replay on the bare EVM reports pre-refund gas and unsettled balances ([#485]). //! -//! [the bug]: https://github.com/ethereum-optimism/optimism-premium/issues/163 +//! Tracing must also not fail whole-block on the 0x7d tx itself ([premium#163]): the block executor +//! and `OpEvm::transact_raw` both give it the consensus-defined no-op result. +//! +//! [#485]: https://github.com/ethereum-optimism/protocol-team/issues/485 +//! [premium#163]: https://github.com/ethereum-optimism/optimism-premium/issues/163 -use alloy_consensus::{Block, BlockBody, Header, Sealable, SignableTransaction, TxEip1559}; -use alloy_primitives::{Address, B256, Bytes, Signature, TxKind, U256}; -use alloy_rpc_types_eth::TransactionRequest; -use alloy_rpc_types_trace::{common::TraceResult, geth::GethDebugTracingOptions}; +use crate::lagoon; +use alloy_consensus::{ + Block, BlockBody, BlockHeader, Header, Sealable, SignableTransaction, TxEip1559, TxReceipt, +}; +use alloy_network::eip2718::Encodable2718; +use alloy_primitives::{Address, B256, Bytes, Signature, TxKind, U256, map::HashSet}; +use alloy_rpc_types_eth::{BlockNumberOrTag, TransactionInput, TransactionRequest}; +use alloy_rpc_types_trace::{ + common::TraceResult, + geth::{ + GethDebugBuiltInTracerType, GethDebugTracerConfig, GethDebugTracerType, + GethDebugTracingCallOptions, GethDebugTracingOptions, GethTrace, PreStateConfig, + PreStateFrame, + }, + parity::{Delta, StateDiff, TraceType}, +}; use op_alloy_consensus::{OpTxEnvelope, SDMGasEntry, TxDeposit, build_post_exec_tx}; use reth_chainspec::EthChainSpec; +use reth_e2e_test_utils::{ + node::NodeTestContext, transaction::TransactionTestContext, wallet::Wallet, +}; use reth_node_builder::{NodeBuilder, NodeHandle}; use reth_node_core::{ args::{NetworkArgs, RpcServerArgs}, node_config::NodeConfig, }; -use reth_optimism_chainspec::OpChainSpecBuilder; -use reth_optimism_node::OpNode; -use reth_rpc_api::clients::DebugApiClient; +use reth_optimism_chainspec::{OpChainSpec, OpChainSpecBuilder}; +use reth_optimism_node::{OpNode, args::RollupArgs}; +use reth_optimism_primitives::OpTransactionSigned; +use reth_provider::{ReceiptProvider, StateProviderFactory}; +use reth_rpc_api::clients::{DebugApiClient, TraceApiClient}; use reth_rpc_server_types::RpcModuleSelection; use reth_tasks::Runtime; +use std::sync::Arc; + +/// Gas used by a plain transfer before the SDM refund. +const TRANSFER_GAS: u64 = 21_000; + +/// Gas used before the SDM refund by a deployment of the one-byte init code `STOP`: intrinsic +/// 21000, CREATE 32000, one zero calldata byte 4, one init code word 2, and no code deposit. +const DEPLOY_GAS: u64 = 53_006; /// `debug_traceBlock` over a raw block that ends in a post-exec (0x7d) transaction must return -/// one successful trace per transaction. Before the `transact_raw` short-circuit this failed for -/// the whole block with `-32000: invalid chain ID`. +/// one successful trace per transaction while preserving diagnostic pre-refund results. Before the +/// `transact_raw` short-circuit this failed for the whole block with `-32000: invalid chain ID`. +/// +/// The refund takes the transfer below the EIP-7623 floor: the producer never refunds that far, +/// but a verifier applies whatever refund the payload carries. +#[rstest::rstest] +#[case::exhausted_block_budget(21_000)] +#[case::normal_block_budget(30_000_000)] #[tokio::test] -async fn test_debug_trace_block_with_post_exec_tx() -> eyre::Result<()> { +async fn test_debug_trace_block_with_post_exec_tx( + #[case] block_gas_limit: u64, +) -> eyre::Result<()> { reth_tracing::init_test_tracing(); - let chain_spec = OpChainSpecBuilder::optimism_sepolia().lagoon_activated().build(); + let chain_spec = Arc::new(OpChainSpecBuilder::optimism_sepolia().lagoon_activated().build()); - let exec = Runtime::test(); - let mut network_args = NetworkArgs::default().with_unused_ports(); - network_args.discovery.discv5_port = Some(0); - network_args.discovery.discv5_port_ipv6 = Some(0); - let node_config = - NodeConfig::test().map_chain(chain_spec.clone()).with_network(network_args).with_rpc( - RpcServerArgs::default() - .with_unused_ports() - .with_http() - // `debug_*` is not part of the default HTTP module selection. - .with_http_api(RpcModuleSelection::All), - ); - - let NodeHandle { node, node_exit_future: _ } = - NodeBuilder::new(node_config).testing_node(exec).node(OpNode::default()).launch().await?; + let NodeHandle { node, node_exit_future: _ } = NodeBuilder::new(rpc_node_config(&chain_spec)) + .testing_node(Runtime::test()) + .node(OpNode::default()) + .launch() + .await?; let client = node.add_ons_handle.rpc_server_handles().rpc.http_client().unwrap(); // `debug_traceBlock` replays a caller-supplied raw block on its parent's state, so the block @@ -61,7 +85,7 @@ async fn test_debug_trace_block_with_post_exec_tx() -> eyre::Result<()> { parent_hash: chain_spec.genesis_hash(), number: 1, timestamp: genesis.timestamp + 2, - gas_limit: genesis.gas_limit, + gas_limit: block_gas_limit, base_fee_per_gas: genesis.base_fee_per_gas, // Post-Ecotone replay runs the EIP-4788 pre-block system call, which requires a parent // beacon block root; the blob-gas and withdrawals fields must be present for the later @@ -79,7 +103,7 @@ async fn test_debug_trace_block_with_post_exec_tx() -> eyre::Result<()> { chain_id: chain_spec.chain_id(), // The preceding deposit increments the depositor nonce after Regolith. nonce: 1, - gas_limit: 21_000, + gas_limit: TRANSFER_GAS, max_fee_per_gas: u128::from(header.base_fee_per_gas.unwrap_or_default()), to: TxKind::Call(Address::with_last_byte(1)), ..Default::default() @@ -119,6 +143,239 @@ async fn test_debug_trace_block_with_post_exec_tx() -> eyre::Result<()> { "transaction {index} must trace successfully, got {trace:?}", ); } + assert_eq!(default_trace_gas(&traces[1]), TRANSFER_GAS, "raw block traces are pre-refund"); + + Ok(()) +} + +/// Every RPC path that replays a block's transactions must agree with what the chain committed for +/// an SDM-refunded transaction: the receipt's canonical gas, the post-settlement balances, and the +/// header's state root. +/// +/// The block is sequenced by a Lagoon node running the fixed test policy, which refunds every +/// regular transaction one gas, so it is a real, imported block with a 0x7d tx and a settled state. +/// The refunded transaction is a contract deployment: the producer never refunds below the EIP-7623 +/// floor, which a plain transfer already sits on. +#[tokio::test] +async fn test_rpc_replay_matches_sdm_settlement() -> eyre::Result<()> { + reth_tracing::init_test_tracing(); + + let chain_spec = lagoon::chain_spec()?; + let mut node = launch_sdm_node(&chain_spec).await?; + let client = node.inner.add_ons_handle.rpc_server_handles().rpc.http_client().unwrap(); + + let wallet = Wallet::default().with_chain_id(chain_spec.chain_id()); + let sender = wallet.inner.address(); + // Init code `STOP` deploys an empty contract. + let deploy = TransactionRequest { + chain_id: Some(wallet.chain_id), + nonce: Some(0), + gas: Some(100_000), + max_fee_per_gas: Some(20_000_000_000), + max_priority_fee_per_gas: Some(1_000_000_000), + to: Some(TxKind::Create), + input: TransactionInput::new(Bytes::from_static(&[0x00])), + ..Default::default() + }; + let deploy = TransactionTestContext::sign_tx(wallet.inner, deploy).await; + node.rpc.inject_tx(deploy.encoded_2718().into()).await?; + let payload = node.advance_block().await?; + let block = payload.block(); + + // The fixture must be what the assertions below assume: a refunded deployment, then the 0x7d. + let transactions = &block.body().transactions; + assert_eq!(transactions.len(), 2, "deployment and post-exec tx, got {transactions:?}"); + let OpTransactionSigned::PostExec(post_exec) = &transactions[1] else { + panic!("block must end in a post-exec tx, got {:?}", transactions[1]); + }; + assert_eq!( + post_exec.inner().payload.gas_refund_entries, + vec![SDMGasEntry { index: 0, gas_refund: 1 }], + ); + let tx_hash = transactions[0].tx_hash(); + let canonical_gas = node + .inner + .provider + .receipt_by_hash(tx_hash)? + .expect("deployment receipt") + .cumulative_gas_used(); + // Pins the settlement itself: every check below compares a replay with what the node committed. + assert_eq!(canonical_gas, DEPLOY_GAS - 1, "receipt holds canonical gas"); + let state = node.inner.provider.state_by_block_hash(block.hash())?; + let committed_balance = |address| -> eyre::Result { + Ok(state.account_balance(&address)?.unwrap_or_default()) + }; + + // debug_traceTransaction: canonical gas and a settled prestate diff. + let trace = + DebugApiClient::::debug_trace_transaction(&client, tx_hash, None) + .await?; + let GethTrace::Default(frame) = trace else { panic!("unexpected trace shape: {trace:?}") }; + assert_eq!(frame.gas, canonical_gas, "debug_traceTransaction gas"); + + let trace = DebugApiClient::::debug_trace_transaction( + &client, + tx_hash, + Some(prestate_tracer(PreStateConfig { diff_mode: Some(true), ..Default::default() })), + ) + .await?; + let GethTrace::PreStateTracer(PreStateFrame::Diff(diff)) = trace else { + panic!("unexpected trace shape: {trace:?}") + }; + // Sender, block beneficiary and base-fee vault all change, and each must land on the committed + // balance; the 0x7d tx after the deployment leaves state untouched. + assert_eq!( + diff.post[&sender].balance, + Some(committed_balance(sender)?), + "prestate diff balance of the sender", + ); + for (address, account) in &diff.post { + if let Some(balance) = account.balance { + assert_eq!(balance, committed_balance(*address)?, "prestate diff balance of {address}"); + } + } + + // debug_traceBlockByNumber: canonical gas, and the 0x7d tx still traces. + let traces = DebugApiClient::::debug_trace_block_by_number( + &client, + BlockNumberOrTag::Number(block.number()), + None, + ) + .await?; + assert_eq!(traces.len(), 2, "one trace per transaction, including the post-exec tx"); + assert_eq!(default_trace_gas(&traces[0]), canonical_gas, "debug_traceBlockByNumber gas"); + assert!(matches!(traces[1], TraceResult::Success { .. }), "0x7d tx trace: {:?}", traces[1]); + + // debug_traceCall after the deployment: the replayed prefix (shared with eth_callMany and + // debug_traceCallMany) must leave the sender with its settled balance. + let trace = DebugApiClient::::debug_trace_call( + &client, + TransactionRequest::default().from(sender).to(Address::with_last_byte(1)), + Some(block.hash().into()), + Some(GethDebugTracingCallOptions { + tracing_options: prestate_tracer(PreStateConfig::default()), + tx_index: Some(1), + ..Default::default() + }), + ) + .await?; + let GethTrace::PreStateTracer(PreStateFrame::Default(prestate)) = trace else { + panic!("unexpected trace shape: {trace:?}") + }; + assert_eq!( + prestate.0[&sender].balance, + Some(committed_balance(sender)?), + "debug_traceCall prestate after the deployment", + ); + + // debug_intermediateRoots: the root after the 0x7d tx is the header's. + let roots = + DebugApiClient::::debug_intermediate_roots(&client, block.hash(), None) + .await?; + assert_eq!(roots.len(), 2, "one root per transaction"); + assert_eq!(roots[1], block.state_root(), "debug_intermediateRoots"); + + // trace_replayTransaction and trace_replayBlockTransactions: settled state diffs. + let state_diff = HashSet::from_iter([TraceType::StateDiff]); + let results = TraceApiClient::::replay_transaction( + &client, + tx_hash, + state_diff.clone(), + ) + .await?; + assert_state_diff_settled(results.state_diff.as_ref(), sender, &committed_balance)?; + let results = TraceApiClient::::replay_block_transactions( + &client, + block.hash().into(), + state_diff, + ) + .await? + .expect("block exists"); + assert_eq!(results.len(), 2, "one replay per transaction, including the post-exec tx"); + assert_state_diff_settled( + results[0].full_trace.state_diff.as_ref(), + sender, + &committed_balance, + )?; + + Ok(()) +} + +/// Returns a test node config serving every RPC module over HTTP on unused ports. +pub(super) fn rpc_node_config(chain_spec: &Arc) -> NodeConfig { + let mut network_args = NetworkArgs::default().with_unused_ports(); + network_args.discovery.discv5_port = Some(0); + network_args.discovery.discv5_port_ipv6 = Some(0); + NodeConfig::test().map_chain(chain_spec.clone()).with_network(network_args).with_rpc( + RpcServerArgs::default() + .with_unused_ports() + .with_http() + // `debug_*` is not part of the default HTTP module selection. + .with_http_api(RpcModuleSelection::All) + .with_ws() + .with_ws_api(RpcModuleSelection::All), + ) +} + +/// Returns tracing options selecting the prestate tracer with the given config. +pub(super) fn prestate_tracer(config: PreStateConfig) -> GethDebugTracingOptions { + GethDebugTracingOptions::default() + .with_tracer(GethDebugTracerType::BuiltInTracer(GethDebugBuiltInTracerType::PreStateTracer)) + .with_config(GethDebugTracerConfig::from(config)) +} + +/// Returns the gas reported by a successful default (struct logger) trace. +pub(super) fn default_trace_gas(trace: &TraceResult) -> u64 { + match trace { + TraceResult::Success { result: GethTrace::Default(frame), .. } => frame.gas, + other => panic!("unexpected trace shape: {other:?}"), + } +} +/// Asserts that the sender's balance changes and that every balance a parity state diff ends on is +/// the committed one. +fn assert_state_diff_settled( + state_diff: Option<&StateDiff>, + sender: Address, + committed_balance: &impl Fn(Address) -> eyre::Result, +) -> eyre::Result<()> { + let state_diff = state_diff.expect("state diff requested"); + assert!( + matches!(state_diff[&sender].balance, Delta::Changed(_)), + "sender balance must change: {:?}", + state_diff[&sender], + ); + for (address, account) in state_diff.iter() { + let to = match &account.balance { + Delta::Unchanged => continue, + Delta::Added(to) => to, + Delta::Changed(changed) => &changed.to, + Delta::Removed(_) => panic!("{address} must not be removed"), + }; + assert_eq!(*to, committed_balance(*address)?, "state diff balance of {address}"); + } Ok(()) } + +pub(super) async fn launch_sdm_node( + chain_spec: &Arc, +) -> eyre::Result> { + launch_sdm_node_with_attributes(chain_spec, lagoon::payload_attributes).await +} + +pub(super) async fn launch_sdm_node_with_attributes( + chain_spec: &Arc, + attributes: impl Fn(u64) -> reth_optimism_payload_builder::OpPayloadAttrs + Send + Sync + 'static, +) -> eyre::Result> { + let op_node = OpNode::new(RollupArgs { + operator_sdm_opt_in: true, + testing_sdm_fixed_policy: Some(None), + ..Default::default() + }); + let NodeHandle { node, node_exit_future: _ } = NodeBuilder::new(rpc_node_config(chain_spec)) + .testing_node(Runtime::test()) + .node(op_node) + .launch() + .await?; + NodeTestContext::new(node, attributes).await +} diff --git a/rust/op-reth/crates/node/tests/it/invalid_post_exec.rs b/rust/op-reth/crates/node/tests/it/invalid_post_exec.rs index d0db3438858..9b796859947 100644 --- a/rust/op-reth/crates/node/tests/it/invalid_post_exec.rs +++ b/rust/op-reth/crates/node/tests/it/invalid_post_exec.rs @@ -6,20 +6,14 @@ //! [SDM-M1]: https://github.com/ethereum-optimism/protocol-team/issues/371 use alloy_consensus::{Sealable, proofs::calculate_transaction_root}; -use alloy_genesis::Genesis; -use alloy_primitives::B64; use alloy_rpc_types_engine::{PayloadStatus, PayloadStatusEnum, PayloadValidationError}; -use op_alloy_consensus::{ - PostExecPayloadValidationError, SDMGasEntry, build_post_exec_tx, encode_jovian_extra_data, -}; +use op_alloy_consensus::{PostExecPayloadValidationError, SDMGasEntry, build_post_exec_tx}; use op_alloy_rpc_types_engine::{OpExecutionData, OpExecutionPayload}; -use reth_chainspec::BaseFeeParams; use reth_e2e_test_utils::{NodeHelperType, setup_engine_with_connection, wallet::Wallet}; -use reth_optimism_chainspec::OpChainSpecBuilder; use reth_optimism_node::{ OpBuiltPayload, OpNode, payload::OpExecData, - utils::{advance_chain, optimism_payload_attributes, setup}, + utils::{advance_chain, setup}, }; use reth_optimism_primitives::OpTransactionSigned; use std::sync::Arc; @@ -27,24 +21,12 @@ use tokio::sync::Mutex; /// Creates Lagoon-active nodes without changing the shared Ecotone fixture. async fn setup_lagoon(num_nodes: usize) -> eyre::Result<(Vec>, Wallet)> { - let mut genesis: Genesis = serde_json::from_str(include_str!("../assets/genesis.json"))?; - // Lagoon is active at genesis, so the first child's base fee uses Jovian extra data. - genesis.extra_data = encode_jovian_extra_data(B64::ZERO, BaseFeeParams::optimism(), 0)?; - genesis.base_fee_per_gas = Some(1_000_000_000); - let chain_spec = Arc::new( - OpChainSpecBuilder::optimism_sepolia().genesis(genesis).lagoon_activated().build(), - ); setup_engine_with_connection( num_nodes, - chain_spec, + crate::lagoon::chain_spec()?, false, Default::default(), - |timestamp| { - let mut attributes = optimism_payload_attributes(timestamp); - attributes.0.eip_1559_params = Some(B64::ZERO); - attributes.0.min_base_fee = Some(0); - attributes - }, + crate::lagoon::payload_attributes, // The buffered-child test must learn the parent only through its explicit newPayload. false, ) diff --git a/rust/op-reth/crates/node/tests/it/lagoon.rs b/rust/op-reth/crates/node/tests/it/lagoon.rs new file mode 100644 index 00000000000..b25fb3097e1 --- /dev/null +++ b/rust/op-reth/crates/node/tests/it/lagoon.rs @@ -0,0 +1,27 @@ +//! Lagoon-at-genesis fixtures shared by the SDM integration tests. + +use alloy_genesis::Genesis; +use alloy_primitives::B64; +use op_alloy_consensus::encode_jovian_extra_data; +use reth_chainspec::BaseFeeParams; +use reth_optimism_chainspec::{OpChainSpec, OpChainSpecBuilder}; +use reth_optimism_node::utils::optimism_payload_attributes; +use reth_optimism_payload_builder::OpPayloadAttrs; +use std::sync::Arc; + +/// Builds a Lagoon-at-genesis spec that funds the e2e test wallet. +pub(crate) fn chain_spec() -> eyre::Result> { + let mut genesis: Genesis = serde_json::from_str(include_str!("../assets/genesis.json"))?; + // Lagoon is active at genesis, so the first child's base fee uses Jovian extra data. + genesis.extra_data = encode_jovian_extra_data(B64::ZERO, BaseFeeParams::optimism(), 0)?; + genesis.base_fee_per_gas = Some(1_000_000_000); + Ok(Arc::new(OpChainSpecBuilder::optimism_sepolia().genesis(genesis).lagoon_activated().build())) +} + +/// Payload attributes carrying the Jovian fields a Lagoon block requires. +pub(crate) const fn payload_attributes(timestamp: u64) -> OpPayloadAttrs { + let mut attributes = optimism_payload_attributes(timestamp); + attributes.0.eip_1559_params = Some(B64::ZERO); + attributes.0.min_base_fee = Some(0); + attributes +} diff --git a/rust/op-reth/crates/node/tests/it/main.rs b/rust/op-reth/crates/node/tests/it/main.rs index c849c74e424..de8de53eada 100644 --- a/rust/op-reth/crates/node/tests/it/main.rs +++ b/rust/op-reth/crates/node/tests/it/main.rs @@ -16,6 +16,8 @@ mod debug_trace_post_exec; mod invalid_post_exec; +mod lagoon; + mod estimate_gas_7825; mod p2p_version; @@ -23,3 +25,5 @@ mod p2p_version; mod derived_attributes; const fn main() {} + +mod rpc_replay_settlement; diff --git a/rust/op-reth/crates/node/tests/it/rpc_replay_settlement.rs b/rust/op-reth/crates/node/tests/it/rpc_replay_settlement.rs new file mode 100644 index 00000000000..fb5e1f7b63f --- /dev/null +++ b/rust/op-reth/crates/node/tests/it/rpc_replay_settlement.rs @@ -0,0 +1,315 @@ +use super::{ + debug_trace_post_exec::{ + default_trace_gas, launch_sdm_node, launch_sdm_node_with_attributes, prestate_tracer, + }, + lagoon, +}; +use alloy_consensus::{BlockHeader, TxReceipt}; +use alloy_network::eip2718::Encodable2718; +use alloy_primitives::{Address, Bytes, TxKind, U256, map::HashSet}; +use alloy_rpc_types_eth::{BlockNumberOrTag, TransactionInput, TransactionRequest}; +use alloy_rpc_types_trace::{ + geth::{ + ChainBlockTraceResult, GethDebugTracingOptions, GethTrace, PreStateConfig, PreStateFrame, + }, + parity::{Delta, TraceType}, +}; +use jsonrpsee::{ + core::client::{ClientT, Subscription, SubscriptionClientT}, + rpc_params, +}; +use reth_chainspec::EthChainSpec; +use reth_e2e_test_utils::{transaction::TransactionTestContext, wallet::Wallet}; +use reth_evm::ConfigureEvm; +use reth_optimism_primitives::OpTransactionSigned; +use reth_provider::{ReceiptProvider, StateProviderFactory}; +use reth_rpc_api::clients::{DebugApiClient, TraceApiClient}; +use reth_rpc_eth_api::{ + RpcNodeCore, + helpers::{Call, LoadBlock, Trace}, +}; +use revm::inspector::NoOpInspector; +use serde_json::json; +use std::time::Duration; + +#[tokio::test] +async fn later_transactions_include_prior_sdm_settlement() -> eyre::Result<()> { + reth_tracing::init_test_tracing(); + let chain_spec = lagoon::chain_spec()?; + let mut node = launch_sdm_node(&chain_spec).await?; + let rpc = node.inner.add_ons_handle.rpc_server_handles().rpc.clone(); + let client = rpc.http_client().unwrap(); + let wallet = Wallet::default().with_chain_id(chain_spec.chain_id()); + let sender = wallet.inner.address(); + let revert_output = U256::from(42).to_be_bytes::<32>(); + let init_codes = [ + Bytes::from_static(&[0x00]), + Bytes::new(), + Bytes::from_static(&[0x00]), + Bytes::from_static(&[0x60, 0x2a, 0x60, 0x00, 0x52, 0x60, 0x20, 0x60, 0x00, 0xfd]), + ]; + for (nonce, init_code) in init_codes.into_iter().enumerate() { + let transaction = TransactionRequest { + chain_id: Some(wallet.chain_id), + gas: Some(if nonce == 1 { 21_000 } else { 100_000 }), + input: TransactionInput::new(init_code), + max_fee_per_gas: Some(20_000_000_000), + max_priority_fee_per_gas: Some(1_000_000_000), + nonce: Some(nonce as u64), + to: Some(if nonce == 1 { + TxKind::Call(Address::repeat_byte(0x99)) + } else { + TxKind::Create + }), + ..Default::default() + }; + let transaction = TransactionTestContext::sign_tx(wallet.inner.clone(), transaction).await; + node.rpc.inject_tx(transaction.encoded_2718().into()).await?; + } + let payload = node.advance_block().await?; + let block = payload.block(); + let transactions = &block.body().transactions; + assert_eq!(transactions.len(), 5); + let OpTransactionSigned::PostExec(post_exec) = &transactions[4] else { + panic!("missing post-exec transaction"); + }; + assert!(post_exec.inner().payload.gas_refund_entries.iter().any(|entry| entry.index == 2)); + + assert!(!post_exec.inner().payload.gas_refund_entries.iter().any(|entry| entry.index == 1)); + + let block_traces = DebugApiClient::::debug_trace_block_by_hash( + &client, + block.hash(), + None, + ) + .await?; + assert_eq!(block_traces.len(), transactions.len()); + let mut cumulative_gas = 0; + for (index, transaction) in transactions[..4].iter().enumerate() { + let hash = transaction.tx_hash(); + let receipt = node.inner.provider.receipt_by_hash(hash)?.unwrap(); + let gas_used = receipt.cumulative_gas_used() - cumulative_gas; + cumulative_gas = receipt.cumulative_gas_used(); + let trace = + DebugApiClient::::debug_trace_transaction(&client, hash, None) + .await?; + let GethTrace::Default(frame) = trace else { + panic!("unexpected trace"); + }; + assert_eq!(frame.gas, gas_used, "transaction {index}"); + assert_eq!(default_trace_gas(&block_traces[index]), gas_used); + + let account = DebugApiClient::::debug_account_info_at( + &client, + block.hash().into(), + index.into(), + sender, + ) + .await? + .unwrap(); + let trace = DebugApiClient::::debug_trace_transaction( + &client, + hash, + Some(prestate_tracer(PreStateConfig { diff_mode: Some(true), ..Default::default() })), + ) + .await?; + let GethTrace::PreStateTracer(PreStateFrame::Diff(diff)) = trace else { + panic!("unexpected prestate trace"); + }; + assert_eq!(diff.post[&sender].balance, Some(account.balance)); + let replay = TraceApiClient::::replay_transaction( + &client, + hash, + HashSet::from_iter([TraceType::StateDiff, TraceType::Trace]), + ) + .await?; + let call: GethTrace = client + .request("debug_traceTransaction", rpc_params![hash, json!({"tracer": "callTracer"})]) + .await?; + let GethTrace::CallTracer(frame) = call else { + panic!("unexpected call trace"); + }; + assert_eq!(frame.gas_used, U256::from(gas_used)); + let state_diff = replay.state_diff.unwrap(); + let Delta::Changed(balance) = &state_diff[&sender].balance else { + panic!("sender balance must change"); + }; + assert_eq!(balance.to, account.balance); + } + let revert: Option = + client.request("ots_getTransactionError", rpc_params![transactions[3].tx_hash()]).await?; + assert_eq!(revert, Some(Bytes::copy_from_slice(&revert_output))); + + let eth_api = node.rpc.inner.eth_api().clone(); + let recovered = eth_api.recovered_block(block.hash().into()).await?.unwrap(); + let recipient = Address::repeat_byte(0x55); + let modified = eth_api + .spawn_with_state_at_block(block.parent_hash(), move |api, mut database| { + let mut environment = + api.evm_config().tx_env(recovered.transactions_recovered().nth(2).unwrap()); + environment.base.gas_limit = 21_000; + environment.base.data = Bytes::new(); + environment.base.kind = TxKind::Call(recipient); + environment.base.value = U256::from(1); + api.inspect_transaction_in_block( + &recovered, + &mut database, + NoOpInspector {}, + 2, + environment, + None, + ) + .map(|(output, _)| output) + }) + .await?; + assert_eq!(modified.state[&recipient].info.balance, U256::from(1)); + assert_eq!(modified.result.tx_gas_used(), 21_000); + + let state = node.inner.provider.state_by_block_hash(block.hash())?; + let sender_balance = state.account_balance(&sender)?.unwrap(); + let roots = + DebugApiClient::::debug_intermediate_roots(&client, block.hash(), None) + .await?; + assert_eq!(roots.len(), transactions.len()); + assert_eq!(roots.last(), Some(&block.state_root())); + + let balance_reader = Address::repeat_byte(0x77); + let mut balance_code = vec![0x73]; + balance_code.extend_from_slice(sender.as_slice()); + balance_code.extend_from_slice(&[0x31, 0x60, 0x00, 0x52, 0x60, 0x20, 0x60, 0x00, 0xf3]); + let bundles = json!([{"transactions": [{"from": Address::ZERO, "gasPrice": "0x4a817c800", "to": balance_reader}]}]); + let context = json!({"blockNumber": block.hash(), "transactionIndex": 4}); + let overrides = json!({balance_reader.to_string(): {"code": Bytes::from(balance_code)}, Address::ZERO.to_string(): {"balance": "0xffffffffffffffff"}}); + let output: Vec> = client + .request("eth_callMany", rpc_params![bundles.clone(), context.clone(), overrides.clone()]) + .await?; + assert_eq!(U256::from_be_slice(output[0][0].value.as_ref().unwrap()), sender_balance); + let traces: Vec> = client + .request( + "debug_traceCallMany", + rpc_params![bundles, context, json!({"stateOverrides": overrides})], + ) + .await?; + let GethTrace::Default(frame) = &traces[0][0] else { + panic!("unexpected call-many trace"); + }; + assert_eq!(U256::from_be_slice(&frame.return_value), sender_balance); + + let ws = rpc.ws_client().await.unwrap(); + let mut subscription: Subscription = ws + .subscribe( + "debug_subscribe", + rpc_params![ + "traceChain", + BlockNumberOrTag::Number(0), + BlockNumberOrTag::Number(block.number()), + GethDebugTracingOptions::default() + ], + "debug_unsubscribe", + ) + .await?; + let traced = + tokio::time::timeout(Duration::from_secs(10), subscription.next()).await?.unwrap()?; + assert_eq!(traced.traces, block_traces.into_iter().map(Some).collect::>()); + subscription.unsubscribe().await?; + let mut failed: Subscription = ws + .subscribe( + "debug_subscribe", + rpc_params![ + "traceChain", + BlockNumberOrTag::Number(0), + BlockNumberOrTag::Number(block.number()), + json!({ + "tracer": "callTracer", "tracerConfig": {"onlyTopCall": "invalid"} + }) + ], + "debug_unsubscribe", + ) + .await?; + let failure = tokio::time::timeout(Duration::from_secs(10), failed.next()).await?.unwrap()?; + assert_eq!(failure.traces.len(), transactions.len()); + assert!(matches!( + failure.traces[0], + Some(alloy_rpc_types_trace::geth::TraceResult::Error { .. }) + )); + assert!(failure.traces[1..].iter().all(Option::is_none)); + failed.unsubscribe().await?; + + Ok(()) +} + +#[tokio::test] +async fn later_transaction_affordability_depends_on_prior_refund() -> eyre::Result<()> { + reth_tracing::init_test_tracing(); + let base = lagoon::chain_spec()?; + let wallet = Wallet::default().with_chain_id(base.chain_id()); + let sender = wallet.inner.address(); + let gas_price = 20_000_000_000u128; + let first_gas_used = 53_005u64; + let transaction_gas_limit = 100_000u64; + let initial_balance = + U256::from(first_gas_used + transaction_gas_limit) * U256::from(gas_price); + let mut genesis = base.genesis().clone(); + genesis.alloc.entry(sender).or_default().balance = initial_balance; + let chain_spec = std::sync::Arc::new( + reth_optimism_chainspec::OpChainSpecBuilder::optimism_sepolia() + .genesis(genesis) + .lagoon_activated() + .build(), + ); + let mut forced_transactions = Vec::new(); + for nonce in 0..2 { + let transaction = TransactionRequest { + chain_id: Some(wallet.chain_id), + gas: Some(transaction_gas_limit), + input: TransactionInput::new(Bytes::from_static(&[0x00])), + max_fee_per_gas: Some(gas_price), + max_priority_fee_per_gas: Some(gas_price), + nonce: Some(nonce), + to: Some(TxKind::Create), + ..Default::default() + }; + let transaction = TransactionTestContext::sign_tx(wallet.inner.clone(), transaction).await; + forced_transactions.push(transaction.encoded_2718().into()); + } + let mut node = launch_sdm_node_with_attributes(&chain_spec, move |timestamp| { + let mut attributes = lagoon::payload_attributes(timestamp); + // Local sequencing produces refunds; derived mode only verifies embedded refunds. + attributes.0.no_tx_pool = Some(false); + attributes.0.transactions = Some(forced_transactions.clone()); + attributes + }) + .await?; + let payload = node.advance_block().await?; + let block = payload.block(); + assert_eq!(block.body().transactions.len(), 3); + let client = node.inner.add_ons_handle.rpc_server_handles().rpc.http_client().unwrap(); + let sender_before_target = DebugApiClient::::debug_account_info_at( + &client, + block.hash().into(), + 0usize.into(), + sender, + ) + .await? + .unwrap(); + assert_eq!( + sender_before_target.balance, + U256::from(transaction_gas_limit) * U256::from(gas_price) + ); + let second = block.body().transactions[1].tx_hash(); + let trace = + DebugApiClient::::debug_trace_transaction(&client, second, None) + .await?; + let GethTrace::Default(frame) = trace else { + panic!("unexpected trace"); + }; + assert_eq!(frame.gas, first_gas_used); + let traces = DebugApiClient::::debug_trace_block_by_number( + &client, + BlockNumberOrTag::Number(block.number()), + None, + ) + .await?; + assert_eq!(default_trace_gas(&traces[1]), first_gas_used); + Ok(()) +} diff --git a/rust/op-reth/crates/rpc/Cargo.toml b/rust/op-reth/crates/rpc/Cargo.toml index 6b853be110b..268d290d154 100644 --- a/rust/op-reth/crates/rpc/Cargo.toml +++ b/rust/op-reth/crates/rpc/Cargo.toml @@ -46,6 +46,7 @@ reth-optimism-forks.workspace = true reth-optimism-trie.workspace = true # ethereum +alloy-eip7928.workspace = true alloy-eips.workspace = true alloy-hardforks.workspace = true alloy-json-rpc.workspace = true @@ -58,6 +59,7 @@ alloy-transport.workspace = true alloy-transport-http.workspace = true alloy-consensus.workspace = true alloy-rpc-types-engine.workspace = true +alloy-rpc-types-trace.workspace = true op-alloy-network.workspace = true op-alloy-rpc-types = { workspace = true, features = ["reth"] } op-alloy-rpc-types-engine.workspace = true @@ -65,6 +67,7 @@ op-alloy-rpc-jsonrpsee.workspace = true op-alloy-consensus.workspace = true alloy-op-evm.workspace = true revm.workspace = true +revm-inspectors.workspace = true op-revm.workspace = true # async diff --git a/rust/op-reth/crates/rpc/src/eth/call.rs b/rust/op-reth/crates/rpc/src/eth/call.rs index 258b02b8b5f..f0e8aade7d8 100644 --- a/rust/op-reth/crates/rpc/src/eth/call.rs +++ b/rust/op-reth/crates/rpc/src/eth/call.rs @@ -1,8 +1,21 @@ use crate::{OpEthApi, OpEthApiError, eth::RpcNodeCore}; +use alloy_consensus::{BlockHeader, transaction::TxHashRef}; +use alloy_primitives::B256; +use alloy_rpc_types_eth::TransactionInfo; +use reth_errors::RethError; +use reth_evm::{ + ConfigureEvm, HaltReasonFor, + block::{BlockExecutor, TxResult}, +}; +use reth_revm::{State, database::StateProviderDatabase}; use reth_rpc_eth_api::{ - FromEvmError, RpcConvert, - helpers::{Call, EthCall, estimate::EstimateCall}, + FromEthApiError, FromEvmError, RpcConvert, + helpers::{ + Call, EthCall, LoadBlock, LoadState, LoadTransaction, SpawnBlocking, estimate::EstimateCall, + }, }; +use reth_rpc_eth_types::StateCacheDb; +use revm::context_interface::result::ResultAndState; impl EthCall for OpEthApi where @@ -20,6 +33,9 @@ where { } +/// UPSTREAM-MIRROR(override): reth@rev:e6d32dc `reth_rpc_eth_api::helpers::Call` +/// +/// Executes replay targets through the block executor to include transaction settlement. impl Call for OpEthApi where N: RpcNodeCore, @@ -45,4 +61,55 @@ where fn evm_memory_limit(&self) -> u64 { self.inner.eth_api.evm_memory_limit() } + + async fn spawn_replay_transaction( + &self, + hash: B256, + f: F, + ) -> Result, Self::Error> + where + Self: LoadBlock + LoadTransaction, + F: FnOnce( + TransactionInfo, + ResultAndState>, + StateCacheDb, + ) -> Result + + Send + + 'static, + R: Send + 'static, + { + let Some((transaction, block)) = self.transaction_and_block(hash).await? else { + return Ok(None); + }; + let (tx, tx_info) = transaction.split(); + + // `Call::spawn_with_state_at_block`, inlined: calling it here would need this impl's + // own `Call` bounds, which the compiler can't prove inside it. + let parent_hash = block.parent_hash(); + self.spawn_blocking_io_fut(async move |this| { + let state = this.state_at_block_id(parent_hash.into()).await?; + let mut db = State::builder().with_database(StateProviderDatabase::new(state)).build(); + let mut executor = RpcNodeCore::evm_config(&this) + .executor_for_block(&mut db, block.sealed_block()) + .map_err(RethError::other) + .map_err(Self::Error::from_eth_err)?; + executor.apply_pre_execution_changes().map_err(Self::Error::from_eth_err)?; + + for block_tx in block.transactions_recovered() { + if block_tx.tx_hash() == tx.tx_hash() { + break; + } + executor.execute_transaction(block_tx).map_err(Self::Error::from_eth_err)?; + } + + let res = executor + .execute_transaction_without_commit(tx) + .map_err(Self::Error::from_eth_err)? + .into_result(); + drop(executor); + f(tx_info, res, db) + }) + .await + .map(Some) + } } diff --git a/rust/op-reth/crates/rpc/src/eth/mod.rs b/rust/op-reth/crates/rpc/src/eth/mod.rs index 5d404c2b8ea..fca74049a6d 100644 --- a/rust/op-reth/crates/rpc/src/eth/mod.rs +++ b/rust/op-reth/crates/rpc/src/eth/mod.rs @@ -9,6 +9,7 @@ pub mod transaction; mod block; mod call; mod pending_block; +mod trace; use crate::{ OpEthApiError, SequencerClient, @@ -40,7 +41,7 @@ use reth_rpc_eth_api::{ RpcNodeCoreExt, RpcTypes, helpers::{ EthApiSpec, EthFees, EthState, EthSubscriptions, LoadFee, LoadPendingBlock, LoadState, - SpawnBlocking, Trace, bal::GetBlockAccessList, pending_block::BuildPendingEnv, + SpawnBlocking, bal::GetBlockAccessList, pending_block::BuildPendingEnv, }, }; use reth_rpc_eth_types::{ @@ -433,14 +434,6 @@ where { } -impl Trace for OpEthApi -where - N: RpcNodeCore, - OpEthApiError: FromEvmError, - Rpc: RpcConvert, -{ -} - // Upstream's `FullEthApi` requires this helper trait even when its RPC methods are not served. // op-reth explicitly removes the untested BAL endpoints in `op-reth/crates/node/src/node.rs`. impl GetBlockAccessList for OpEthApi diff --git a/rust/op-reth/crates/rpc/src/eth/trace.rs b/rust/op-reth/crates/rpc/src/eth/trace.rs new file mode 100644 index 00000000000..6ceb4f412a7 --- /dev/null +++ b/rust/op-reth/crates/rpc/src/eth/trace.rs @@ -0,0 +1,366 @@ +//! Replays of a block's own transactions for the `debug_` and `trace_` namespaces. +//! +//! SDM settlement (canonical gas, the sender's refund and the fee vaults' debits) is applied by the +//! block executor, keyed by each transaction's position in the block, so a replay on the bare EVM +//! reports pre-refund gas and unsettled balances. These overrides replay through the executor. +//! +//! op-reth never caches a block access list (`ensure_no_computed_bals` rejects the options that +//! would), so the BAL argument upstream uses to skip the replay is always `None` here. + +use crate::{OpEthApi, OpEthApiError}; +use alloy_consensus::transaction::TxHashRef; +use alloy_eip7928::bal::DecodedBal; +use alloy_primitives::B256; +use alloy_rpc_types_eth::TransactionInfo; +use alloy_rpc_types_trace::geth::{GethDebugTracingOptions, TraceResult}; +use reth_errors::RethError; +use reth_evm::{ + ConfigureEvm, Evm, EvmEnvFor, EvmFor, HaltReasonFor, InspectorFor, IntoTxEnv, TxEnvFor, + block::{BlockExecutor, BlockExecutorFor, TxResult}, +}; +use reth_primitives_traits::{BlockBody, BlockTy, RecoveredBlock}; +use reth_rpc_eth_api::{ + FromEthApiError, FromEvmError, RpcConvert, RpcNodeCore, + helpers::{LoadState, Trace, trace::TracingCtx}, +}; +use reth_rpc_eth_types::{EthApiError, StateCacheDb}; +use reth_storage_api::{HashedPostStateProvider, ProviderBlock, StateRootProvider}; +use revm::{ + context::Block, context_interface::result::ResultAndState, + database::states::bundle_state::BundleRetention, state::bal::Bal as RevmBal, +}; +use revm_inspectors::tracing::{DebugInspector, TransactionContext}; +use std::sync::Arc; + +/// UPSTREAM-MIRROR(override): reth@rev:e6d32dc `reth_rpc_eth_api::helpers::Trace` +/// +/// Canonical replays include executor settlement; diagnostic block replays use the bare EVM. +impl Trace for OpEthApi +where + N: RpcNodeCore, + OpEthApiError: FromEvmError, + Rpc: RpcConvert, +{ + fn replay_block_until( + &self, + db: &mut StateCacheDb, + block: &RecoveredBlock>, + target_tx_index: usize, + _bal: Option<&DecodedBal>>, + ) -> Result<(), Self::Error> { + let mut executor = self + .evm_config() + .executor_for_block(db, block.sealed_block()) + .map_err(RethError::other) + .map_err(Self::Error::from_eth_err)?; + executor.apply_pre_execution_changes().map_err(Self::Error::from_eth_err)?; + + for tx in block.transactions_recovered().take(target_tx_index) { + executor.execute_transaction(tx).map_err(Self::Error::from_eth_err)?; + } + Ok(()) + } + + fn inspect_canonical_transaction_in_block<'a>( + &self, + block: &RecoveredBlock>, + db: &'a mut StateCacheDb, + inspector: impl InspectorFor, + target_tx_index: usize, + _bal: Option<&DecodedBal>>, + ) -> Result<(ResultAndState>, EvmEnvFor), Self::Error> { + let evm_env = self.evm_env_for_header(block.sealed_block().sealed_header())?; + let mut executor = inspected_block_executor(self, block, db, evm_env.clone(), inspector)?; + + let mut block_txs = block.transactions_recovered(); + for tx in block_txs.by_ref().take(target_tx_index) { + executor.execute_transaction(tx).map_err(Self::Error::from_eth_err)?; + } + let target_tx = block_txs.next().ok_or_else(|| { + Self::Error::from_eth_err(EthApiError::InvalidParams(format!( + "tx_index {target_tx_index} out of bounds for block with {} transactions", + block.body().transaction_count() + ))) + })?; + + executor.evm_mut().enable_inspector(); + let res = executor + .execute_transaction_without_commit(target_tx) + .map_err(Self::Error::from_eth_err)? + .into_result(); + Ok((res, evm_env)) + } + + fn inspect_transaction_in_block<'a>( + &self, + block: &RecoveredBlock>, + db: &'a mut StateCacheDb, + inspector: impl InspectorFor, + target_tx_index: usize, + target_tx_env: impl IntoTxEnv>, + _bal: Option<&DecodedBal>>, + ) -> Result<(ResultAndState>, EvmEnvFor), Self::Error> { + let evm_env = self.evm_env_for_header(block.sealed_block().sealed_header())?; + let mut executor = inspected_block_executor(self, block, db, evm_env.clone(), inspector)?; + for transaction in block.transactions_recovered().take(target_tx_index) { + executor.execute_transaction(transaction).map_err(Self::Error::from_eth_err)?; + } + executor.evm_mut().enable_inspector(); + let result = + executor.evm_mut().transact(target_tx_env).map_err(Self::Error::from_evm_err)?; + Ok((result, evm_env)) + } + + /// Unlike upstream, a transaction that fails to execute fails the call instead of ending the + /// iteration early. + fn trace_block_transactions( + &self, + db: &mut StateCacheDb, + block: &RecoveredBlock>, + evm_env: EvmEnvFor, + max_transactions: usize, + mut inspector_setup: Setup, + f: F, + ) -> Result, Self::Error> + where + F: Fn( + TransactionInfo, + TracingCtx<'_, Insp, EvmFor>, + ) -> Result, + Setup: FnMut() -> Insp, + Insp: for<'a> InspectorFor, + { + let block_hash = block.hash(); + let block_number = evm_env.block_env.number().saturating_to(); + let block_timestamp = evm_env.block_env.timestamp().saturating_to(); + let base_fee = evm_env.block_env.basefee(); + + let mut executor = inspected_block_executor(self, block, db, evm_env, inspector_setup())?; + executor.evm_mut().enable_inspector(); + + let mut results = + Vec::with_capacity(max_transactions.min(block.body().transaction_count())); + let mut transactions = + block.transactions_recovered().take(max_transactions).enumerate().peekable(); + while let Some((idx, tx)) = transactions.next() { + let output = executor + .execute_transaction_without_commit(tx) + .map_err(Self::Error::from_eth_err)?; + + let tx_info = TransactionInfo { + hash: Some(*tx.tx_hash()), + index: Some(idx as u64), + block_hash: Some(block_hash), + block_number: Some(block_number), + block_timestamp: Some(block_timestamp), + base_fee: Some(base_fee), + }; + let (db, inspector, _) = executor.evm_mut().components_mut(); + let inspector = core::mem::replace(inspector, inspector_setup()); + let traced = + f(tx_info, TracingCtx { result: output.result(), db: &mut *db, inspector }); + // The state of the last traced transaction is not needed. + if transactions.peek().is_some() { + executor.commit_transaction(output); + } + results.push(traced?); + } + Ok(results) + } + + fn debug_trace_block_transactions( + &self, + db: &mut StateCacheDb, + block: &RecoveredBlock>, + evm_env: EvmEnvFor, + opts: GethDebugTracingOptions, + ) -> Result, Self::Error> { + let mut results = Vec::with_capacity(block.body().transactions().len()); + let block_env = evm_env.block_env.clone(); + + let inspector = DebugInspector::new(opts).map_err(Self::Error::from_eth_err)?; + let mut executor = inspected_block_executor(self, block, db, evm_env, inspector)?; + executor.evm_mut().enable_inspector(); + + let mut transactions = block.transactions_recovered().enumerate().peekable(); + while let Some((index, tx)) = transactions.next() { + let tx_env = self.evm_config().tx_env(tx); + let output = executor + .execute_transaction_without_commit(tx) + .map_err(Self::Error::from_eth_err)?; + + let (db, inspector, _) = executor.evm_mut().components_mut(); + let result = inspector + .get_result( + Some(TransactionContext { + block_hash: Some(block.hash()), + tx_hash: Some(*tx.tx_hash()), + tx_index: Some(index), + }), + &tx_env, + &block_env, + output.result(), + db, + ) + .map_err(Self::Error::from_eth_err)?; + + results.push(TraceResult::Success { result, tx_hash: Some(*tx.tx_hash()) }); + if transactions.peek().is_some() { + inspector.fuse().map_err(Self::Error::from_eth_err)?; + executor.commit_transaction(output); + } + } + Ok(results) + } + + fn debug_trace_chain_block_transactions( + &self, + db: &mut StateCacheDb, + block: &RecoveredBlock>, + evm_env: EvmEnvFor, + opts: GethDebugTracingOptions, + ) -> Result>, Self::Error> { + let tx_count = block.body().transactions().len(); + let mut results = Vec::with_capacity(tx_count); + let block_env = evm_env.block_env.clone(); + + let mut transactions = block.transactions_recovered().enumerate().peekable(); + let inspector = match DebugInspector::new(opts) { + Ok(inspector) => inspector, + Err(err) => { + if let Some((_, tx)) = transactions.peek() { + results.push(Some(TraceResult::Error { + error: err.to_string(), + tx_hash: Some(*tx.tx_hash()), + })); + } + results.resize(tx_count, None); + return Ok(results); + } + }; + let mut executor = inspected_block_executor(self, block, db, evm_env, inspector)?; + executor.evm_mut().enable_inspector(); + + while let Some((index, tx)) = transactions.next() { + let tx_hash = *tx.tx_hash(); + let tx_env = self.evm_config().tx_env(tx); + let output = match executor.execute_transaction_without_commit(tx) { + Ok(output) => output, + Err(err) => { + results.push(Some(TraceResult::Error { + error: err.to_string(), + tx_hash: Some(tx_hash), + })); + break; + } + }; + + let (db, inspector, _) = executor.evm_mut().components_mut(); + let result = match inspector.get_result( + Some(TransactionContext { + block_hash: Some(block.hash()), + tx_hash: Some(tx_hash), + tx_index: Some(index), + }), + &tx_env, + &block_env, + output.result(), + db, + ) { + Ok(result) => result, + Err(err) => { + results.push(Some(TraceResult::Error { + error: err.to_string(), + tx_hash: Some(tx_hash), + })); + break; + } + }; + + results.push(Some(TraceResult::Success { result, tx_hash: Some(tx_hash) })); + if let Some((_, next_tx)) = transactions.peek() { + if let Err(err) = inspector.fuse() { + results.push(Some(TraceResult::Error { + error: err.to_string(), + tx_hash: Some(*next_tx.tx_hash()), + })); + break; + } + executor.commit_transaction(output); + } + } + + results.resize(tx_count, None); + Ok(results) + } + + fn block_intermediate_roots( + &self, + db: &mut StateCacheDb, + block: &RecoveredBlock>, + _evm_env: EvmEnvFor, + ) -> Result, Self::Error> { + // Enable transition tracking so that merge_transitions works + db.transition_state = Some(Default::default()); + + let mut executor = self + .evm_config() + .executor_for_block(db, block.sealed_block()) + .map_err(RethError::other) + .map_err(Self::Error::from_eth_err)?; + executor.apply_pre_execution_changes().map_err(Self::Error::from_eth_err)?; + + let mut roots = Vec::with_capacity(block.body().transactions().len()); + for tx in block.transactions_recovered() { + executor.execute_transaction(tx).map_err(Self::Error::from_eth_err)?; + + let state = executor.evm_mut().db_mut(); + // Merge transitions into cumulative bundle_state + state.merge_transitions(BundleRetention::PlainState); + // Compute state root from the accumulated state changes + let hashed_state = state + .database + .hashed_post_state(&state.bundle_state) + .map_err(Self::Error::from_eth_err)?; + let root = + state.database.state_root(hashed_state).map_err(Self::Error::from_eth_err)?; + roots.push(root); + } + Ok(roots) + } +} + +/// Creates a block executor for `block` whose EVM runs the given inspector, and applies the +/// block's pre-execution changes. The inspector is left disabled. +#[expect(clippy::type_complexity, reason = "the executor type is spelled out by its factory")] +fn inspected_block_executor<'a, 'db, Api, I>( + api: &'a Api, + block: &'a RecoveredBlock>, + db: &'db mut StateCacheDb, + evm_env: EvmEnvFor, + inspector: I, +) -> Result< + BlockExecutorFor< + 'a, + ::BlockExecutorFactory, + &'db mut StateCacheDb, + I, + >, + Api::Error, +> +where + Api: Trace, + I: InspectorFor, +{ + let evm_config = api.evm_config(); + let ctx = evm_config + .context_for_block(block.sealed_block()) + .map_err(RethError::other) + .map_err(Api::Error::from_eth_err)?; + let mut evm = evm_config.evm_with_env_and_inspector(db, evm_env, inspector); + evm.disable_inspector(); + + let mut executor = evm_config.create_executor_with_state(evm, ctx); + executor.apply_pre_execution_changes().map_err(Api::Error::from_eth_err)?; + Ok(executor) +}