diff --git a/Cargo.lock b/Cargo.lock index 37da7b57510b..88ad5ca0ac0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,10 +115,10 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.4.2", "arbitrary", "auto_impl", "c-kzg", @@ -127,6 +127,22 @@ dependencies = [ "serde_with", ] +[[package]] +name = "alloy-consensus" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" +dependencies = [ + "alloy-eips 0.5.4", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.5.4", + "auto_impl", + "c-kzg", + "derive_more 1.0.0", + "serde", +] + [[package]] name = "alloy-dyn-abi" version = "0.8.5" @@ -173,6 +189,18 @@ dependencies = [ "serde_with", ] +[[package]] +name = "alloy-eip7702" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "derive_more 1.0.0", + "serde", +] + [[package]] name = "alloy-eips" version = "0.4.2" @@ -180,10 +208,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ffb906284a1e1f63c4607da2068c8197458a352d0b3e9796e67353d72a9be85" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.1.1", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.4.2", "arbitrary", "c-kzg", "derive_more 1.0.0", @@ -192,6 +220,24 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "alloy-eips" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702 0.3.2", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.5.4", + "c-kzg", + "derive_more 1.0.0", + "once_cell", + "serde", + "sha2 0.10.8", +] + [[package]] name = "alloy-genesis" version = "0.4.2" @@ -199,7 +245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8429cf4554eed9b40feec7f4451113e76596086447550275e3def933faf47ce3" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.4.2", "serde", ] @@ -235,13 +281,13 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-json-rpc", - "alloy-network-primitives", + "alloy-network-primitives 0.4.2", "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.4.2", + "alloy-serde 0.4.2", "alloy-signer", "alloy-sol-types", "async-trait", @@ -256,10 +302,23 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", + "alloy-primitives", + "alloy-serde 0.4.2", + "serde", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" +dependencies = [ + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", - "alloy-serde", + "alloy-serde 0.5.4", "serde", ] @@ -319,17 +378,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcfaa4ffec0af04e3555686b8aacbcdf7d13638133a0672749209069750f78a6" dependencies = [ "alloy-chains", - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-json-rpc", "alloy-network", - "alloy-network-primitives", + "alloy-network-primitives 0.4.2", "alloy-primitives", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-admin", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", + "alloy-rpc-types-engine 0.4.2", + "alloy-rpc-types-eth 0.4.2", "alloy-transport", "alloy-transport-http", "alloy-transport-ws", @@ -422,9 +481,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ffc534b7919e18f35e3aa1f507b6f3d9d92ec298463a9f6beaac112809d8d06" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-engine 0.4.2", + "alloy-rpc-types-eth 0.4.2", + "alloy-serde 0.4.2", + "serde", +] + +[[package]] +name = "alloy-rpc-types" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea9bf1abdd506f985a53533f5ac01296bcd6102c5e139bbc5d40bc468d2c916" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-engine 0.5.4", + "alloy-rpc-types-eth 0.5.4", + "alloy-serde 0.5.4", "serde", ] @@ -447,7 +519,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d780adaa5d95b07ad92006b2feb68ecfa7e2015f7d5976ceaac4c906c73ebd07" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.4.2", "serde", ] @@ -457,9 +529,9 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a8dc5980fe30203d698627cddb5f0cedc57f900c8b5e1229c8b9448e37acb4a" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "serde", "serde_with", "thiserror", @@ -481,11 +553,11 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0285c4c09f838ab830048b780d7f4a4f460f309aa1194bb049843309524c64c" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.4.2", "derive_more 1.0.0", "jsonrpsee-types", "jsonwebtoken", @@ -494,18 +566,36 @@ dependencies = [ "strum", ] +[[package]] +name = "alloy-rpc-types-engine" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "886d22d41992287a235af2f3af4299b5ced2bcafb81eb835572ad35747476946" +dependencies = [ + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.5.4", + "derive_more 1.0.0", + "jsonwebtoken", + "rand 0.8.5", + "serde", + "strum", +] + [[package]] name = "alloy-rpc-types-eth" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", + "alloy-network-primitives 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.4.2", "alloy-sol-types", "derive_more 1.0.0", "itertools 0.13.0", @@ -514,15 +604,34 @@ dependencies = [ "serde_json", ] +[[package]] +name = "alloy-rpc-types-eth" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" +dependencies = [ + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-network-primitives 0.5.4", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.5.4", + "alloy-sol-types", + "derive_more 1.0.0", + "itertools 0.13.0", + "serde", + "serde_json", +] + [[package]] name = "alloy-rpc-types-mev" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cec23ce56c869eec5f6b6fd6a8a92b5aa0cfaf8d7be3a96502e537554dc7430" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", - "alloy-serde", + "alloy-serde 0.4.2", "serde", "serde_json", ] @@ -534,8 +643,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "017cad3e5793c5613588c1f9732bcbad77e820ba7d0feaba3527749f856fdbc5" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.4.2", + "alloy-serde 0.4.2", "serde", "serde_json", "thiserror", @@ -548,8 +657,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b230e321c416be7f50530159392b4c41a45596d40d97e185575bcd0b545e521" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.4.2", + "alloy-serde 0.4.2", "serde", ] @@ -565,6 +674,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "alloy-serde" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028e72eaa9703e4882344983cfe7636ce06d8cce104a78ea62fd19b46659efc4" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + [[package]] name = "alloy-signer" version = "0.4.2" @@ -585,7 +705,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494e0a256f3e99f2426f994bcd1be312c02cb8f88260088dacb33a8b8936475f" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.4.2", "alloy-network", "alloy-primitives", "alloy-signer", @@ -2749,7 +2869,7 @@ version = "0.0.0" dependencies = [ "alloy-genesis", "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "eyre", "reth", "reth-basic-payload-builder", @@ -2789,7 +2909,7 @@ name = "example-custom-inspector" version = "0.0.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "clap", "futures-util", "reth", @@ -2850,7 +2970,7 @@ name = "example-db-access" version = "0.0.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "eyre", "reth-chainspec", "reth-db", @@ -5178,11 +5298,11 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ea7162170c6f3cad8f67f4dd7108e3f78349fd553da5b8bebff1e7ef8f38896" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.4.2", "arbitrary", "derive_more 1.0.0", "serde", @@ -5196,8 +5316,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f3d31dfbbd8dd898c7512f8ce7d30103980485416f668566100b0ed0994b958" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-sol-types", "serde", @@ -5210,10 +5330,10 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d113b325527ba7da271a8793f1c14bdf7f035ce9e0611e668c36fc6812568c7f" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.4.2", "alloy-network", "alloy-primitives", - "alloy-rpc-types-eth", + "alloy-rpc-types-eth 0.4.2", "op-alloy-consensus", "op-alloy-rpc-types", ] @@ -5224,11 +5344,11 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "310873e4fbfc41986716c4fb6000a8b49d025d932d2c261af58271c434b05288" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.4.2", "derive_more 1.0.0", "op-alloy-consensus", "op-alloy-genesis", @@ -5241,12 +5361,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "323c65880e2561aa87f74f8af260fd15b9cc930c448c88a60ae95af86c88c634" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", + "alloy-network-primitives 0.4.2", "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.4.2", + "alloy-serde 0.4.2", "op-alloy-consensus", "serde", "serde_json", @@ -5259,8 +5379,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349e7b420f45d1a00216ec4c65fcf3f0057a841bc39732c405c85ae782b94121" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine", - "alloy-serde", + "alloy-rpc-types-engine 0.4.2", + "alloy-serde 0.4.2", "derive_more 1.0.0", "op-alloy-protocol", "serde", @@ -6232,11 +6352,11 @@ dependencies = [ name = "reth" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "aquamarine", "backon", "clap", @@ -6306,7 +6426,7 @@ name = "reth-auto-seal-consensus" version = "1.1.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "futures-util", "reth-beacon-consensus", "reth-chainspec", @@ -6360,7 +6480,7 @@ version = "1.1.0" dependencies = [ "alloy-genesis", "alloy-primitives", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "assert_matches", "futures", "itertools 0.13.0", @@ -6409,13 +6529,13 @@ dependencies = [ name = "reth-bench" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-json-rpc", "alloy-primitives", "alloy-provider", "alloy-pubsub", "alloy-rpc-client", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "alloy-transport", "alloy-transport-http", "alloy-transport-ipc", @@ -6444,8 +6564,8 @@ dependencies = [ name = "reth-blockchain-tree" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", "aquamarine", @@ -6494,8 +6614,8 @@ dependencies = [ name = "reth-chain-state" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-signer", "alloy-signer-local", @@ -6523,7 +6643,7 @@ name = "reth-chainspec" version = "1.1.0" dependencies = [ "alloy-chains", - "alloy-eips", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", "alloy-rlp", @@ -6556,7 +6676,7 @@ name = "reth-cli-commands" version = "1.1.0" dependencies = [ "ahash", - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "arbitrary", "backon", @@ -6625,7 +6745,7 @@ dependencies = [ name = "reth-cli-util" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "cfg-if", "eyre", @@ -6642,8 +6762,8 @@ dependencies = [ name = "reth-codecs" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", "alloy-rlp", @@ -6702,7 +6822,7 @@ dependencies = [ name = "reth-consensus-common" version = "1.1.0" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.4.2", "alloy-primitives", "mockall", "rand 0.8.5", @@ -6717,12 +6837,12 @@ dependencies = [ name = "reth-consensus-debug-client" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-provider", - "alloy-rpc-types", - "alloy-rpc-types-engine", + "alloy-rpc-types 0.4.2", + "alloy-rpc-types-engine 0.4.2", "auto_impl", "eyre", "futures", @@ -6930,7 +7050,7 @@ dependencies = [ name = "reth-downloaders" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", "assert_matches", @@ -6967,11 +7087,11 @@ dependencies = [ name = "reth-e2e-test-utils" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-network", "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "alloy-signer", "alloy-signer-local", "eyre", @@ -7036,7 +7156,7 @@ name = "reth-engine-local" version = "1.1.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "eyre", "futures-util", "reth-beacon-consensus", @@ -7105,10 +7225,10 @@ dependencies = [ name = "reth-engine-tree" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "assert_matches", "futures", "metrics", @@ -7153,7 +7273,7 @@ name = "reth-engine-util" version = "1.1.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "eyre", "futures", "itertools 0.13.0", @@ -7194,7 +7314,7 @@ dependencies = [ name = "reth-eth-wire" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", "arbitrary", @@ -7230,8 +7350,8 @@ name = "reth-eth-wire-types" version = "1.1.0" dependencies = [ "alloy-chains", - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", "alloy-rlp", @@ -7275,10 +7395,10 @@ dependencies = [ name = "reth-ethereum-engine-primitives" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "reth-chain-state", "reth-chainspec", "reth-engine-primitives", @@ -7347,7 +7467,7 @@ dependencies = [ name = "reth-evm" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "auto_impl", "futures-util", @@ -7369,8 +7489,8 @@ dependencies = [ name = "reth-evm-ethereum" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", "alloy-sol-types", @@ -7392,7 +7512,7 @@ dependencies = [ name = "reth-execution-errors" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", "derive_more 1.0.0", @@ -7407,8 +7527,9 @@ dependencies = [ name = "reth-execution-types" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", + "alloy-rpc-types 0.5.4", "arbitrary", "bincode", "rand 0.8.5", @@ -7424,8 +7545,8 @@ dependencies = [ name = "reth-exex" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", "eyre", @@ -7501,7 +7622,7 @@ dependencies = [ name = "reth-exex-types" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "arbitrary", "bincode", @@ -7633,8 +7754,8 @@ dependencies = [ name = "reth-network" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-node-bindings", "alloy-primitives", "alloy-provider", @@ -7715,7 +7836,7 @@ dependencies = [ name = "reth-network-p2p" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "auto_impl", "derive_more 1.0.0", @@ -7800,7 +7921,7 @@ name = "reth-node-builder" version = "1.1.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "aquamarine", "eyre", "fdlimit", @@ -7864,7 +7985,7 @@ name = "reth-node-core" version = "1.1.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "clap", "const_format", "derive_more 1.0.0", @@ -7950,7 +8071,7 @@ name = "reth-node-events" version = "1.1.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "futures", "humantime", "pin-project", @@ -8083,8 +8204,8 @@ dependencies = [ name = "reth-optimism-evm" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", "op-alloy-consensus", @@ -8120,10 +8241,10 @@ dependencies = [ name = "reth-optimism-node" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "async-trait", "clap", "eyre", @@ -8173,10 +8294,10 @@ dependencies = [ name = "reth-optimism-payload-builder" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "op-alloy-rpc-types-engine", "reth-basic-payload-builder", "reth-chain-state", @@ -8215,10 +8336,10 @@ dependencies = [ name = "reth-optimism-rpc" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", - "alloy-rpc-types", - "alloy-rpc-types-eth", + "alloy-rpc-types 0.4.2", + "alloy-rpc-types-eth 0.4.2", "derive_more 1.0.0", "jsonrpsee-types", "op-alloy-consensus", @@ -8266,7 +8387,7 @@ name = "reth-payload-builder" version = "1.1.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "async-trait", "futures-util", "metrics", @@ -8287,7 +8408,7 @@ name = "reth-payload-primitives" version = "1.1.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "async-trait", "op-alloy-rpc-types-engine", "pin-project", @@ -8307,7 +8428,7 @@ dependencies = [ name = "reth-payload-validator" version = "1.1.0" dependencies = [ - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "reth-chainspec", "reth-primitives", "reth-rpc-types-compat", @@ -8317,13 +8438,13 @@ dependencies = [ name = "reth-primitives" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types", - "alloy-serde", + "alloy-rpc-types 0.4.2", + "alloy-serde 0.4.2", "arbitrary", "assert_matches", "bincode", @@ -8362,8 +8483,8 @@ dependencies = [ name = "reth-primitives-traits" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", "alloy-rlp", @@ -8390,10 +8511,10 @@ dependencies = [ name = "reth-provider" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-primitives", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "assert_matches", "auto_impl", "dashmap 6.1.0", @@ -8506,21 +8627,21 @@ dependencies = [ name = "reth-rpc" version = "1.1.0" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.4.2", "alloy-dyn-abi", - "alloy-eips", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-network", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "alloy-rpc-types-admin", "alloy-rpc-types-debug", - "alloy-rpc-types-eth", + "alloy-rpc-types-eth 0.4.2", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde", + "alloy-serde 0.4.2", "alloy-signer", "alloy-signer-local", "async-trait", @@ -8574,20 +8695,20 @@ dependencies = [ name = "reth-rpc-api" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-json-rpc", "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.4.2", "alloy-rpc-types-admin", "alloy-rpc-types-anvil", "alloy-rpc-types-beacon", "alloy-rpc-types-debug", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", + "alloy-rpc-types-engine 0.4.2", + "alloy-rpc-types-eth 0.4.2", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde", + "alloy-serde 0.4.2", "jsonrpsee", "reth-engine-primitives", "reth-network-peers", @@ -8601,8 +8722,8 @@ name = "reth-rpc-api-testing-util" version = "1.1.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types", - "alloy-rpc-types-eth", + "alloy-rpc-types 0.4.2", + "alloy-rpc-types-eth 0.4.2", "alloy-rpc-types-trace", "futures", "jsonrpsee", @@ -8621,11 +8742,11 @@ version = "1.1.0" dependencies = [ "alloy-network", "alloy-primitives", - "alloy-rpc-types", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", + "alloy-rpc-types 0.4.2", + "alloy-rpc-types-engine 0.4.2", + "alloy-rpc-types-eth 0.4.2", "alloy-rpc-types-trace", - "alloy-serde", + "alloy-serde 0.4.2", "clap", "http", "jsonrpsee", @@ -8671,10 +8792,10 @@ dependencies = [ name = "reth-rpc-engine-api" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "assert_matches", "async-trait", "jsonrpsee-core", @@ -8708,12 +8829,12 @@ name = "reth-rpc-eth-api" version = "1.1.0" dependencies = [ "alloy-dyn-abi", - "alloy-eips", + "alloy-eips 0.4.2", "alloy-json-rpc", "alloy-network", "alloy-primitives", - "alloy-rpc-types", - "alloy-rpc-types-eth", + "alloy-rpc-types 0.4.2", + "alloy-rpc-types-eth 0.4.2", "alloy-rpc-types-mev", "async-trait", "auto_impl", @@ -8747,12 +8868,12 @@ dependencies = [ name = "reth-rpc-eth-types" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-primitives", - "alloy-rpc-types", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types 0.4.2", + "alloy-rpc-types-eth 0.4.2", + "alloy-serde 0.4.2", "alloy-sol-types", "derive_more 1.0.0", "futures", @@ -8790,7 +8911,7 @@ dependencies = [ name = "reth-rpc-layer" version = "1.1.0" dependencies = [ - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "http", "jsonrpsee", "jsonrpsee-http-client", @@ -8806,7 +8927,7 @@ name = "reth-rpc-server-types" version = "1.1.0" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine", + "alloy-rpc-types-engine 0.4.2", "jsonrpsee-core", "jsonrpsee-types", "reth-errors", @@ -8820,13 +8941,13 @@ dependencies = [ name = "reth-rpc-types-compat" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types 0.4.2", + "alloy-rpc-types-engine 0.4.2", + "alloy-rpc-types-eth 0.4.2", + "alloy-serde 0.4.2", "reth-primitives", "reth-trie-common", "serde_json", @@ -8967,7 +9088,7 @@ dependencies = [ name = "reth-storage-api" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "auto_impl", "reth-chainspec", @@ -8985,7 +9106,7 @@ dependencies = [ name = "reth-storage-errors" version = "1.1.0" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", "derive_more 1.0.0", @@ -9014,8 +9135,8 @@ dependencies = [ name = "reth-testing-utils" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-genesis", "alloy-primitives", "rand 0.8.5", @@ -9050,8 +9171,8 @@ dependencies = [ name = "reth-transaction-pool" version = "1.1.0" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", "aquamarine", @@ -9126,7 +9247,7 @@ dependencies = [ name = "reth-trie-common" version = "1.1.0" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.4.2", "alloy-genesis", "alloy-primitives", "alloy-rlp", @@ -9230,7 +9351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43c44af0bf801f48d25f7baf25cf72aff4c02d610f83b428175228162fef0246" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth", + "alloy-rpc-types-eth 0.4.2", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", @@ -9279,7 +9400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f1525851a03aff9a9d6a1d018b414d76252d6802ab54695b27093ecd7e7a101" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.1.1", "alloy-primitives", "auto_impl", "bitflags 2.6.0", diff --git a/crates/ethereum/evm/src/execute.rs b/crates/ethereum/evm/src/execute.rs index 31411924364d..62faa9198a07 100644 --- a/crates/ethereum/evm/src/execute.rs +++ b/crates/ethereum/evm/src/execute.rs @@ -369,7 +369,7 @@ where // NOTE: we need to merge keep the reverts for the bundle retention self.state.merge_transitions(BundleRetention::Reverts); - Ok(BlockExecutionOutput { state: self.state.take_bundle(), receipts, requests, gas_used }) + Ok(BlockExecutionOutput { state: self.state.take_bundle(), receipts, requests, gas_used, target_list: vec![] }) } fn execute_with_state_closure( @@ -387,7 +387,7 @@ where // NOTE: we need to merge keep the reverts for the bundle retention self.state.merge_transitions(BundleRetention::Reverts); witness(&self.state); - Ok(BlockExecutionOutput { state: self.state.take_bundle(), receipts, requests, gas_used }) + Ok(BlockExecutionOutput { state: self.state.take_bundle(), receipts, requests, gas_used, target_list: vec![] }) } fn execute_with_state_hook( @@ -408,7 +408,7 @@ where // NOTE: we need to merge keep the reverts for the bundle retention self.state.merge_transitions(BundleRetention::Reverts); - Ok(BlockExecutionOutput { state: self.state.take_bundle(), receipts, requests, gas_used }) + Ok(BlockExecutionOutput { state: self.state.take_bundle(), receipts, requests, gas_used, target_list: vec![] }) } } /// An executor for a batch of blocks. diff --git a/crates/evm/execution-types/Cargo.toml b/crates/evm/execution-types/Cargo.toml index 9bd6537326b1..4d09a204938e 100644 --- a/crates/evm/execution-types/Cargo.toml +++ b/crates/evm/execution-types/Cargo.toml @@ -23,6 +23,7 @@ alloy-eips.workspace = true serde = { workspace = true, optional = true } serde_with = { workspace = true, optional = true } +alloy-rpc-types = "0.5.4" [dev-dependencies] alloy-eips.workspace = true diff --git a/crates/evm/execution-types/src/execute.rs b/crates/evm/execution-types/src/execute.rs index 22ee3fd5b581..67d1fac9997c 100644 --- a/crates/evm/execution-types/src/execute.rs +++ b/crates/evm/execution-types/src/execute.rs @@ -1,4 +1,5 @@ use alloy_primitives::U256; +use alloy_rpc_types::Transaction; use reth_primitives::Request; use revm::db::BundleState; @@ -42,6 +43,17 @@ impl<'a, Block> From<(&'a mut Block, U256)> for BlockExecutionInput<'a, Block> { } } +/// Result of the trigger +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct TaskResult { + /// Transactions + pub txs: Vec, + /// Estimated gas used + pub estimated_gas_used: u64, + /// Bytes length + pub bytes_length: u64, +} + /// The output of an ethereum block. /// /// Contains the state changes, transaction receipts, and total gas used in the block. @@ -55,4 +67,6 @@ pub struct BlockExecutionOutput { pub requests: Vec, /// The total gas used by the block. pub gas_used: u64, + /// The target list. + pub target_list: Vec, } diff --git a/crates/evm/src/test_utils.rs b/crates/evm/src/test_utils.rs index fc620bb42c33..5116d40ed166 100644 --- a/crates/evm/src/test_utils.rs +++ b/crates/evm/src/test_utils.rs @@ -63,6 +63,7 @@ impl Executor for MockExecutorProvider { receipts: receipts.into_iter().flatten().flatten().collect(), requests: requests.into_iter().flatten().collect(), gas_used: 0, + target_list: vec![], }) } diff --git a/crates/optimism/evm/src/execute.rs b/crates/optimism/evm/src/execute.rs index 3a66c4cb9133..97f518745cb5 100644 --- a/crates/optimism/evm/src/execute.rs +++ b/crates/optimism/evm/src/execute.rs @@ -378,6 +378,7 @@ where receipts, requests: vec![], gas_used, + target_list: vec![], }) } @@ -401,6 +402,7 @@ where receipts, requests: vec![], gas_used, + target_list: vec![], }) } @@ -427,6 +429,7 @@ where receipts, requests: vec![], gas_used, + target_list: vec![], }) } }