diff --git a/Cargo.lock b/Cargo.lock index baa9afe9..6ee69be9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,12 +133,12 @@ dependencies = [ [[package]] name = "alloy-consensus" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ - "alloy-eips", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "arbitrary", "c-kzg", "proptest", @@ -146,6 +146,19 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-consensus" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +dependencies = [ + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "c-kzg", + "serde", +] + [[package]] name = "alloy-dyn-abi" version = "0.7.2" @@ -167,11 +180,11 @@ dependencies = [ [[package]] name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "arbitrary", "c-kzg", "derive_more", @@ -182,13 +195,38 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "alloy-eips" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "c-kzg", + "once_cell", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "alloy-genesis" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +dependencies = [ + "alloy-primitives", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "serde", + "serde_json", +] + [[package]] name = "alloy-genesis" version = "0.1.0" source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", "serde", "serde_json", ] @@ -222,11 +260,11 @@ name = "alloy-network" version = "0.1.0" source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", "alloy-json-rpc", "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", "alloy-signer", "alloy-sol-types", "async-trait", @@ -286,14 +324,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-sol-types", "itertools 0.12.1", "jsonrpsee-types", @@ -303,21 +341,39 @@ dependencies = [ ] [[package]] -name = "alloy-rpc-types-anvil" +name = "alloy-rpc-types" version = "0.1.0" source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +dependencies = [ + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-sol-types", + "itertools 0.12.1", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "alloy-rpc-types-anvil" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "serde", ] [[package]] name = "alloy-rpc-types-beacon" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ - "alloy-eips", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "alloy-rpc-types-engine", "serde", @@ -327,14 +383,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types", - "alloy-serde", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "jsonrpsee-types", "jsonwebtoken 9.3.0", "rand 0.8.5", @@ -345,11 +401,21 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ "alloy-primitives", - "alloy-rpc-types", - "alloy-serde", "serde", "serde_json", ] @@ -382,7 +448,7 @@ name = "alloy-signer-wallet" version = "0.1.0" source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", "alloy-network", "alloy-primitives", "alloy-signer", @@ -4568,6 +4634,8 @@ dependencies = [ "reth", "reth-basic-payload-builder", "reth-db", + "reth-evm-ethereum", + "reth-interfaces", "reth-node-ethereum", "serde", "sha2 0.10.8", @@ -5888,7 +5956,7 @@ dependencies = [ [[package]] name = "reth" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "ahash", "alloy-rlp", @@ -5962,7 +6030,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -5985,7 +6053,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "futures-core", @@ -6008,7 +6076,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures", "metrics", @@ -6037,7 +6105,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "aquamarine", "linked_hash_set", @@ -6062,7 +6130,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-tasks", "tokio", @@ -6072,11 +6140,11 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "bytes", "modular-bitfield", @@ -6087,7 +6155,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -6098,7 +6166,7 @@ dependencies = [ [[package]] name = "reth-config" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "confy", "humantime-serde", @@ -6113,7 +6181,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "auto_impl", "reth-primitives", @@ -6123,7 +6191,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-consensus", "reth-interfaces", @@ -6134,7 +6202,7 @@ dependencies = [ [[package]] name = "reth-db" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "arbitrary", "bytes", @@ -6165,7 +6233,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "discv5", @@ -6187,7 +6255,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "derive_more", @@ -6211,7 +6279,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "data-encoding", "enr 0.12.0", @@ -6234,7 +6302,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "futures", @@ -6261,7 +6329,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -6294,7 +6362,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6305,7 +6373,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "bytes", @@ -6332,7 +6400,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "bytes", @@ -6346,7 +6414,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-consensus", "reth-consensus-common", @@ -6356,7 +6424,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "reth-engine-primitives", @@ -6371,7 +6439,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6387,7 +6455,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-basic-payload-builder", "reth-evm", @@ -6405,7 +6473,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "rayon", "reth-db", @@ -6415,9 +6483,9 @@ dependencies = [ [[package]] name = "reth-evm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "futures-util", "reth-interfaces", "reth-primitives", @@ -6428,10 +6496,10 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-rlp", "alloy-sol-types", "reth-evm", @@ -6448,7 +6516,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "eyre", "metrics", @@ -6469,7 +6537,7 @@ dependencies = [ [[package]] name = "reth-interfaces" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "auto_impl", "clap", @@ -6487,7 +6555,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "async-trait", "bytes", @@ -6508,7 +6576,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -6526,7 +6594,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "bindgen", "cc", @@ -6536,7 +6604,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures", "metrics", @@ -6548,7 +6616,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "once_cell", "proc-macro2", @@ -6560,7 +6628,7 @@ dependencies = [ [[package]] name = "reth-net-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "pin-project", "reth-network-types", @@ -6570,7 +6638,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "igd-next", "pin-project-lite", @@ -6584,7 +6652,7 @@ dependencies = [ [[package]] name = "reth-network" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "aquamarine", @@ -6634,7 +6702,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "enr 0.12.0", "reth-discv4", @@ -6650,7 +6718,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6664,7 +6732,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "anyhow", "bincode", @@ -6684,7 +6752,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-db", "reth-engine-primitives", @@ -6699,7 +6767,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "aquamarine", "confy", @@ -6740,7 +6808,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "clap", "const-str", @@ -6802,7 +6870,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "eyre", "reth-basic-payload-builder", @@ -6820,7 +6888,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures", "humantime", @@ -6842,7 +6910,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures-util", "metrics", @@ -6863,7 +6931,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6873,12 +6941,12 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-genesis", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "alloy-rlp", "alloy-trie", @@ -6913,7 +6981,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "alloy-rpc-types-engine", @@ -6942,7 +7010,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "itertools 0.12.1", "metrics", @@ -6963,10 +7031,10 @@ dependencies = [ [[package]] name = "reth-revm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-rlp", "reth-consensus-common", "reth-interfaces", @@ -6979,7 +7047,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -7031,7 +7099,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "jsonrpsee", "reth-engine-primitives", @@ -7045,7 +7113,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "hyper", "jsonrpsee", @@ -7073,7 +7141,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "async-trait", "jsonrpsee-core", @@ -7098,7 +7166,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "assert_matches", "http", @@ -7120,10 +7188,10 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-rpc-types-anvil", "alloy-rpc-types-beacon", "alloy-rpc-types-engine", @@ -7138,10 +7206,10 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "reth-primitives", "reth-rpc-types", ] @@ -7149,7 +7217,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures-util", "itertools 0.12.1", @@ -7176,7 +7244,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "aquamarine", "auto_impl", @@ -7200,7 +7268,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "parking_lot 0.12.2", "rayon", @@ -7217,7 +7285,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "dyn-clone", "futures-util", @@ -7234,7 +7302,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "tokio", "tokio-stream", @@ -7243,7 +7311,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "clap", "eyre", @@ -7258,7 +7326,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "aquamarine", @@ -7290,7 +7358,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "auto_impl", @@ -7308,7 +7376,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "derive_more", @@ -7344,10 +7412,10 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=3215ff5#3215ff58309feef596b0e76c664744b5bf322c8b" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=8a3c338#8a3c338276daa51570f16a4ad0c177604648520c" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index 79acc0a4..8cb04cc4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,10 +27,12 @@ incremental = false ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } -reth = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } -reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } +reth = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } +reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } diff --git a/mev-build-rs/Cargo.toml b/mev-build-rs/Cargo.toml index 30b21bd0..bd255569 100644 --- a/mev-build-rs/Cargo.toml +++ b/mev-build-rs/Cargo.toml @@ -28,8 +28,10 @@ beacon-api-client = { workspace = true } mev-rs = { path = "../mev-rs" } reth = { workspace = true } +reth-interfaces = { workspace = true } reth-db = { workspace = true } reth-node-ethereum = { workspace = true } +reth-evm-ethereum = { workspace = true } reth-basic-payload-builder = { workspace = true } alloy-signer = { workspace = true } alloy-signer-wallet = { workspace = true, features = ["mnemonic"] } diff --git a/mev-build-rs/src/payload/builder.rs b/mev-build-rs/src/payload/builder.rs index 181181d4..4fb7fed0 100644 --- a/mev-build-rs/src/payload/builder.rs +++ b/mev-build-rs/src/payload/builder.rs @@ -2,33 +2,36 @@ use crate::payload::{attributes::BuilderPayloadBuilderAttributes, job::PayloadFi use alloy_signer::SignerSync; use alloy_signer_wallet::LocalWallet; use reth::{ - api::PayloadBuilderAttributes, + api::{ConfigureEvm, PayloadBuilderAttributes}, payload::{error::PayloadBuilderError, EthBuiltPayload, PayloadId}, primitives::{ constants::{ eip4844::MAX_DATA_GAS_PER_BLOCK, BEACON_NONCE, EMPTY_RECEIPTS, EMPTY_TRANSACTIONS, }, eip4844::calculate_excess_blob_gas, - proofs, + proofs::{self, calculate_requests_root}, revm::env::tx_env_with_recovered, Address, Block, ChainId, Header, IntoRecoveredTransaction, Receipt, Receipts, SealedBlock, Signature, Transaction, TransactionSigned, TransactionSignedEcRecovered, TxEip1559, TxKind, EMPTY_OMMER_ROOT_HASH, U256, }, - providers::{BundleStateWithReceipts, StateProviderFactory}, + providers::{BundleStateWithReceipts, StateProviderFactory, StateRootProvider}, revm::{ - self, database::StateProviderDatabase, db::states::bundle_state::BundleRetention, primitives::{EVMError, EnvWithHandlerCfg, InvalidTransaction, ResultAndState}, + state_change::apply_blockhashes_update, DatabaseCommit, State, }, transaction_pool::{BestTransactionsAttributes, TransactionPool}, }; use reth_basic_payload_builder::{ - commit_withdrawals, is_better_payload, pre_block_beacon_root_contract_call, BuildArguments, - BuildOutcome, PayloadConfig, WithdrawalsOutcome, + commit_withdrawals, is_better_payload, post_block_withdrawal_requests_contract_call, + pre_block_beacon_root_contract_call, BuildArguments, BuildOutcome, PayloadConfig, + WithdrawalsOutcome, }; +use reth_evm_ethereum::{eip6110::parse_deposits_from_receipts, EthEvmConfig}; +use reth_interfaces::RethError; use std::{ collections::HashMap, ops::Deref, @@ -85,6 +88,7 @@ fn append_payment( chain_id: ChainId, block: SealedBlock, value: U256, + evm_config: EthEvmConfig, ) -> Result { let state_provider = client.state_by_block_hash(block.header.header().parent_hash)?; let state = StateProviderDatabase::new(&state_provider); @@ -130,7 +134,7 @@ fn append_payment( ); // NOTE: adjust gas limit to allow for payment transaction env.block.gas_limit += U256::from(BASE_TX_GAS_LIMIT); - let mut evm = revm::Evm::builder().with_db(&mut db).with_env_with_handler_cfg(env).build(); + let mut evm = evm_config.evm_with_env(&mut db, env); let ResultAndState { result, state } = evm.transact().map_err(PayloadBuilderError::EvmExecutionError)?; @@ -171,7 +175,10 @@ fn append_payment( let receipts_root = bundle.receipts_root_slow(block_number).expect("Number is in range"); let logs_bloom = bundle.block_logs_bloom(block_number).expect("Number is in range"); - let state_root = state_provider.state_root(bundle.state())?; + let state_root = { + let state_provider = db.database.0; + state_provider.0.state_root(bundle.state())? + }; let transactions_root = proofs::calculate_transaction_root(&body); header.state_root = state_root; @@ -203,6 +210,7 @@ pub struct Inner { signer: LocalWallet, pub fee_recipient: Address, chain_id: ChainId, + evm_config: EthEvmConfig, states: Mutex>, } @@ -213,7 +221,9 @@ impl PayloadBuilder { fee_recipient: Address, chain_id: ChainId, ) -> Self { - let inner = Inner { bids, signer, fee_recipient, chain_id, states: Default::default() }; + let evm_config = EthEvmConfig::default(); + let inner = + Inner { bids, signer, fee_recipient, chain_id, evm_config, states: Default::default() }; Self(Arc::new(inner)) } @@ -269,6 +279,7 @@ impl PayloadBuilder { self.chain_id, block, payment_amount, + self.evm_config.clone(), )?; Ok(EthBuiltPayload::new(payload_id, block, payment_amount)) } @@ -287,7 +298,7 @@ where args: BuildArguments, ) -> Result, PayloadBuilderError> { let payload_id = args.config.payload_id(); - let (outcome, bundle) = default_ethereum_payload_builder(args)?; + let (outcome, bundle) = default_ethereum_payload_builder(self.evm_config.clone(), args)?; if let Some(bundle) = bundle { let mut states = self.states.lock().expect("can lock"); states.insert(payload_id, bundle); @@ -318,7 +329,7 @@ where err })?; let mut db = State::builder() - .with_database_boxed(Box::new(StateProviderDatabase::new(&state))) + .with_database(StateProviderDatabase::new(state)) .with_bundle_update() .build(); @@ -339,22 +350,57 @@ where err })?; + // apply eip-2935 blockhashes update + apply_blockhashes_update( + &chain_spec, + initialized_block_env.timestamp.to::(), + block_number, + &mut db, + ).map_err(|err| { + warn!(target: "payload_builder", parent_hash=%parent_block.hash(), %err, "failed to update blockhashes for empty payload"); + PayloadBuilderError::Internal(err.into()) + })?; + let WithdrawalsOutcome { withdrawals_root, withdrawals } = commit_withdrawals(&mut db, &chain_spec, attributes.timestamp(), attributes.withdrawals().clone()).map_err(|err| { warn!(target: "payload_builder", parent_hash=%parent_block.hash(), %err, "failed to commit withdrawals for empty payload"); err })?; + // Calculate the requests and the requests root. + let (requests, requests_root) = + if chain_spec.is_prague_active_at_timestamp(attributes.timestamp()) { + // We do not calculate the EIP-6110 deposit requests because there are no + // transactions in an empty payload. + let withdrawal_requests = post_block_withdrawal_requests_contract_call( + &mut db, + &chain_spec, + &initialized_cfg, + &initialized_block_env, + &attributes, + )?; + + let requests = withdrawal_requests; + let requests_root = calculate_requests_root(&requests); + (Some(requests.into()), Some(requests_root)) + } else { + (None, None) + }; + // merge all transitions into bundle state, this would apply the withdrawal balance // changes and 4788 contract call db.merge_transitions(BundleRetention::PlainState); // calculate the state root let bundle_state = db.take_bundle(); - let state_root = state.state_root(&bundle_state).map_err(|err| { - warn!(target: "payload_builder", parent_hash=%parent_block.hash(), %err, "failed to calculate state root for empty payload"); - err - })?; + let state_root = db.database.state_root(&bundle_state).map_err(|err| { + warn!(target: "payload_builder", + parent_hash=%parent_block.hash(), + %err, + "failed to calculate state root for empty payload" + ); + err + })?; let mut excess_blob_gas = None; let mut blob_gas_used = None; @@ -394,9 +440,10 @@ where blob_gas_used, excess_blob_gas, parent_beacon_block_root: attributes.parent_beacon_block_root(), + requests_root, }; - let block = Block { header, body: vec![], ommers: vec![], withdrawals }; + let block = Block { header, body: vec![], ommers: vec![], withdrawals, requests }; let sealed_block = block.seal_slow(); Ok(EthBuiltPayload::new(attributes.payload_id(), sealed_block, U256::ZERO)) @@ -410,6 +457,7 @@ where /// a result indicating success with the payload or an error in case of failure. #[inline] pub fn default_ethereum_payload_builder( + evm_config: EthEvmConfig, args: BuildArguments, ) -> Result<(BuildOutcome, Option), PayloadBuilderError> where @@ -459,6 +507,15 @@ where &attributes, )?; + // apply eip-2935 blockhashes update + apply_blockhashes_update( + &chain_spec, + initialized_block_env.timestamp.to::(), + block_number, + &mut db, + ) + .map_err(|err| PayloadBuilderError::Internal(err.into()))?; + let mut receipts = Vec::new(); while let Some(pool_tx) = best_txs.next() { // ensure we still have capacity for this transaction @@ -493,15 +550,14 @@ where } } + let env = EnvWithHandlerCfg::new_with_cfg_env( + initialized_cfg.clone(), + initialized_block_env.clone(), + tx_env_with_recovered(&tx), + ); + // Configure the environment for the block. - let mut evm = revm::Evm::builder() - .with_db(&mut db) - .with_env_with_handler_cfg(EnvWithHandlerCfg::new_with_cfg_env( - initialized_cfg.clone(), - initialized_block_env.clone(), - tx_env_with_recovered(&tx), - )) - .build(); + let mut evm = evm_config.evm_with_env(&mut db, env); let ResultAndState { result, state } = match evm.transact() { Ok(res) => res, @@ -574,6 +630,28 @@ where return Ok((BuildOutcome::Aborted { fees: total_fees, cached_reads }, None)) } + // calculate the requests and the requests root + let (requests, requests_root) = if chain_spec + .is_prague_active_at_timestamp(attributes.timestamp()) + { + let deposit_requests = parse_deposits_from_receipts(&chain_spec, receipts.iter().flatten()) + .map_err(|err| PayloadBuilderError::Internal(RethError::Execution(err.into())))?; + + let withdrawal_requests = post_block_withdrawal_requests_contract_call( + &mut db, + &chain_spec, + &initialized_cfg, + &initialized_block_env, + &attributes, + )?; + + let requests = [deposit_requests, withdrawal_requests].concat(); + let requests_root = calculate_requests_root(&requests); + (Some(requests.into()), Some(requests_root)) + } else { + (None, None) + }; + let WithdrawalsOutcome { withdrawals_root, withdrawals } = commit_withdrawals( &mut db, &chain_spec, @@ -594,7 +672,10 @@ where let logs_bloom = bundle.block_logs_bloom(block_number).expect("Number is in range"); // calculate the state root - let state_root = state_provider.state_root(bundle.state())?; + let state_root = { + let state_provider = db.database.0.inner.borrow_mut(); + state_provider.db.state_root(bundle.state())? + }; // create the block header let transactions_root = proofs::calculate_transaction_root(&executed_txs); @@ -645,10 +726,11 @@ where parent_beacon_block_root: attributes.parent_beacon_block_root(), blob_gas_used, excess_blob_gas, + requests_root, }; // seal the block - let block = Block { header, body: executed_txs, ommers: vec![], withdrawals }; + let block = Block { header, body: executed_txs, ommers: vec![], withdrawals, requests }; let sealed_block = block.seal_slow(); debug!(target: "payload_builder", ?sealed_block, "sealed built block");