From 1cf8f6bbce883b0d499b51fdffd1d4875afb07c2 Mon Sep 17 00:00:00 2001 From: eyusufatik Date: Fri, 29 Mar 2024 11:39:38 +0300 Subject: [PATCH] update reth remove alloy-rpc-types and use reth-rpc-types --- Cargo.lock | 555 ++++++++++-------- Cargo.toml | 29 +- crates/ethereum-rpc/Cargo.toml | 2 - crates/evm/Cargo.toml | 1 - crates/evm/src/evm/call.rs | 2 +- crates/evm/src/query.rs | 2 +- crates/evm/src/rpc_helpers/tracing_utils.rs | 2 +- crates/evm/src/tests/call_tests.rs | 4 +- crates/evm/src/tests/queries/basic_queries.rs | 8 +- .../src/tests/queries/estimate_gas_tests.rs | 10 +- .../evm/src/tests/queries/evm_call_tests.rs | 6 +- crates/evm/src/tests/tx_tests.rs | 4 +- crates/sequencer/Cargo.toml | 2 + crates/sequencer/src/db_provider/mod.rs | 13 +- 14 files changed, 351 insertions(+), 289 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 16c31ba98..8728f8742 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,6 +168,17 @@ dependencies = [ "strum 0.26.2", ] +[[package]] +name = "alloy-consensus" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=7e39c85#7e39c85f9f51e6449a8b661f54df0ac213f18639" +dependencies = [ + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=7e39c85)", + "alloy-primitives", + "alloy-rlp", + "sha2 0.10.8", +] + [[package]] name = "alloy-dyn-abi" version = "0.6.4" @@ -189,20 +200,33 @@ dependencies = [ [[package]] name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=9ac2c90#9ac2c90d58a9994d4b61c879e33c6af2739a2b4f" +source = "git+https://github.com/alloy-rs/alloy?rev=410850b#410850b305a28297483d819b669b04ba31796359" dependencies = [ "alloy-primitives", "alloy-rlp", - "thiserror", + "serde", +] + +[[package]] +name = "alloy-eips" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=7e39c85#7e39c85f9f51e6449a8b661f54df0ac213f18639" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=7e39c85)", + "c-kzg", + "once_cell", + "serde", ] [[package]] name = "alloy-genesis" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=9ac2c90#9ac2c90d58a9994d4b61c879e33c6af2739a2b4f" +source = "git+https://github.com/alloy-rs/alloy?rev=410850b#410850b305a28297483d819b669b04ba31796359" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", "serde", ] @@ -270,11 +294,12 @@ dependencies = [ [[package]] name = "alloy-rpc-engine-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=9ac2c90#9ac2c90d58a9994d4b61c879e33c6af2739a2b4f" +source = "git+https://github.com/alloy-rs/alloy?rev=410850b#410850b305a28297483d819b669b04ba31796359" dependencies = [ "alloy-primitives", "alloy-rlp", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", "jsonrpsee-types 0.20.3", "serde", "thiserror", @@ -283,10 +308,23 @@ dependencies = [ [[package]] name = "alloy-rpc-trace-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=9ac2c90#9ac2c90d58a9994d4b61c879e33c6af2739a2b4f" +source = "git+https://github.com/alloy-rs/alloy?rev=410850b#410850b305a28297483d819b669b04ba31796359" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-rpc-trace-types" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=7e39c85#7e39c85f9f51e6449a8b661f54df0ac213f18639" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=7e39c85)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=7e39c85)", "serde", "serde_json", ] @@ -294,10 +332,11 @@ dependencies = [ [[package]] name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=9ac2c90#9ac2c90d58a9994d4b61c879e33c6af2739a2b4f" +source = "git+https://github.com/alloy-rs/alloy?rev=410850b#410850b305a28297483d819b669b04ba31796359" dependencies = [ "alloy-primitives", "alloy-rlp", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", "arbitrary", "itertools 0.12.1", "jsonrpsee-types 0.20.3", @@ -308,6 +347,42 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-rpc-types" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=7e39c85#7e39c85f9f51e6449a8b661f54df0ac213f18639" +dependencies = [ + "alloy-consensus", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=7e39c85)", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=7e39c85)", + "itertools 0.12.1", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "alloy-serde" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=410850b#410850b305a28297483d819b669b04ba31796359" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=7e39c85#7e39c85f9f51e6449a8b661f54df0ac213f18639" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + [[package]] name = "alloy-sol-macro" version = "0.6.4" @@ -1293,9 +1368,9 @@ dependencies = [ [[package]] name = "boa_ast" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73498e9b2f0aa7db74977afa4d594657611e90587abf0dd564c0b55b4a130163" +checksum = "5b6fb81ca0f301f33aff7401e2ffab37dc9e0e4a1cf0ccf6b34f4d9e60aa0682" dependencies = [ "bitflags 2.5.0", "boa_interner", @@ -1307,30 +1382,35 @@ dependencies = [ [[package]] name = "boa_engine" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16377479d5d6d33896e7acdd1cc698d04a8f72004025bbbddf47558cd29146a6" +checksum = "600e4e4a65b26efcef08a7b1cf2899d3845a32e82e067ee3b75eaf7e413ff31c" dependencies = [ + "arrayvec 0.7.4", "bitflags 2.5.0", "boa_ast", "boa_gc", - "boa_icu_provider", "boa_interner", "boa_macros", "boa_parser", "boa_profiler", - "chrono", + "bytemuck", + "cfg-if", "dashmap", "fast-float", + "hashbrown 0.14.3", "icu_normalizer", "indexmap 2.2.6", - "itertools 0.11.0", + "intrusive-collections", + "itertools 0.12.1", "num-bigint 0.4.4", "num-integer", "num-traits", - "num_enum 0.6.1", + "num_enum 0.7.2", "once_cell", + "paste", "pollster", + "portable-atomic", "rand 0.8.5", "regress", "rustc-hash", @@ -1342,39 +1422,26 @@ dependencies = [ "tap", "thin-vec", "thiserror", + "time", ] [[package]] name = "boa_gc" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97b44beaef9d4452342d117d94607fdfa8d474280f1ba0fd97853834e3a49b2" +checksum = "c055ef3cd87ea7db014779195bc90c6adfc35de4902e3b2fe587adecbd384578" dependencies = [ "boa_macros", "boa_profiler", + "hashbrown 0.14.3", "thin-vec", ] -[[package]] -name = "boa_icu_provider" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30e52e34e451dd0bfc2c654a9a43ed34b0073dbd4ae3394b40313edda8627aa" -dependencies = [ - "icu_collections", - "icu_normalizer", - "icu_properties", - "icu_provider", - "icu_provider_adapters", - "icu_provider_blob", - "once_cell", -] - [[package]] name = "boa_interner" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e5afa991908cfbe79bd3109b824e473a1dc5f74f31fab91bb44c9e245daa77" +checksum = "0cacc9caf022d92195c827a3e5bf83f96089d4bfaff834b359ac7b6be46e9187" dependencies = [ "boa_gc", "boa_macros", @@ -1388,9 +1455,9 @@ dependencies = [ [[package]] name = "boa_macros" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "005fa0c5bd20805466dda55eb34cd709bb31a2592bb26927b47714eeed6914d8" +checksum = "6be9c93793b60dac381af475b98634d4b451e28336e72218cad9a20176218dbc" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", @@ -1400,34 +1467,28 @@ dependencies = [ [[package]] name = "boa_parser" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e09afb035377a9044443b598187a7d34cd13164617182a4d7c348522ee3f052" +checksum = "9e8592556849f0619ed142ce2b3a19086769314a8d657f93a5765d06dbce4818" dependencies = [ "bitflags 2.5.0", "boa_ast", - "boa_icu_provider", "boa_interner", "boa_macros", "boa_profiler", "fast-float", - "icu_locid", "icu_properties", - "icu_provider", - "icu_provider_macros", "num-bigint 0.4.4", "num-traits", - "once_cell", "regress", "rustc-hash", - "tinystr", ] [[package]] name = "boa_profiler" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190f92dfe48224adc92881c620f08ccf37ff62b91a094bb357fe53bd5e84647" +checksum = "e0d8372f2d5cbac600a260de87877141b42da1e18d2c7a08ccb493a49cbd55c0" [[package]] name = "bonsai-sdk" @@ -1611,9 +1672,9 @@ dependencies = [ [[package]] name = "c-kzg" -version = "0.4.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a4bc5367b6284358d2a6a6a1dc2d92ec4b86034561c3b9d3341909752fd848" +checksum = "3130f3d8717cc02e668a896af24984d5d5d4e8bf12e278e982e0f1bd88a0f9af" dependencies = [ "blst", "cc", @@ -1896,7 +1957,6 @@ version = "0.3.0" dependencies = [ "alloy-primitives", "alloy-rlp", - "alloy-rpc-types", "alloy-sol-types", "anyhow", "borsh", @@ -1922,7 +1982,7 @@ dependencies = [ "reth-rpc-types", "reth-rpc-types-compat", "revm", - "revm-inspectors 0.1.0 (git+https://github.com/paradigmxyz/evm-inspectors?rev=d7317c7)", + "revm-inspectors 0.1.0 (git+https://github.com/paradigmxyz/evm-inspectors?rev=0ad0338)", "schemars", "secp256k1 0.27.0", "serde", @@ -1959,6 +2019,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "reth-trie", + "revm", "rs_merkle", "schnellru", "serde", @@ -3427,7 +3488,6 @@ dependencies = [ name = "ethereum-rpc" version = "0.3.0" dependencies = [ - "alloy-rpc-types", "anyhow", "borsh", "citrea-evm", @@ -4711,12 +4771,11 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8302d8dfd6044d3ddb3f807a5ef3d7bbca9a574959c6d6e4dc39aa7012d0d5" +checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" dependencies = [ "displaydoc", - "serde", "yoke", "zerofrom", "zerovec", @@ -4724,29 +4783,48 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335" +checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" dependencies = [ "displaydoc", "litemap", - "serde", "tinystr", "writeable", "zerovec", ] +[[package]] +name = "icu_locid_transform" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" + [[package]] name = "icu_normalizer" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "652869735c9fb9f5a64ba180ee16f2c848390469c116deef517ecc53f4343598" +checksum = "c183e31ed700f1ecd6b032d104c52fe8b15d028956b73727c97ec176b170e187" dependencies = [ "displaydoc", "icu_collections", + "icu_normalizer_data", "icu_properties", "icu_provider", - "serde", "smallvec 1.13.2", "utf16_iter", "utf8_iter", @@ -4754,75 +4832,59 @@ dependencies = [ "zerovec", ] +[[package]] +name = "icu_normalizer_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22026918a80e6a9a330cb01b60f950e2b4e5284c59528fd0c6150076ef4c8522" + [[package]] name = "icu_properties" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0e1aa26851f16c9e04412a5911c86b7f8768dac8f8d4c5f1c568a7e5d7a434" +checksum = "976e296217453af983efa25f287a4c1da04b9a63bf1ed63719455068e4453eb5" dependencies = [ "displaydoc", "icu_collections", + "icu_locid_transform", + "icu_properties_data", "icu_provider", - "serde", "tinystr", "zerovec", ] +[[package]] +name = "icu_properties_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6a86c0e384532b06b6c104814f9c1b13bcd5b64409001c0d05713a1f3529d99" + [[package]] name = "icu_provider" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305" +checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" dependencies = [ "displaydoc", "icu_locid", "icu_provider_macros", - "postcard", - "serde", "stable_deref_trait", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_adapters" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3" -dependencies = [ - "icu_locid", - "icu_provider", - "serde", "tinystr", - "yoke", - "zerovec", -] - -[[package]] -name = "icu_provider_blob" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd364c9a01f791a4bc04a74cf2a1d01d9f6926a40fd5ae1c28004e1e70d8338b" -dependencies = [ - "icu_provider", - "postcard", - "serde", "writeable", "yoke", + "zerofrom", "zerovec", ] [[package]] name = "icu_provider_macros" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10" +checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.55", ] [[package]] @@ -5041,6 +5103,15 @@ dependencies = [ "tempfile", ] +[[package]] +name = "intrusive-collections" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b694dc9f70c3bda874626d2aed13b780f137aab435f4e9814121955cf706122e" +dependencies = [ + "memoffset 0.9.1", +] + [[package]] name = "inventory" version = "0.3.15" @@ -5943,6 +6014,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + [[package]] name = "memory-db" version = "0.32.0" @@ -6361,15 +6441,6 @@ dependencies = [ "num_enum_derive 0.5.11", ] -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - [[package]] name = "num_enum" version = "0.7.2" @@ -6393,26 +6464,23 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 2.0.2", "proc-macro2 1.0.79", "quote 1.0.35", "syn 2.0.55", ] [[package]] -name = "num_enum_derive" -version = "0.7.2" +name = "num_threads" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ - "proc-macro-crate 2.0.2", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.55", + "libc", ] [[package]] @@ -6457,10 +6525,6 @@ name = "once_cell" version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -dependencies = [ - "critical-section", - "portable-atomic", -] [[package]] name = "oorandom" @@ -7562,11 +7626,11 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "regress" -version = "0.6.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a9ecfa0cb04d0b04dddb99b8ccf4f66bc8dfd23df694b398570bd8ae3a50fb" +checksum = "d06f9a1f7cd8473611ba1a480cf35f9c5cffc2954336ba90a982fdb7e7d7f51e" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.3", "memchr", ] @@ -7632,8 +7696,8 @@ checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" [[package]] name = "reth-beacon-consensus" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "futures", "metrics", @@ -7661,8 +7725,8 @@ dependencies = [ [[package]] name = "reth-beacon-consensus-core" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "reth-consensus-common", "reth-interfaces", @@ -7671,8 +7735,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-primitives", "bytes", @@ -7681,8 +7745,8 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "convert_case 0.6.0", "proc-macro2 1.0.79", @@ -7692,8 +7756,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "humantime-serde", "reth-discv4", @@ -7706,8 +7770,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "reth-interfaces", "reth-primitives", @@ -7716,8 +7780,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "arbitrary", "bytes", @@ -7747,8 +7811,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-rlp", "discv5", @@ -7769,8 +7833,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-rlp", "data-encoding", @@ -7792,8 +7856,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -7824,8 +7888,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-chains", "alloy-rlp", @@ -7850,8 +7914,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-chains", "alloy-primitives", @@ -7866,8 +7930,8 @@ dependencies = [ [[package]] name = "reth-etl" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "rayon", "reth-db", @@ -7876,8 +7940,8 @@ dependencies = [ [[package]] name = "reth-interfaces" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "auto_impl", "futures", @@ -7892,8 +7956,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -7910,8 +7974,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "bindgen 0.69.4", "cc", @@ -7920,8 +7984,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "futures", "metrics", @@ -7932,8 +7996,8 @@ dependencies = [ [[package]] name = "reth-metrics-derive" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "once_cell", "proc-macro2 1.0.79", @@ -7944,8 +8008,8 @@ dependencies = [ [[package]] name = "reth-net-common" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "pin-project", "reth-primitives", @@ -7954,8 +8018,8 @@ dependencies = [ [[package]] name = "reth-net-nat" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "igd-next", "pin-project-lite", @@ -7968,8 +8032,8 @@ dependencies = [ [[package]] name = "reth-network" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-rlp", "aquamarine", @@ -8014,8 +8078,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-chains", "reth-discv4", @@ -8029,8 +8093,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "anyhow", "bincode", @@ -8049,8 +8113,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -8062,8 +8126,8 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-rlp", "futures-util", @@ -8086,8 +8150,8 @@ dependencies = [ [[package]] name = "reth-payload-validator" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -8096,11 +8160,11 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-chains", - "alloy-eips", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", "alloy-genesis", "alloy-primitives", "alloy-rlp", @@ -8111,6 +8175,7 @@ dependencies = [ "c-kzg", "cfg-if", "derive_more", + "enr", "itertools 0.12.1", "modular-bitfield", "nybbles", @@ -8127,6 +8192,7 @@ dependencies = [ "secp256k1 0.27.0", "serde", "serde_json", + "serde_with", "sha2 0.10.8", "strum 0.26.2", "tempfile", @@ -8136,8 +8202,8 @@ dependencies = [ [[package]] name = "reth-provider" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-rlp", "auto_impl", @@ -8164,8 +8230,8 @@ dependencies = [ [[package]] name = "reth-prune" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "itertools 0.12.1", "metrics", @@ -8184,8 +8250,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "reth-consensus-common", "reth-interfaces", @@ -8193,14 +8259,14 @@ dependencies = [ "reth-primitives", "reth-provider", "revm", - "revm-inspectors 0.1.0 (git+https://github.com/paradigmxyz/evm-inspectors?rev=1f935e7)", + "revm-inspectors 0.1.0 (git+https://github.com/paradigmxyz/evm-inspectors?rev=b3082f3)", "tracing", ] [[package]] name = "reth-rpc" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -8236,7 +8302,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "revm", - "revm-inspectors 0.1.0 (git+https://github.com/paradigmxyz/evm-inspectors?rev=1f935e7)", + "revm-inspectors 0.1.0 (git+https://github.com/paradigmxyz/evm-inspectors?rev=b3082f3)", "revm-primitives", "schnellru", "secp256k1 0.27.0", @@ -8252,8 +8318,8 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "jsonrpsee 0.20.3", "reth-node-api", @@ -8264,8 +8330,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "async-trait", "jsonrpsee-core 0.20.3", @@ -8290,14 +8356,15 @@ dependencies = [ [[package]] name = "reth-rpc-types" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ + "alloy-genesis", "alloy-primitives", "alloy-rlp", "alloy-rpc-engine-types", - "alloy-rpc-trace-types", - "alloy-rpc-types", + "alloy-rpc-trace-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", "arbitrary", "jsonrpsee-types 0.20.3", "proptest", @@ -8312,19 +8379,19 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-rlp", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", "reth-primitives", "reth-rpc-types", ] [[package]] name = "reth-stages" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "aquamarine", "auto_impl", @@ -8353,9 +8420,10 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ + "parking_lot 0.12.1", "rayon", "reth-db", "reth-interfaces", @@ -8369,8 +8437,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "dyn-clone", "futures-util", @@ -8386,8 +8454,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "tokio", "tokio-stream", @@ -8395,8 +8463,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "clap 4.5.4", "eyre", @@ -8410,8 +8478,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-rlp", "aquamarine", @@ -8441,8 +8509,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "0.2.0-beta.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.2#28f3a2e2d9525bf2f6373e755e2d6dc0c2f97821" +version = "0.2.0-beta.4" +source = "git+https://github.com/paradigmxyz/reth?tag=v0.2.0-beta.4#c04dbe6e9bd05be5da3a5d541adbf76166c14a08" dependencies = [ "alloy-chains", "alloy-rlp", @@ -8460,9 +8528,9 @@ dependencies = [ [[package]] name = "revm" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217d21144d329f21d5245b8e6a46e0d6d0a527d9917d7a087f225b161e529169" +checksum = "24fd3ed4b62dc61c647552d8b781811ae25ec74d23309055077e4dfb392444d2" dependencies = [ "auto_impl", "cfg-if", @@ -8476,15 +8544,13 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=1f935e7#1f935e71849466c297a64df0b162e6ffd48da25b" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=0ad0338#0ad033820ff216f854ba08515f6f37ac71aa15d8" dependencies = [ "alloy-primitives", - "alloy-rpc-trace-types", - "alloy-rpc-types", + "alloy-rpc-trace-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=7e39c85)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=7e39c85)", "alloy-sol-types", "anstyle", - "boa_engine", - "boa_gc", "colorchoice", "revm", "serde_json", @@ -8494,13 +8560,15 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=d7317c7#d7317c7fbf38d5e5df2393beee0414c987ea440a" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=b3082f3#b3082f3deca76e721ac72cee4a6857b4ff88e684" dependencies = [ "alloy-primitives", - "alloy-rpc-trace-types", - "alloy-rpc-types", + "alloy-rpc-trace-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=410850b)", "alloy-sol-types", "anstyle", + "boa_engine", + "boa_gc", "colorchoice", "revm", "serde_json", @@ -8509,9 +8577,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "776848391ed76d5103ca1aa1632cd21b521e2870afb30b63723da862d69efd0f" +checksum = "9f0a1818f8c876b0d71a0714217c34da7df8a42c0462750768779d55680e4554" dependencies = [ "revm-primitives", "serde", @@ -8519,9 +8587,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3fd1856a7cb09197a02669d779e1afb5a627b0888a24814ba2b6a1ad4c3ff8d" +checksum = "7a9645a70f1df1e5bd7fa8718b9ba486fac9c3f0467aa6b58e7f590d5f6fd0f7" dependencies = [ "aurora-engine-modexp", "c-kzg", @@ -8536,9 +8604,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4d7d3e793e907dc0797a9d3b43abfdf5226d133855214db9bd27d4cee33ebd" +checksum = "323ad597cf75ac9cb1d161be29fcc3562426f0278a1d04741697fca556e1ceea" dependencies = [ "alloy-primitives", "auto_impl", @@ -9090,9 +9158,9 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "ryu-js" -version = "0.2.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6518fc26bced4d53678a22d6e423e9d8716377def84545fe328236e3af070e7f" +checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5" [[package]] name = "salsa20" @@ -11839,7 +11907,10 @@ checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "js-sys", + "libc", "num-conv", + "num_threads", "powerfmt", "serde", "time-core", @@ -11892,12 +11963,11 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8faa444297615a4e020acb64146b0603c9c395c03a97c17fd9028816d3b4d63e" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" dependencies = [ "displaydoc", - "serde", "zerovec", ] @@ -12951,7 +13021,7 @@ dependencies = [ "log", "mach", "memfd", - "memoffset", + "memoffset 0.8.0", "paste", "rand 0.8.5", "rustix 0.36.17", @@ -13469,11 +13539,10 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.9.6" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "591691014119b87047ead4dcf3e6adfbf73cb7c38ab6980d4f18a32138f35d46" +checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" dependencies = [ - "serde", "yoke", "zerofrom", "zerovec-derive", @@ -13481,9 +13550,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.9.6" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4a1638a1934450809c2266a70362bfc96cd90550c073f5b8a55014d1010157" +checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", diff --git a/Cargo.toml b/Cargo.toml index 21091dfdb..9345a3653 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -132,26 +132,23 @@ ethers-providers = { version = "2.0", default-features = false } ethers-signers = { version = "2.0", default-features = false } ethers-middleware = { version = "2.0", default-features = false } -reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -reth-interfaces = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.2" } -revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "d7317c7" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +reth-interfaces = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.4" } +revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "0ad0338" } -revm = { version = "7.1.0", features = [ +revm = { version = "7.2.0", features = [ "std", "secp256k1", ], default-features = false } -alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "9ac2c90", features = [ - "jsonrpsee-types", -] } alloy-primitives = "0.6" alloy-sol-types = "0.6" secp256k1 = { version = "0.27.0", default-features = false, features = [ diff --git a/crates/ethereum-rpc/Cargo.toml b/crates/ethereum-rpc/Cargo.toml index a8766d06b..7695a3668 100644 --- a/crates/ethereum-rpc/Cargo.toml +++ b/crates/ethereum-rpc/Cargo.toml @@ -27,8 +27,6 @@ reth-primitives = { workspace = true } reth-rpc-types = { workspace = true } reth-rpc-types-compat = { workspace = true } -alloy-rpc-types = { workspace = true } - ethers = { workspace = true } tokio = { workspace = true } schnellru = "0.2.1" diff --git a/crates/evm/Cargo.toml b/crates/evm/Cargo.toml index 4aae72c7e..06b76252d 100644 --- a/crates/evm/Cargo.toml +++ b/crates/evm/Cargo.toml @@ -43,7 +43,6 @@ ethers = { workspace = true } alloy-primitives = { workspace = true, features = ["rand", "rlp", "serde"] } alloy-sol-types = { workspace = true } -alloy-rpc-types = { workspace = true } alloy-rlp = { workspace = true } revm = { workspace = true, features = [ "optional_block_gas_limit", diff --git a/crates/evm/src/evm/call.rs b/crates/evm/src/evm/call.rs index b71d4c734..47522d05d 100644 --- a/crates/evm/src/evm/call.rs +++ b/crates/evm/src/evm/call.rs @@ -216,7 +216,7 @@ pub(crate) fn prepare_call_env( transact_to: to.map(TransactTo::Call).unwrap_or_else(TransactTo::create), value: value.unwrap_or_default(), data: input.try_into_unique_input()?.unwrap_or_default(), - chain_id: chain_id.map(|c| c.to::()), + chain_id, access_list: access_list .map(reth_rpc_types::AccessList::into_flattened) .unwrap_or_default(), diff --git a/crates/evm/src/query.rs b/crates/evm/src/query.rs index 5c2dc18a7..07d801e2e 100644 --- a/crates/evm/src/query.rs +++ b/crates/evm/src/query.rs @@ -10,6 +10,7 @@ use reth_primitives::TransactionKind::{Call, Create}; use reth_primitives::{ Block, BlockId, BlockNumberOrTag, SealedHeader, TransactionSignedEcRecovered, U128, U256, U64, }; +use reth_revm::access_list::AccessListInspector; use reth_revm::tracing::{TracingInspector, TracingInspectorConfig}; use reth_rpc_types::other::OtherFields; use reth_rpc_types::trace::geth::{GethDebugTracingOptions, GethTrace}; @@ -20,7 +21,6 @@ use revm::primitives::{ TxEnv, KECCAK_EMPTY, }; use revm::{Database, DatabaseCommit}; -use revm_inspectors::access_list::AccessListInspector; use sov_modules_api::macros::rpc_gen; use sov_modules_api::prelude::*; use sov_modules_api::WorkingSet; diff --git a/crates/evm/src/rpc_helpers/tracing_utils.rs b/crates/evm/src/rpc_helpers/tracing_utils.rs index 3a5ef4c58..74eeee8c5 100644 --- a/crates/evm/src/rpc_helpers/tracing_utils.rs +++ b/crates/evm/src/rpc_helpers/tracing_utils.rs @@ -1,6 +1,7 @@ use reth_primitives::revm::env::{fill_tx_env, fill_tx_env_with_recovered}; use reth_primitives::revm_primitives::TxEnv; use reth_primitives::{TransactionSigned, TransactionSignedEcRecovered, TxHash, U256}; +use reth_revm::tracing::{FourByteInspector, TracingInspector, TracingInspectorConfig}; use reth_rpc_types::trace::geth::{ FourByteFrame, GethDebugBuiltInTracerType, GethDebugTracerType, GethDebugTracingOptions, GethTrace, NoopFrame, @@ -9,7 +10,6 @@ use revm::precompile::{PrecompileSpecId, Precompiles}; use revm::primitives::db::Database; use revm::primitives::{Address, BlockEnv, CfgEnvWithHandlerCfg, EVMError, ResultAndState, SpecId}; use revm::{inspector_handle_register, Inspector}; -use revm_inspectors::tracing::{FourByteInspector, TracingInspector, TracingInspectorConfig}; use crate::error::rpc::{EthApiError, EthResult}; use crate::evm::db::EvmDb; diff --git a/crates/evm/src/tests/call_tests.rs b/crates/evm/src/tests/call_tests.rs index 99527b337..ddb4b4aa7 100644 --- a/crates/evm/src/tests/call_tests.rs +++ b/crates/evm/src/tests/call_tests.rs @@ -1,8 +1,8 @@ use std::str::FromStr; -use alloy_rpc_types::request::{TransactionInput, TransactionRequest}; use reth_primitives::constants::ETHEREUM_BLOCK_GAS_LIMIT; use reth_primitives::{Address, BlockNumberOrTag, Bytes, TransactionKind, U64}; +use reth_rpc_types::request::{TransactionInput, TransactionRequest}; use revm::primitives::{SpecId, KECCAK_EMPTY, U256}; use sov_modules_api::default_context::DefaultContext; use sov_modules_api::utils::generate_address; @@ -438,7 +438,7 @@ fn test_block_hash_in_evm() { ), }, nonce: Some(U64::from(0u64)), - chain_id: Some(U64::from(DEFAULT_CHAIN_ID)), + chain_id: Some(DEFAULT_CHAIN_ID), access_list: None, max_fee_per_blob_gas: None, blob_versioned_hashes: None, diff --git a/crates/evm/src/tests/queries/basic_queries.rs b/crates/evm/src/tests/queries/basic_queries.rs index c354886be..d7b6b3c4c 100644 --- a/crates/evm/src/tests/queries/basic_queries.rs +++ b/crates/evm/src/tests/queries/basic_queries.rs @@ -2,9 +2,9 @@ use std::collections::BTreeMap; use std::str::FromStr; use alloy_primitives::FixedBytes; -use alloy_rpc_types::request::{TransactionInput, TransactionRequest}; use hex::FromHex; use reth_primitives::{Address, BlockId, BlockNumberOrTag, U64}; +use reth_rpc_types::request::{TransactionInput, TransactionRequest}; use reth_rpc_types::{Block, Rich, TransactionReceipt}; use revm::primitives::{B256, U256}; use serde_json::json; @@ -204,7 +204,7 @@ fn call_test() { value: Some(U256::from(100000000)), input: None.into(), nonce: Some(U64::from(7)), - chain_id: Some(U64::from(1u64)), + chain_id: Some(1u64), access_list: None, max_fee_per_blob_gas: None, blob_versioned_hashes: None, @@ -235,7 +235,7 @@ fn call_test() { value: Some(U256::from(100000000)), input: TransactionInput::new(alloy_primitives::Bytes::from_str(&call_data).unwrap()), nonce: Some(U64::from(7)), - chain_id: Some(U64::from(1u64)), + chain_id: Some(1u64), access_list: None, max_fee_per_blob_gas: None, blob_versioned_hashes: None, @@ -266,7 +266,7 @@ fn call_test() { alloy_primitives::Bytes::from_str(&call_data).unwrap(), ), nonce: None, - chain_id: Some(U64::from(1u64)), + chain_id: Some(1u64), access_list: None, max_fee_per_blob_gas: None, blob_versioned_hashes: None, diff --git a/crates/evm/src/tests/queries/estimate_gas_tests.rs b/crates/evm/src/tests/queries/estimate_gas_tests.rs index 7fd3382e3..ee1e665be 100644 --- a/crates/evm/src/tests/queries/estimate_gas_tests.rs +++ b/crates/evm/src/tests/queries/estimate_gas_tests.rs @@ -1,12 +1,12 @@ use std::str::FromStr; use alloy_primitives::{FixedBytes, Uint}; -use alloy_rpc_types::request::{TransactionInput, TransactionRequest}; use hex::FromHex; use jsonrpsee::core::RpcResult; use reth_primitives::hex::ToHexExt; use reth_primitives::{AccessList, AccessListItem, Address, BlockNumberOrTag, Bytes, U64}; use reth_rpc::eth::error::RpcInvalidTransactionError; +use reth_rpc_types::request::{TransactionInput, TransactionRequest}; use reth_rpc_types::AccessListWithGasUsed; use revm::primitives::U256; use sov_modules_api::default_context::DefaultContext; @@ -36,7 +36,7 @@ fn payable_contract_value_test() { data: None, }, nonce: Some(U64::from(1)), - chain_id: Some(U64::from(1u64)), + chain_id: Some(1u64), access_list: None, max_fee_per_blob_gas: None, blob_versioned_hashes: None, @@ -66,7 +66,7 @@ fn test_tx_request_fields_gas() { data: None, }, nonce: Some(U64::from(1)), - chain_id: Some(U64::from(1u64)), + chain_id: Some(1u64), access_list: None, max_fee_per_blob_gas: None, blob_versioned_hashes: None, @@ -161,7 +161,7 @@ fn test_tx_request_fields_gas() { working_set.unset_archival_version(); let tx_req_invalid_chain_id = TransactionRequest { - chain_id: Some(U64::from(3u64)), + chain_id: Some(3u64), ..tx_req_contract_call.clone() }; @@ -297,7 +297,7 @@ fn test_access_list() { value: None, input: TransactionInput::new(input_data), nonce: Some(U64::from(3)), - chain_id: Some(U64::from(1u64)), + chain_id: Some(1u64), access_list: None, max_fee_per_blob_gas: None, blob_versioned_hashes: None, diff --git a/crates/evm/src/tests/queries/evm_call_tests.rs b/crates/evm/src/tests/queries/evm_call_tests.rs index a69299710..a6480ab14 100644 --- a/crates/evm/src/tests/queries/evm_call_tests.rs +++ b/crates/evm/src/tests/queries/evm_call_tests.rs @@ -1,10 +1,10 @@ use std::str::FromStr; -use alloy_rpc_types::request::{TransactionInput, TransactionRequest}; use hex::FromHex; use jsonrpsee::core::RpcResult; use reth_primitives::{Address, BlockNumberOrTag, Bytes, U64}; use reth_rpc::eth::error::RpcInvalidTransactionError; +use reth_rpc_types::request::{TransactionInput, TransactionRequest}; use revm::primitives::U256; use sov_modules_api::WorkingSet; @@ -333,7 +333,7 @@ fn eth_call_eip1559( value: None, input: TransactionInput::new(contract.get_call_data().to_vec().into()), nonce: Some(U64::from(9)), - chain_id: Some(U64::from(1u64)), + chain_id: Some(1u64), ..Default::default() }; @@ -357,7 +357,7 @@ fn gas_price_call_test() { value: Some(U256::from(1000)), input: None.into(), nonce: Some(U64::from(1u64)), - chain_id: Some(U64::from(1u64)), + chain_id: Some(1u64), access_list: None, max_fee_per_blob_gas: None, blob_versioned_hashes: None, diff --git a/crates/evm/src/tests/tx_tests.rs b/crates/evm/src/tests/tx_tests.rs index f60fee0c8..1f40f26e1 100644 --- a/crates/evm/src/tests/tx_tests.rs +++ b/crates/evm/src/tests/tx_tests.rs @@ -1,11 +1,11 @@ use std::str::FromStr; -use alloy_rpc_types::request::{TransactionInput, TransactionRequest}; use ethers_core::types::transaction::eip2718::TypedTransaction; use ethers_core::types::{Bytes, Eip1559TransactionRequest}; use ethers_core::utils::rlp::Rlp; use ethers_signers::{LocalWallet, Signer}; use reth_primitives::{Address, TransactionSignedEcRecovered, U256, U64, U8}; +use reth_rpc_types::request::{TransactionInput, TransactionRequest}; use revm::primitives::{TransactTo, TxEnv}; use crate::evm::prepare_call_env; @@ -83,7 +83,7 @@ fn prepare_call_env_conversion() { value: Some(U256::from(300u64)), input: TransactionInput::default(), nonce: Some(U64::from(1u64)), - chain_id: Some(U64::from(1u64)), + chain_id: Some(1u64), access_list: None, transaction_type: Some(U8::from(2u8)), blob_versioned_hashes: None, diff --git a/crates/sequencer/Cargo.toml b/crates/sequencer/Cargo.toml index 9984de5b2..f6d8f1922 100644 --- a/crates/sequencer/Cargo.toml +++ b/crates/sequencer/Cargo.toml @@ -35,6 +35,8 @@ reth-db = { workspace = true } reth-trie = { workspace = true } reth-rpc-types-compat = { workspace = true } +revm = { workspace = true } + ethers = { workspace = true } tokio = { workspace = true } schnellru = "0.2.1" diff --git a/crates/sequencer/src/db_provider/mod.rs b/crates/sequencer/src/db_provider/mod.rs index f67bd8549..7799c80f2 100644 --- a/crates/sequencer/src/db_provider/mod.rs +++ b/crates/sequencer/src/db_provider/mod.rs @@ -7,12 +7,12 @@ use reth_primitives::{ }; use reth_provider::{ AccountReader, BlockHashReader, BlockIdReader, BlockNumReader, BlockReader, BlockReaderIdExt, - BundleStateWithReceipts, ChainSpecProvider, HeaderProvider, ReceiptProvider, - ReceiptProviderIdExt, StateProvider, StateProviderFactory, StateRootProvider, - TransactionsProvider, WithdrawalsProvider, + ChainSpecProvider, HeaderProvider, ReceiptProvider, ReceiptProviderIdExt, StateProvider, + StateProviderFactory, StateRootProvider, TransactionsProvider, WithdrawalsProvider, }; use reth_rpc_types::{Block, BlockTransactions}; use reth_trie::updates::TrieUpdates; +use revm::db::states::bundle_state::BundleState; use sov_modules_api::WorkingSet; #[derive(Clone)] @@ -525,15 +525,12 @@ impl StateProviderFactory for DbProvider { impl StateRootProvider for DbProvider { #[doc = r" Returns the state root of the BundleState on top of the current state."] - fn state_root( - &self, - _bundle_state: &BundleStateWithReceipts, - ) -> ProviderResult { + fn state_root(&self, _bundle_state: &BundleState) -> ProviderResult { unimplemented!("state_root") } fn state_root_with_updates( &self, - _bundle_state: &BundleStateWithReceipts, + _bundle_state: &BundleState, ) -> reth_interfaces::provider::ProviderResult<(reth_primitives::B256, TrieUpdates)> { unimplemented!("state_root_with_updates") }