diff --git a/Cargo.lock b/Cargo.lock index 69e253256..0d0661024 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -190,115 +190,139 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alloy-consensus" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4177d135789e282e925092be8939d421b701c6d92c0a16679faa659d9166289d" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", + "alloy-serde", "c-kzg", "serde", - "sha2 0.10.8", ] [[package]] -name = "alloy-consensus" +name = "alloy-eip2930" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=8c9dd0a#8c9dd0ae0a0f12eb81b5afe75a9b55ea4ad3abf4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", "serde", - "sha2 0.10.8", ] [[package]] -name = "alloy-consensus" +name = "alloy-eip7702" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d319bb544ca6caeab58c39cea8921c55d924d4f68f2c60f24f914673f9a74a" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy.git?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500)", "alloy-primitives", "alloy-rlp", - "c-kzg", - "sha2 0.10.8", + "k256", + "serde", ] [[package]] name = "alloy-eips" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "499ee14d296a133d142efd215eb36bf96124829fe91cf8f5d4e5ccdd381eae00" dependencies = [ + "alloy-eip2930", + "alloy-eip7702", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", + "alloy-serde", "c-kzg", + "derive_more 1.0.0", "once_cell", "serde", + "sha2 0.10.8", ] [[package]] -name = "alloy-eips" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=8c9dd0a#8c9dd0ae0a0f12eb81b5afe75a9b55ea4ad3abf4" +name = "alloy-genesis" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b85dfc693e4a1193f0372a8f789df12ab51fcbe7be0733baa04939a86dd813b" dependencies = [ "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", - "c-kzg", - "once_cell", + "alloy-serde", "serde", ] [[package]] -name = "alloy-eips" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" +name = "alloy-json-abi" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "299d2a937b6c60968df3dad2a988b0f0e03277b344639a4f7a31bd68e6285e59" dependencies = [ "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy.git?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500)", - "c-kzg", - "once_cell", + "alloy-sol-type-parser", "serde", + "serde_json", ] [[package]] -name = "alloy-genesis" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca" +name = "alloy-json-rpc" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4207166c79cfdf7f3bed24bbc84f5c7c5d4db1970f8c82e3fcc76257f16d2166" dependencies = [ "alloy-primitives", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", + "alloy-sol-types", "serde", "serde_json", + "thiserror", + "tracing", ] [[package]] -name = "alloy-genesis" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=8c9dd0a#8c9dd0ae0a0f12eb81b5afe75a9b55ea4ad3abf4" +name = "alloy-network" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe2802d5b8c632f18d68c352073378f02a3407c1b6a4487194e7d21ab0f002" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "thiserror", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396c07726030fa0f9dab5da8c71ccd69d5eb74a7fe1072b7ae453a67e4fe553e" dependencies = [ "alloy-primitives", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", + "alloy-serde", "serde", ] [[package]] name = "alloy-primitives" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4" +checksum = "a767e59c86900dd7c3ce3ecef04f3ace5ac9631ee150beb8b7d22f7fa3bbb2d7" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", - "derive_more", - "ethereum_ssz", + "derive_more 0.99.18", "getrandom 0.2.15", "hex-literal", "itoa", @@ -335,115 +359,162 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9ae4c4fbd37d9996f501fbc7176405aab97ae3a5772789be06ef0e7c4dad6dd" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-rpc-types-trace", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-rpc-types-admin" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "594b7cb723759c7b438c95a3bbd2e391760c03ee857443070758aaf2593ae84e" +dependencies = [ + "alloy-genesis", "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", - "alloy-sol-types", - "itertools 0.12.1", "serde", "serde_json", - "thiserror", ] [[package]] -name = "alloy-rpc-types" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=8c9dd0a#8c9dd0ae0a0f12eb81b5afe75a9b55ea4ad3abf4" +name = "alloy-rpc-types-anvil" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b079c6fda14d9586432bf988b46ac0e04871ca313c9e00aa85cc808105e8a" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", - "alloy-sol-types", - "itertools 0.12.1", - "jsonrpsee-types", + "alloy-serde", "serde", - "serde_json", +] + +[[package]] +name = "alloy-rpc-types-beacon" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abbd9b6764423821bd6874477791ca68cfd0e946958d611319b57b006edf0113" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "serde", + "serde_with", "thiserror", ] [[package]] name = "alloy-rpc-types-engine" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=8c9dd0a#8c9dd0ae0a0f12eb81b5afe75a9b55ea4ad3abf4" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d79cadb52e32d40afa04847647eb50a332559d7870e66e46a0c32c33bf1c801d" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", - "jsonrpsee-types", + "alloy-rpc-types-eth", + "alloy-serde", + "jsonrpsee-types 0.24.3", + "jsonwebtoken 9.3.0", + "rand 0.8.5", "serde", "thiserror", ] [[package]] -name = "alloy-rpc-types-trace" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca" +name = "alloy-rpc-types-eth" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15bb3506ab1cf415d4752778c93e102050399fb8de97b7da405a5bf3e31f5f3b" dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-network-primitives", "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", + "alloy-rlp", + "alloy-serde", + "alloy-sol-types", + "itertools 0.13.0", + "jsonrpsee-types 0.24.3", "serde", "serde_json", + "thiserror", ] [[package]] -name = "alloy-rpc-types-trace" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=8c9dd0a#8c9dd0ae0a0f12eb81b5afe75a9b55ea4ad3abf4" +name = "alloy-rpc-types-mev" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e8cb848b66617f7d58b576bfc416854c4e9ae8d35e14f5077c0c779048f280" dependencies = [ + "alloy-eips", "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", + "alloy-serde", "serde", "serde_json", ] [[package]] -name = "alloy-serde" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca" +name = "alloy-rpc-types-trace" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cca915e0aab3b2657b4f9efe02eb88e5483905fb6d244749652aae14e5f92e" dependencies = [ "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", "serde", "serde_json", + "thiserror", ] [[package]] -name = "alloy-serde" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=8c9dd0a#8c9dd0ae0a0f12eb81b5afe75a9b55ea4ad3abf4" +name = "alloy-rpc-types-txpool" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68eede4bd722bb872222efbbfbccc8f9b86e597143934b8ce556d3e0487bb662" dependencies = [ "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", "serde", - "serde_json", ] [[package]] name = "alloy-serde" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae417978015f573b4a8c02af17f88558fb22e3fccd12e8a910cf6a2ff331cfcb" dependencies = [ "alloy-primitives", "serde", "serde_json", ] +[[package]] +name = "alloy-signer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b750c9b61ac0646f8f4a61231c2732a337b2c829866fc9a191b96b7eedf80ffe" +dependencies = [ + "alloy-primitives", + "async-trait", + "auto_impl", + "elliptic-curve", + "k256", + "thiserror", +] + [[package]] name = "alloy-sol-macro" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09" +checksum = "183bcfc0f3291d9c41a3774172ee582fb2ce6eb6569085471d8f225de7bb86fc" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -455,9 +526,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525" +checksum = "71c4d842beb7a6686d04125603bc57614d5ed78bf95e4753274db3db4ba95214" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -473,9 +544,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528" +checksum = "1306e8d3c9e6e6ecf7a39ffaf7291e73a5f655a2defd366ee92c2efebcdf7fee" dependencies = [ "const-hex", "dunce", @@ -486,12 +557,23 @@ dependencies = [ "syn-solidity", ] +[[package]] +name = "alloy-sol-type-parser" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4691da83dce9c9b4c775dd701c87759f173bd3021cbf2e60cde00c5fe6d7241" +dependencies = [ + "serde", + "winnow 0.6.18", +] + [[package]] name = "alloy-sol-types" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" +checksum = "577e262966e92112edbd15b1b2c0947cc434d6e8311df96d3329793fe8047da9" dependencies = [ + "alloy-json-abi", "alloy-primitives", "alloy-sol-macro", "const-hex", @@ -991,7 +1073,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" dependencies = [ - "http", + "http 0.2.12", "log", "url", ] @@ -2016,6 +2098,27 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", + "unicode-xid", +] + [[package]] name = "digest" version = "0.9.0" @@ -2283,7 +2386,6 @@ dependencies = [ "log", "rand 0.8.5", "rlp", - "secp256k1 0.27.0", "serde", "sha3 0.10.8", "zeroize", @@ -2397,7 +2499,7 @@ dependencies = [ [[package]] name = "eth_trie" version = "0.4.0" -source = "git+https://github.com/kolbyml/eth-trie.rs.git?rev=7947a83091192a7988f359b750b05121d5d7ba8c#7947a83091192a7988f359b750b05121d5d7ba8c" +source = "git+https://github.com/kolbyml/eth-trie.rs.git?rev=dc8b95d40ded01396ba53bff10e1ea364bd5ed54#dc8b95d40ded01396ba53bff10e1ea364bd5ed54" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -2457,23 +2559,22 @@ dependencies = [ [[package]] name = "ethereum_hashing" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea7b408432c13f71af01197b1d3d0069c48a27bfcfbe72a81fc346e47f6defb" +checksum = "c853bd72c9e5787f8aafc3df2907c2ed03cff3150c3acd94e2e53a98ab70a8ab" dependencies = [ "cpufeatures 0.2.13", - "lazy_static", "ring 0.17.8", "sha2 0.10.8", ] [[package]] name = "ethereum_serde_utils" -version = "0.5.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de4d5951468846963c24e8744c133d44f39dff2cd3a233f6be22b370d08a524f" +checksum = "70cbccfccf81d67bff0ab36e591fa536c8a935b078a7b0e58c1d00d418332fc9" dependencies = [ - "ethereum-types", + "alloy-primitives", "hex", "serde", "serde_derive", @@ -2482,25 +2583,25 @@ dependencies = [ [[package]] name = "ethereum_ssz" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3627f83d8b87b432a5fad9934b4565260722a141a2c40f371f8080adec9425" +checksum = "1e999563461faea0ab9bc0024e5e66adcee35881f3d5062f52f31a4070fe1522" dependencies = [ - "ethereum-types", - "itertools 0.10.5", + "alloy-primitives", + "itertools 0.13.0", "smallvec", ] [[package]] name = "ethereum_ssz_derive" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eccd5378ec34a07edd3d9b48088cbc63309d0367d14ba10b0cdb1d1791080ea" +checksum = "f3deae99c8e74829a00ba7a92d49055732b3c1f093f2ccfa3cbc621679b6fa91" dependencies = [ - "darling 0.13.4", + "darling 0.20.10", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -2681,9 +2782,9 @@ dependencies = [ "futures-timer", "futures-util", "hashers", - "http", + "http 0.2.12", "instant", - "jsonwebtoken", + "jsonwebtoken 8.3.0", "once_cell", "pin-project", "reqwest", @@ -2785,7 +2886,7 @@ dependencies = [ "rlp", "rs_merkle", "rstest", - "secp256k1 0.29.0", + "secp256k1", "serde", "serde-this-or-that", "serde_json", @@ -3156,6 +3257,12 @@ dependencies = [ "slab", ] +[[package]] +name = "futures-utils-wasm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" + [[package]] name = "fxhash" version = "0.2.1" @@ -3203,8 +3310,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -3262,7 +3371,7 @@ dependencies = [ "futures-core", "futures-sink", "gloo-utils", - "http", + "http 0.2.12", "js-sys", "pin-project", "serde", @@ -3320,7 +3429,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.12", "indexmap 2.5.0", "slab", "tokio", @@ -3505,6 +3614,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -3512,7 +3632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", "pin-project-lite", ] @@ -3592,7 +3712,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.12", "http-body", "httparse", "httpdate", @@ -3612,7 +3732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.12", "hyper", "log", "rustls 0.21.12", @@ -3852,6 +3972,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -3887,7 +4016,7 @@ dependencies = [ "jsonrpsee-http-client", "jsonrpsee-proc-macros", "jsonrpsee-server", - "jsonrpsee-types", + "jsonrpsee-types 0.20.4", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", "tokio", @@ -3903,7 +4032,7 @@ dependencies = [ "futures-channel", "futures-util", "gloo-net", - "http", + "http 0.2.12", "jsonrpsee-core", "pin-project", "rustls-native-certs", @@ -3930,7 +4059,7 @@ dependencies = [ "futures-timer", "futures-util", "hyper", - "jsonrpsee-types", + "jsonrpsee-types 0.20.4", "parking_lot 0.12.3", "rand 0.8.5", "rustc-hash", @@ -3953,7 +4082,7 @@ dependencies = [ "hyper", "hyper-rustls", "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-types 0.20.4", "serde", "serde_json", "thiserror", @@ -3983,10 +4112,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a482bc4e25eebd0adb61a3468c722763c381225bd3ec46e926f709df8a8eb548" dependencies = [ "futures-util", - "http", + "http 0.2.12", "hyper", "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-types 0.20.4", "route-recognizer", "serde", "serde_json", @@ -4013,6 +4142,18 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b67d6e008164f027afbc2e7bb79662650158d26df200040282d2aa1cbb093b" +dependencies = [ + "http 1.1.0", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "jsonrpsee-wasm-client" version = "0.20.4" @@ -4021,7 +4162,7 @@ checksum = "9437dd0e8728897d0aa5a0075b8710266300e55ced07101ca0930fac4a611384" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-types 0.20.4", ] [[package]] @@ -4030,10 +4171,10 @@ version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d06eeabbb55f0af8405288390a358ebcceb6e79e1390741e6f152309c4d6076" dependencies = [ - "http", + "http 0.2.12", "jsonrpsee-client-transport", "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-types 0.20.4", "url", ] @@ -4044,13 +4185,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.7", - "pem", + "pem 1.1.1", "ring 0.16.20", "serde", "serde_json", "simple_asn1", ] +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "pem 3.0.4", + "ring 0.17.8", + "serde", + "serde_json", + "simple_asn1", +] + [[package]] name = "k256" version = "0.13.3" @@ -4703,6 +4859,49 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "op-alloy-consensus" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7fbb0f5c3754c22c6ea30e100dca6aea73b747e693e27763e23ca92fb02f2f" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "derive_more 1.0.0", + "serde", + "spin 0.9.8", +] + +[[package]] +name = "op-alloy-rpc-types" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1fbb93dcb71aba9cd555784375011efce1fdaaea67e01972a0a9bc9eb90c626" +dependencies = [ + "alloy-network", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "op-alloy-consensus", + "serde", + "serde_json", +] + +[[package]] +name = "op-alloy-rpc-types-engine" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14716d1b1e82ca710de448f16efb62e29b2ed999f0ea0060801fd037666fabc7" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-serde", + "serde", +] + [[package]] name = "opaque-debug" version = "0.3.1" @@ -4923,6 +5122,16 @@ dependencies = [ "base64 0.13.1", ] +[[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64 0.22.1", + "serde", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -5157,7 +5366,6 @@ dependencies = [ name = "portal-bridge" version = "0.1.0" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy.git?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500)", "alloy-primitives", "alloy-rlp", "anyhow", @@ -5663,7 +5871,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.12", "http-body", "hyper", "hyper-rustls", @@ -5714,30 +5922,29 @@ dependencies = [ [[package]] name = "reth-rpc-types" -version = "0.2.0-beta.5" -source = "git+https://github.com/paradigmxyz/reth.git?rev=8d1d13ef89cf19459adc37ba0c45e7aac6270dc1#8d1d13ef89cf19459adc37ba0c45e7aac6270dc1" +version = "1.0.6" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", + "alloy-rpc-types", + "alloy-rpc-types-admin", + "alloy-rpc-types-anvil", + "alloy-rpc-types-beacon", "alloy-rpc-types-engine", - "alloy-rpc-types-trace 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=8c9dd0a)", - "enr", - "jsonrpsee-types", - "secp256k1 0.27.0", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", + "alloy-rpc-types-mev", + "alloy-rpc-types-trace", + "alloy-rpc-types-txpool", + "alloy-serde", + "jsonrpsee-types 0.24.3", + "op-alloy-rpc-types", + "op-alloy-rpc-types-engine", ] [[package]] name = "revm" -version = "8.0.0" +version = "14.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a454c1c650b2b2e23f0c461af09e6c31e1d15e1cbebe905a701c46b8a50afc" +checksum = "1f719e28cc6fdd086f8bc481429e587740d20ad89729cec3f5f5dd7b655474df" dependencies = [ "auto_impl", "cfg-if", @@ -5750,12 +5957,12 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=848d568#848d5688d0c499c538b9a78b423a7061525aa580" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48184032103bb23788e42e42c7c85207f5b0b8a248b09ea8f5233077f35ab56e" dependencies = [ "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", - "alloy-rpc-types-trace 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=4e22b9e)", + "alloy-rpc-types", "alloy-sol-types", "anstyle", "colorchoice", @@ -5766,9 +5973,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "4.0.0" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d322f2730cd300e99d271a1704a2dfb8973d832428f5aa282aaa40e2473b5eec" +checksum = "959ecbc36802de6126852479844737f20194cf8e6718e0c30697d306a2cca916" dependencies = [ "revm-primitives", "serde", @@ -5776,27 +5983,29 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "6.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931f692f3f4fc72ec39d5d270f8e9d208c4a6008de7590ee96cf948e3b6d3f8d" +checksum = "6e25f604cb9db593ca3013be8c00f310d6790ccb1b7d8fbbdd4660ec8888043a" dependencies = [ "aurora-engine-modexp", "c-kzg", + "cfg-if", "k256", "once_cell", "revm-primitives", "ripemd", - "secp256k1 0.28.2", + "secp256k1", "sha2 0.10.8", "substrate-bn", ] [[package]] name = "revm-primitives" -version = "3.1.1" +version = "9.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbbc9640790cebcb731289afb7a7d96d16ad94afeb64b5d0b66443bd151e79d6" +checksum = "0ccb981ede47ccf87c68cebf1ba30cdbb7ec935233ea305f3dfff4c1e10ae541" dependencies = [ + "alloy-eips", "alloy-primitives", "auto_impl", "bitflags 2.6.0", @@ -5970,7 +6179,6 @@ dependencies = [ "ark-ff 0.3.0", "ark-ff 0.4.2", "bytes", - "ethereum_ssz", "fastrlp", "num-bigint", "num-traits", @@ -6217,7 +6425,7 @@ checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "bitvec", "cfg-if", - "derive_more", + "derive_more 0.99.18", "parity-scale-codec", "scale-info-derive", ] @@ -6320,25 +6528,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secp256k1" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" -dependencies = [ - "secp256k1-sys 0.8.1", -] - -[[package]] -name = "secp256k1" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" -dependencies = [ - "rand 0.8.5", - "secp256k1-sys 0.9.2", -] - [[package]] name = "secp256k1" version = "0.29.0" @@ -6346,25 +6535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" dependencies = [ "rand 0.8.5", - "secp256k1-sys 0.10.0", -] - -[[package]] -name = "secp256k1-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" -dependencies = [ - "cc", -] - -[[package]] -name = "secp256k1-sys" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" -dependencies = [ - "cc", + "secp256k1-sys", ] [[package]] @@ -6407,7 +6578,7 @@ checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" dependencies = [ "bitflags 2.6.0", "cssparser", - "derive_more", + "derive_more 0.99.18", "fxhash", "log", "new_debug_unreachable", @@ -6854,7 +7025,7 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http", + "http 0.2.12", "httparse", "log", "rand 0.8.5", @@ -6886,6 +7057,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "spki" @@ -6924,13 +7098,14 @@ dependencies = [ [[package]] name = "ssz_types" -version = "0.6.0" -source = "git+https://github.com/KolbyML/ssz_types.git?rev=2a5922de75f00746890bf4ea9ad663c9d5d58efe#2a5922de75f00746890bf4ea9ad663c9d5d58efe" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35e0719d2b86ac738a55ae71a8429f52aa2741da988f1fd0975b4cc610fd1e08" dependencies = [ "derivative", "ethereum_serde_utils", "ethereum_ssz", - "itertools 0.10.5", + "itertools 0.13.0", "serde", "serde_derive", "smallvec", @@ -7196,9 +7371,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c837dc8852cb7074e46b444afb81783140dab12c58867b49fb3898fbafedf7ea" +checksum = "284c41c2919303438fcf8dede4036fd1e82d4fc0fbb2b279bd2a1442c909ca92" dependencies = [ "paste", "proc-macro2", @@ -7624,7 +7799,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", + "http 0.2.12", "http-body", "http-range-header", "httpdate", @@ -7823,8 +7998,9 @@ dependencies = [ [[package]] name = "tree_hash" -version = "0.6.0" -source = "git+https://github.com/KolbyML/tree_hash.git?rev=8aaf8bb4184148768d48e2cfbbdd0b95d1da8730#8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "373495c23db675a5192de8b610395e1bec324d596f9e6111192ce903dc11403a" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -7833,12 +8009,14 @@ dependencies = [ [[package]] name = "tree_hash_derive" -version = "0.6.0" -source = "git+https://github.com/KolbyML/tree_hash.git?rev=8aaf8bb4184148768d48e2cfbbdd0b95d1da8730#8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0857056ca4eb5de8c417309be42bcff6017b47e86fbaddde609b4633f66061e" dependencies = [ - "darling 0.13.4", + "darling 0.20.10", + "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -7922,7 +8100,7 @@ dependencies = [ name = "trin-execution" version = "0.1.0" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy.git?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500)", + "alloy-consensus", "alloy-primitives", "alloy-rlp", "anyhow", @@ -8094,7 +8272,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.12", "httparse", "log", "rand 0.8.5", diff --git a/Cargo.toml b/Cargo.toml index 776f8c18f..64a0afe8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,9 +79,9 @@ members = [ ] [workspace.dependencies] -alloy-consensus = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500"} -alloy-primitives = { version = "0.7.0", features = ["ssz"] } -alloy-rlp = "0.3.4" +alloy-consensus = "0.3.1" +alloy-primitives = "0.8.0" +alloy-rlp = "0.3.8" anyhow = "1.0.68" async-trait = "0.1.68" bytes = "1.3.0" @@ -91,9 +91,9 @@ directories = "3.0" discv5 = { version = "0.4.1", features = ["serde"] } e2store = { path = "e2store" } env_logger = "0.9.0" -eth_trie = { git = "https://github.com/kolbyml/eth-trie.rs.git", rev = "7947a83091192a7988f359b750b05121d5d7ba8c" } -ethereum_ssz = "0.5.3" -ethereum_ssz_derive = "0.5.3" +eth_trie = { git = "https://github.com/kolbyml/eth-trie.rs.git", rev = "dc8b95d40ded01396ba53bff10e1ea364bd5ed54" } +ethereum_ssz = "0.7.1" +ethereum_ssz_derive = "0.7.1" ethportal-api = { path = "ethportal-api" } futures = "0.3.23" hex = "0.4.3" @@ -111,9 +111,9 @@ r2d2 = "0.8.9" r2d2_sqlite = "0.24.0" rand = "0.8.5" reth-ipc = { tag = "v0.2.0-beta.5", git = "https://github.com/paradigmxyz/reth.git"} -reth-rpc-types = { rev = "8d1d13ef89cf19459adc37ba0c45e7aac6270dc1", git = "https://github.com/paradigmxyz/reth.git"} -revm = { version = "8.0.0", features = ["std", "secp256k1", "serde-json"], default-features = false } -revm-primitives = { version = "3.1.0", features = ["std", "serde"], default-features = false } +reth-rpc-types = { tag = "v1.0.6", git = "https://github.com/paradigmxyz/reth.git"} +revm = { version = "14.0.1", features = ["std", "secp256k1", "serde-json"], default-features = false } +revm-primitives = { version = "9.0.1", features = ["std", "serde"], default-features = false } rpc = { path = "rpc"} rstest = "0.18.2" rusqlite = { version = "0.31.0", features = ["bundled"] } @@ -125,7 +125,7 @@ serde-this-or-that = "0.4.2" serial_test = "0.5.1" sha3 = "0.9.1" snap = "1.1.1" -ssz_types = { git = "https://github.com/KolbyML/ssz_types.git", rev = "2a5922de75f00746890bf4ea9ad663c9d5d58efe" } +ssz_types = "0.8.0" strum = { version = "0.26.1", features = ["derive"] } surf = { version = "2.3.2", default-features = false, features = ["h1-client-rustls", "middleware-logger", "encoding"] } # we use rustls because OpenSSL cause issues compiling on aarch64 tempfile = "3.3.0" @@ -136,8 +136,8 @@ tokio-test = "0.4.2" tracing = "0.1.36" tracing-subscriber = "0.3.15" tracing-test = "0.1" -tree_hash = { git = "https://github.com/KolbyML/tree_hash.git", rev = "8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" } -tree_hash_derive = { git = "https://github.com/KolbyML/tree_hash.git", rev = "8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" } +tree_hash = "0.8.0" +tree_hash_derive = "0.8.0" trin-beacon = { path = "trin-beacon" } trin-execution = { path = "trin-execution" } trin-history = { path = "trin-history" } diff --git a/ethportal-api/Cargo.toml b/ethportal-api/Cargo.toml index aa1791c9e..f00df6a1c 100644 --- a/ethportal-api/Cargo.toml +++ b/ethportal-api/Cargo.toml @@ -22,8 +22,8 @@ clap.workspace = true const_format = {version = "0.2.0", features = ["rust_1_64"]} discv5.workspace = true eth_trie.workspace = true -ethereum_hashing = "0.6.0" -ethereum_serde_utils = "0.5.2" +ethereum_hashing = "0.7.0" +ethereum_serde_utils = "0.7.0" ethereum_ssz.workspace = true ethereum_ssz_derive.workspace = true hex.workspace = true diff --git a/ethportal-api/src/types/execution/header.rs b/ethportal-api/src/types/execution/header.rs index 1bc6599b4..b03b42b4d 100644 --- a/ethportal-api/src/types/execution/header.rs +++ b/ethportal-api/src/types/execution/header.rs @@ -229,7 +229,7 @@ impl PartialEq for Header { /// RpcHeader is a field in reth's `Block` RPC type used in eth_getBlockByHash, for example. impl From
for RpcHeader { fn from(header: Header) -> Self { - let hash = Some(header.hash().0.into()); + let hash = header.hash(); let Header { parent_hash, uncles_hash, @@ -262,20 +262,21 @@ impl From
for RpcHeader { receipts_root, logs_bloom, difficulty, - number: Some(U256::from(number)), - gas_limit, - gas_used, - timestamp: U256::from(timestamp), + number, + gas_limit: gas_limit.to(), + gas_used: gas_used.to(), + timestamp, extra_data: extra_data.into(), mix_hash, nonce, - base_fee_per_gas, + base_fee_per_gas: base_fee_per_gas.map(|v| v.to()), withdrawals_root, - blob_gas_used, - excess_blob_gas, + blob_gas_used: blob_gas_used.map(|v| v.to()), + excess_blob_gas: excess_blob_gas.map(|v| v.to()), hash, parent_beacon_block_root: parent_beacon_block_root.map(|h264| h264.0.into()), total_difficulty: Some(difficulty), + requests_root: None, } } } diff --git a/ethportal-api/src/types/state_trie/trie_traversal.rs b/ethportal-api/src/types/state_trie/trie_traversal.rs index c9c06a0d2..524f6ebb5 100644 --- a/ethportal-api/src/types/state_trie/trie_traversal.rs +++ b/ethportal-api/src/types/state_trie/trie_traversal.rs @@ -115,6 +115,7 @@ impl NodeTraversal for Node { mod tests { use std::array; + use alloy_primitives::B256; use eth_trie::{nibbles::Nibbles, node::empty_children}; use rstest::rstest; diff --git a/portal-bridge/Cargo.toml b/portal-bridge/Cargo.toml index 923def8d5..d80f30b93 100644 --- a/portal-bridge/Cargo.toml +++ b/portal-bridge/Cargo.toml @@ -12,7 +12,6 @@ authors = ["https://github.com/ethereum/trin/graphs/contributors"] [dependencies] -alloy-consensus.workspace = true alloy-primitives.workspace = true alloy-rlp.workspace = true anyhow.workspace = true diff --git a/rpc/src/eth_rpc.rs b/rpc/src/eth_rpc.rs index 20dcfcab0..3145edc63 100644 --- a/rpc/src/eth_rpc.rs +++ b/rpc/src/eth_rpc.rs @@ -1,7 +1,7 @@ use alloy_primitives::{keccak256, Address, Bytes, B256, U256}; use alloy_rlp::Decodable; use eth_trie::node::Node; -use reth_rpc_types::{other::OtherFields, Block, BlockId, BlockTransactions}; +use reth_rpc_types::{Block, BlockId, BlockTransactions}; use tokio::sync::mpsc; use ethportal_api::{ @@ -85,7 +85,6 @@ impl EthApiServer for EthApi { transactions, uncles: vec![], size: None, - other: OtherFields::default(), withdrawals: None, }; Ok(block) diff --git a/trin-execution/Cargo.toml b/trin-execution/Cargo.toml index fbc6103e3..1ad0a6773 100644 --- a/trin-execution/Cargo.toml +++ b/trin-execution/Cargo.toml @@ -27,7 +27,7 @@ parking_lot.workspace = true prometheus_exporter.workspace = true rayon = "1.10.0" revm.workspace = true -revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "848d568" } +revm-inspectors = "0.6" revm-primitives.workspace = true rocksdb = "0.22.0" serde = { workspace = true, features = ["rc"] } diff --git a/trin-execution/src/storage/evm_db.rs b/trin-execution/src/storage/evm_db.rs index 43465e789..706c83e6c 100644 --- a/trin-execution/src/storage/evm_db.rs +++ b/trin-execution/src/storage/evm_db.rs @@ -1,7 +1,6 @@ use std::sync::Arc; use crate::{config::StateConfig, storage::error::EVMError}; -use alloy_consensus::constants::KECCAK_EMPTY; use alloy_primitives::{Address, B256, U256}; use alloy_rlp::{Decodable, EMPTY_STRING_CODE}; use eth_trie::{EthTrie, RootWithTrieDiff, Trie}; @@ -11,7 +10,7 @@ use ethportal_api::{ use hashbrown::{HashMap as BrownHashMap, HashSet}; use parking_lot::Mutex; use revm::{DatabaseCommit, DatabaseRef}; -use revm_primitives::{keccak256, Account, AccountInfo, Bytecode, HashMap}; +use revm_primitives::{keccak256, Account, AccountInfo, Bytecode, HashMap, KECCAK_EMPTY}; use rocksdb::DB as RocksDB; use super::{ @@ -299,8 +298,8 @@ impl DatabaseRef for EvmDB { } } - fn block_hash_ref(&self, number: U256) -> Result { - match self.db.get(keccak256(B256::from(number)))? { + fn block_hash_ref(&self, number: u64) -> Result { + match self.db.get(keccak256(B256::from(U256::from(number))))? { Some(raw_hash) => Ok(B256::from_slice(&raw_hash)), None => Err(Self::Error::NotFound), } diff --git a/trin-execution/src/transaction.rs b/trin-execution/src/transaction.rs index acd0dfb55..2d43c895e 100644 --- a/trin-execution/src/transaction.rs +++ b/trin-execution/src/transaction.rs @@ -2,7 +2,7 @@ use alloy_primitives::U256; use ethportal_api::types::execution::transaction::{ AccessListTransaction, BlobTransaction, EIP1559Transaction, LegacyTransaction, ToAddress, }; -use revm_primitives::{SpecId, TransactTo, TxEnv}; +use revm_primitives::{AccessListItem, SpecId, TransactTo, TxEnv}; use super::spec_id::get_spec_id; @@ -17,7 +17,7 @@ impl TxEnvModifier for LegacyTransaction { tx_env.gas_priority_fee = None; tx_env.transact_to = match self.to { ToAddress::Exists(to) => TransactTo::Call(to), - ToAddress::Empty => TransactTo::create(), + ToAddress::Empty => TransactTo::Create, }; tx_env.value = self.value; tx_env.data = alloy_primitives::Bytes(self.data.clone()); @@ -40,7 +40,7 @@ impl TxEnvModifier for EIP1559Transaction { tx_env.gas_priority_fee = Some(self.max_priority_fee_per_gas); tx_env.transact_to = match self.to { ToAddress::Exists(to) => TransactTo::Call(to), - ToAddress::Empty => TransactTo::create(), + ToAddress::Empty => TransactTo::Create, }; tx_env.value = self.value; tx_env.data = alloy_primitives::Bytes(self.data.clone()); @@ -50,14 +50,9 @@ impl TxEnvModifier for EIP1559Transaction { .access_list .list .iter() - .map(|l| { - ( - l.address, - l.storage_keys - .iter() - .map(|k| U256::from_be_bytes(k.0)) - .collect(), - ) + .map(|l| AccessListItem { + address: l.address, + storage_keys: l.storage_keys.clone(), }) .collect(); tx_env.blob_hashes.clear(); @@ -72,7 +67,7 @@ impl TxEnvModifier for AccessListTransaction { tx_env.gas_priority_fee = None; tx_env.transact_to = match self.to { ToAddress::Exists(to) => TransactTo::Call(to), - ToAddress::Empty => TransactTo::create(), + ToAddress::Empty => TransactTo::Create, }; tx_env.value = self.value; tx_env.data = alloy_primitives::Bytes(self.data.clone()); @@ -82,14 +77,9 @@ impl TxEnvModifier for AccessListTransaction { .access_list .list .iter() - .map(|l| { - ( - l.address, - l.storage_keys - .iter() - .map(|k| U256::from_be_bytes(k.0)) - .collect(), - ) + .map(|l| AccessListItem { + address: l.address, + storage_keys: l.storage_keys.clone(), }) .collect(); tx_env.blob_hashes.clear(); @@ -104,7 +94,7 @@ impl TxEnvModifier for BlobTransaction { tx_env.gas_priority_fee = Some(self.max_priority_fee_per_gas); tx_env.transact_to = match self.to { ToAddress::Exists(to) => TransactTo::Call(to), - ToAddress::Empty => TransactTo::create(), + ToAddress::Empty => TransactTo::Create, }; tx_env.value = self.value; tx_env.data = alloy_primitives::Bytes(self.data.clone()); @@ -114,14 +104,9 @@ impl TxEnvModifier for BlobTransaction { .access_list .list .iter() - .map(|l| { - ( - l.address, - l.storage_keys - .iter() - .map(|k| U256::from_be_bytes(k.0)) - .collect(), - ) + .map(|l| AccessListItem { + address: l.address, + storage_keys: l.storage_keys.clone(), }) .collect(); tx_env.blob_hashes.clone_from(&self.blob_versioned_hashes);