diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 8e703da7..fcef400a 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -127,12 +127,10 @@ jobs: include: - type: wasm target: wasm32-unknown-unknown - exclude: | - scroll-engine,scroll-wire,scroll-bridge,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer + exclude: scroll-engine,scroll-wire,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,rollup-node - type: riscv target: riscv32imac-unknown-none-elf - exclude: | - scroll-engine,scroll-wire,scroll-bridge,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,scroll-codec + exclude: scroll-engine,scroll-wire,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,rollup-node,scroll-codec steps: - uses: actions/checkout@v4 - uses: rui314/setup-mold@v1 diff --git a/Cargo.lock b/Cargo.lock index 2c2e2cec..d40311e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,9 +114,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-chains" -version = "0.1.64" +version = "0.1.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963fc7ac17f25d92c237448632330eb87b39ba8aa0209d4b517069a05b57db62" +checksum = "f8e42c54af787e3521229df1787d7b8300910dc6d9d04d378eb593b26388bd11" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -129,9 +129,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc8ccab88e40f1fba5d097fecdaa5cd830858aead9b588a8d099e7faf57e97c" +checksum = "6fbf458101ed6c389e9bb70a34ebc56039868ad10472540614816cdedc8f5265" dependencies = [ "alloy-eips", "alloy-primitives", @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc796a6379d3df47b4c42a447bda1871db7f134e8dddc5c724f69206b4b931" +checksum = "fc982af629e511292310fe85b433427fd38cb3105147632b574abc997db44c91" dependencies = [ "alloy-consensus", "alloy-eips", @@ -167,9 +167,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e08c581811006021970bf07f2ecf3213f6237c125f7fd99607004b23627b61" +checksum = "ada55b5ab26624766bb8c65f72516dee93eaf28d5d87fc18ff4324cd8c2a948d" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -229,9 +229,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3321230d9d9813227ad26c8f5c80a74011d629823715c0ab2d1afdea1fc204d" +checksum = "6e86967eb559920e4b9102e4cb825fe30f2e9467988353ce4809f0d3f2c90cd4" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -253,8 +253,9 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/evm?rev=f9ed4d3#f9ed4d335b2e0002e257ead3198eb463a84c5219" +version = "0.1.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40fe575395f20dc9527c2dc65350786492e9723d2035e9f716269b65be34c9c" dependencies = [ "alloy-consensus", "alloy-eips", @@ -262,7 +263,7 @@ dependencies = [ "alloy-primitives", "alloy-sol-types", "auto_impl", - "derive_more 1.0.0", + "derive_more 2.0.1", "op-revm", "revm", "thiserror 2.0.12", @@ -270,9 +271,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b11774716152a5204aff0e86a8c841df499ea81464e2b1f82b3f72d6a2ef32" +checksum = "a40de6f5b53ecf5fd7756072942f41335426d9a3704cd961f77d854739933bcf" dependencies = [ "alloy-eips", "alloy-primitives", @@ -283,8 +284,9 @@ dependencies = [ [[package]] name = "alloy-hardforks" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/hardforks?rev=ae4176c#ae4176c0027171d38832644f63f05f4f80861c6e" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1692158e9d100486fa6c2429edb42680298678ee74644b058c44f8484a278fea" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -296,9 +298,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125601804507fef5ae7debcbf800906b12741f19800c1c05b953d0f1b990131a" +checksum = "df4054f177d1600f17e2bc152f6a927592641b19861e6005cc51bdf7d4fa27a6" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -308,9 +310,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed237ef5c3910deb2ff7c9a33e856ada57ec44b58562f0354ba4640319906c" +checksum = "27434beae2514d4a2aa90f53832cbdf6f23e4b5e2656d95eaf15f9276e2418b6" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -322,9 +324,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bb3faed4de77ebc2137d3167ef409b2300432e5fe0b191e3308d3740ff4add" +checksum = "26a33a38c7486b1945f8d093ff027add2f3a8f83c7300dbad6165cc49150085e" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -348,9 +350,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c06932646544ea341f0fda48d2c0fe4fda75bc132379cb84019cdfb6ddcb0fb" +checksum = "db973a7a23cbe96f2958e5687c51ce2d304b5c6d0dc5ccb3de8667ad8476f50b" dependencies = [ "alloy-consensus", "alloy-eips", @@ -361,9 +363,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c66bb6715b7499ea755bde4c96223ae8eb74e05c014ab38b9db602879ffb825" +checksum = "7283185baefbe66136649dc316c9dcc6f0e9f1d635ae19783615919f83bc298a" dependencies = [ "alloy-rlp", "arbitrary", @@ -392,9 +394,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08759415890ed63d3f09a3147d5ad8333c1b2a3eb9697604a6c1d54071213d1" +checksum = "8b03bde77ad73feae14aa593bcabb932c8098c0f0750ead973331cfc0003a4e1" dependencies = [ "alloy-chains", "alloy-consensus", @@ -432,9 +434,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cf194abddb88b034d22ab41449ed8532e5113e58699cd055bf21d98a0991ab" +checksum = "721aca709a9231815ad5903a2d284042cc77e7d9d382696451b30c9ee0950001" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -473,9 +475,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9c0d94c4a8f4c094e37799d6576db2f65d1b8640fbf5c82954b13e968c9aaaf" +checksum = "445a3298c14fae7afb5b9f2f735dead989f3dd83020c2ab8e48ed95d7b6d1acb" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -484,6 +486,7 @@ dependencies = [ "alloy-transport-http", "alloy-transport-ipc", "alloy-transport-ws", + "async-stream", "futures", "pin-project", "reqwest", @@ -493,15 +496,16 @@ dependencies = [ "tokio-stream", "tower 0.5.2", "tracing", + "tracing-futures", "url", "wasmtimer", ] [[package]] name = "alloy-rpc-types" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a153db94cf231b03238fe4da48f59dc6f36e01b5e4d5a2e30de33b95395380fa" +checksum = "9157deaec6ba2ad7854f16146e4cd60280e76593eed79fdcb06e0fa8b6c60f77" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -512,9 +516,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5275d2e24dbdd82032c3b305db359fb2681069cc75add7feb66863ce50b5cb5" +checksum = "25c053dc0acbdb922d1d088b3457eae249263ccd06d459aa68c3f9dcf6962632" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -524,9 +528,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5462937f088889c337c236c2509226e87a26301d2b01f9fafee246bd84cb0407" +checksum = "3a80ee83ef97e7ffd667a81ebdb6154558dfd5e8f20d8249a10a12a1671a04b3" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -536,9 +540,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd4ceea38ea27eeb26f021df34ed5b7b793704ad7a2a009f16137a19461e7ca" +checksum = "604dea1f00fd646debe8033abe8e767c732868bf8a5ae9df6321909ccbc99c56" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -547,9 +551,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c14f3c5747750f7373ec9f633230923ff149c2e31960513e31593bcfcf916be" +checksum = "645455186916281e0b3f063fd07d007711257cf90c3499ff3569a39ffdfc9d2f" dependencies = [ "alloy-eips", "alloy-primitives", @@ -565,9 +569,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa8f6e27d47b4c56c627cb03dc91624c26bd814f6609bb1d1a836148b76fc9b" +checksum = "08b113a0087d226291b9768ed331818fa0b0744cc1207ae7c150687cf3fde1bd" dependencies = [ "alloy-primitives", "serde", @@ -575,9 +579,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467888f02b5f70a3f12a8e5c211df5abd05895f7aebe10c2f73d51241de66b44" +checksum = "874ac9d1249ece0453e262d9ba72da9dbb3b7a2866220ded5940c2e47f1aa04d" dependencies = [ "alloy-consensus", "alloy-eips", @@ -596,9 +600,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e76553a98e04b20d8ac55d95cd6c8aad741958a23949132a4a5f12ca137059" +checksum = "7e13d71eac04513a71af4b3df580f52f2b4dcbff9d971cc9a52519acf55514cb" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -618,9 +622,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec941a4b3eedf15daef2b7aeb7848dfc6e677f58b2a21eab0ac1efef1ffac62" +checksum = "505d73db6217e6abcdeba4bf025fb9db79577d6b06e092d24e7c11ed0360743b" dependencies = [ "alloy-eips", "alloy-primitives", @@ -632,9 +636,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef4bba67ec601730ceb23e542980d73ae9f718819604dfdd8289b13a506e762" +checksum = "4747763aee39c1b0f5face79bde9be8932be05b2db7d8bdcebb93490f32c889c" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -646,9 +650,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8edc8512f919feb79dd30864ef7574d2877e71b73e30b5de4925ba9bc6bd4f96" +checksum = "70132ebdbea1eaa68c4d6f7a62c2fadf0bdce83b904f895ab90ca4ec96f63468" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -658,9 +662,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9824e1bf92cd7848ca6fabb01c9aca15c9c5fb0ab96da5514ef0543f021c69f6" +checksum = "3a1cd73fc054de6353c7f22ff9b846b0f0f145cd0112da07d4119e41e9959207" dependencies = [ "alloy-primitives", "arbitrary", @@ -670,9 +674,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81755ed6a6a33061302ac95e9bb7b40ebf7078e4568397168024242bc31a3e58" +checksum = "c96fbde54bee943cd94ebacc8a62c50b38c7dfd2552dcd79ff61aea778b1bfcc" dependencies = [ "alloy-primitives", "async-trait", @@ -685,9 +689,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa857621a5c95c13e640e18bb9c4720f4338a666d6276f55446477a6bc3912ff" +checksum = "cc6e72002cc1801d8b41e9892165e3a6551b7bd382bd9d0414b21e90c0c62551" dependencies = [ "alloy-consensus", "alloy-network", @@ -703,9 +707,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f9c3c7bc1f4e334e5c5fc59ec8dac894973a71b11da09065affc6094025049" +checksum = "f99b007e002f1082b28827cc47d9c72562d412a98c06f29aa438118ff3036c43" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -717,9 +721,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46ff7aa715eb2404cb87fa94390d2c5d5addd70d9617e20b2398ee6f48cb21f0" +checksum = "6c0a9cb9b1afbcd3325e0fff9fdf98e6d095643fae9e5584e80597f0b79b6d6e" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -735,13 +739,14 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f105fa700140c0cc6e2c3377adef650c389ac57b8ead8318a2e6bd52f1ae841" +checksum = "530c4863e707b95f99b37792cdfa94d30004ec552aed41e200a1d9264d44e669" dependencies = [ "const-hex", "dunce", "heck 0.5.0", + "macro-string", "proc-macro2", "quote", "syn 2.0.100", @@ -750,9 +755,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c649acc6c9d3893e392c737faeadce30b4a1751eed148ae43bc2f27f29c4480c" +checksum = "74b210dd863afa9da93c488601a1f23bee1e3ce47e15519582320c205645a7a0" dependencies = [ "serde", "winnow", @@ -760,9 +765,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f819635439ebb06aa13c96beac9b2e7360c259e90f5160a6848ae0d94d10452" +checksum = "4f5ff802859e2797d022dc812b5b4ee40d829e0fb446c269a87826c7f0021976" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -773,13 +778,16 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.12.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579917e55a64a5f88b2f46f21480095b0fa8c303716c0c58075a796e89ed0084" +checksum = "9aec325c2af8562ef355c02aeb527c755a07e9d8cf6a1e65dda8d0bf23e29b2c" dependencies = [ "alloy-json-rpc", "base64 0.22.1", + "derive_more 2.0.1", + "futures", "futures-utils-wasm", + "parking_lot", "serde", "serde_json", "thiserror 2.0.12", @@ -792,9 +800,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcd2f8ab2f053cd848ead5d625cb1b63716562951101588c1fa49300e3c6418" +checksum = "a082c9473c6642cce8b02405a979496126a03b096997888e86229afad05db06c" dependencies = [ "alloy-json-rpc", "alloy-rpc-types-engine", @@ -812,9 +820,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e61e2b5cbf16f7588e4420848b61824f6514944773732534f4129ba6a251e059" +checksum = "45a78cfda2cac16fa83f6b5dd8b4643caec6161433b25b67e484ce05d2194513" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -832,9 +840,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ddcf4b98b3448eb998e057dc5a27345997863d6544ee7f0f79957616768dd3" +checksum = "ae865917bdabaae21f418010fe7e8837c6daa6611fde25f8d78a1778d6ecb523" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -1142,9 +1150,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310c9bcae737a48ef5cdee3174184e6d548b292739ede61a1f955ef76a738861" +checksum = "c0cf008e5e1a9e9e22a7d3c9a4992e21a350290069e36d8fb72304ed17e8f2d2" dependencies = [ "brotli", "flate2", @@ -1283,9 +1291,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.87" +version = "0.1.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote", @@ -1347,9 +1355,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backon" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fef586913a57ff189f25c9b3d034356a5bf6b3fa9a7f067588fe1698ba1f5d" +checksum = "970d91570c01a8a5959b36ad7dd1c30642df24b6b3068710066f6809f7033bb7" dependencies = [ "fastrand", "tokio", @@ -1382,12 +1390,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -1402,9 +1404,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.7.1" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97d56060ee67d285efb8001fec9d2a4c710c32efd2e14b5cbb5ba71930fc2d" +checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" [[package]] name = "bech32" @@ -1520,9 +1522,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675f87afced0413c9bb02843499dbbd3882a237645883f71a2b59644a6d2f753" +checksum = "b17679a8d69b6d7fd9cd9801a536cec9fa5e5970b69f9d4747f70b39b031f5e7" dependencies = [ "arrayref", "arrayvec", @@ -1585,9 +1587,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc" +checksum = "b2b74d67a0fc0af8e9823b79fd1c43a0900e5a8f0e0f4cc9210796bf3a820126" dependencies = [ "borsh-derive", "cfg_aliases", @@ -1595,9 +1597,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b668d39970baad5356d7c83a86fee3a539e6f93bf6764c97368243e17a0487" +checksum = "2d37ed1b2c9b78421218a0b4f6d8349132d6ec2cfeba1cfb0118b0a8e268df9e" dependencies = [ "once_cell", "proc-macro-crate", @@ -1755,16 +1757,16 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" dependencies = [ "camino", "cargo-platform", "semver 1.0.26", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] @@ -1784,9 +1786,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.16" +version = "1.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" +checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af" dependencies = [ "jobserver", "libc", @@ -2051,15 +2053,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "convert_case" version = "0.7.1" @@ -2346,7 +2339,6 @@ dependencies = [ "lock_api", "once_cell", "parking_lot_core", - "serde", ] [[package]] @@ -2383,9 +2375,9 @@ checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" [[package]] name = "delay_map" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df941644b671f05f59433e481ba0d31ac10e3667de725236a4c0d587c496fba1" +checksum = "88e365f083a5cb5972d50ce8b1b2c9f125dc5ec0f50c0248cfb568ae59efcf0b" dependencies = [ "futures", "tokio", @@ -2405,9 +2397,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058" dependencies = [ "powerfmt", "serde", @@ -2446,6 +2438,37 @@ dependencies = [ "syn 2.0.100", ] +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn 2.0.100", +] + [[package]] name = "derive_more" version = "1.0.0" @@ -2470,7 +2493,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ - "convert_case 0.6.0", "proc-macro2", "quote", "syn 2.0.100", @@ -2483,7 +2505,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" dependencies = [ - "convert_case 0.7.1", + "convert_case", "proc-macro2", "quote", "syn 2.0.100", @@ -2970,9 +2992,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foldhash" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "foreign-types" @@ -3182,14 +3204,16 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.13.3+wasi-0.2.2", - "windows-targets 0.52.6", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", + "wasm-bindgen", ] [[package]] @@ -3208,6 +3232,19 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "git2" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5220b8ba44c68a9a7f7a7659e864dd73692e417ef0211bea133c7b74e031eeb9" +dependencies = [ + "bitflags 2.9.0", + "libc", + "libgit2-sys", + "log", + "url", +] + [[package]] name = "glob" version = "0.3.2" @@ -3416,13 +3453,14 @@ dependencies = [ [[package]] name = "hickory-proto" -version = "0.25.0-alpha.5" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d00147af6310f4392a31680db52a3ed45a2e0f68eb18e8c3fe5537ecc96d9e2" +checksum = "6d844af74f7b799e41c78221be863bade11c430d46042c3b49ca8ae0c6d27287" dependencies = [ "async-recursion", "async-trait", "cfg-if", + "critical-section", "data-encoding", "enum-as-inner", "futures-channel", @@ -3432,6 +3470,7 @@ dependencies = [ "ipnet", "once_cell", "rand 0.9.0", + "ring", "serde", "thiserror 2.0.12", "tinyvec", @@ -3442,9 +3481,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.25.0-alpha.5" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5762f69ebdbd4ddb2e975cd24690bf21fe6b2604039189c26acddbc427f12887" +checksum = "a128410b38d6f931fcc6ca5c107a3b02cabd6c05967841269a4ad65d23c44331" dependencies = [ "cfg-if", "futures-util", @@ -3512,13 +3551,13 @@ dependencies = [ [[package]] name = "hostname" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ + "cfg-if", "libc", - "match_cfg", - "winapi", + "windows 0.52.0", ] [[package]] @@ -3581,9 +3620,9 @@ checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e" [[package]] name = "humantime" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" [[package]] name = "humantime-serde" @@ -3628,7 +3667,7 @@ dependencies = [ "hyper-util", "log", "rustls", - "rustls-native-certs 0.8.1", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", @@ -3657,14 +3696,15 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.61" +version = "0.1.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "b2fd658b06e56721792c5df4475705b6cda790e9298d19d2f8af083457bcd127" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", "windows-core 0.52.0", ] @@ -3825,12 +3865,12 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78a89907582615b19f6f0da1af18abf6ff08be259395669b834b057a7ee92d8" +checksum = "69b2eeee38fef3aa9b4cc5f1beea8a2444fc00e7377cafae396de3f5c2065e24" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3996,9 +4036,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iri-string" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0f0a572e8ffe56e2ff4f769f32ffe919282c3916799f8b68688b6030063bea" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" dependencies = [ "memchr", "serde", @@ -4045,16 +4085,18 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jni" -version = "0.19.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", + "cfg-if", "combine", "jni-sys", "log", "thiserror 1.0.69", "walkdir", + "windows-sys 0.45.0", ] [[package]] @@ -4084,9 +4126,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "834af00800e962dee8f7bfc0f60601de215e73e78e5497d733a2919da837d3c8" +checksum = "37b26c20e2178756451cfeb0661fb74c47dd5988cb7e3939de7e9241fd604d42" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -4102,9 +4144,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def0fd41e2f53118bd1620478d12305b2c75feef57ea1f93ef70568c98081b7e" +checksum = "bacb85abf4117092455e1573625e21b8f8ef4dec8aff13361140b2dc266cdff2" dependencies = [ "base64 0.22.1", "futures-channel", @@ -4127,9 +4169,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76637f6294b04e747d68e69336ef839a3493ca62b35bf488ead525f7da75c5bb" +checksum = "456196007ca3a14db478346f58c7238028d55ee15c1df15115596e411ff27925" dependencies = [ "async-trait", "bytes", @@ -4154,9 +4196,9 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c24e981ad17798bbca852b0738bfb7b94816ed687bd0d5da60bfa35fa0fdc3" +checksum = "c872b6c9961a4ccc543e321bb5b89f6b2d2c7fe8b61906918273a3333c95400c" dependencies = [ "async-trait", "base64 0.22.1", @@ -4179,9 +4221,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fcae0c6c159e11541080f1f829873d8f374f81eda0abc67695a13fc8dc1a580" +checksum = "5e65763c942dfc9358146571911b0cd1c361c2d63e2d2305622d40d36376ca80" dependencies = [ "heck 0.5.0", "proc-macro-crate", @@ -4192,9 +4234,9 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b7a3df90a1a60c3ed68e7ca63916b53e9afa928e33531e87f61a9c8e9ae87b" +checksum = "55e363146da18e50ad2b51a0a7925fc423137a0b1371af8235b1c231a0647328" dependencies = [ "futures-util", "http", @@ -4219,9 +4261,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddb81adb1a5ae9182df379e374a79e24e992334e7346af4d065ae5b2acb8d4c6" +checksum = "08a8e70baf945b6b5752fc8eb38c918a48f1234daf11355e07106d963f860089" dependencies = [ "http", "serde", @@ -4231,9 +4273,9 @@ dependencies = [ [[package]] name = "jsonrpsee-wasm-client" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e41af42ca39657313748174d02766e5287d3a57356f16756dbd8065b933977" +checksum = "e6558a9586cad43019dafd0b6311d0938f46efc116b34b28c74778bc11a2edf6" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -4242,9 +4284,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4f3642a292f5b76d8a16af5c88c16a0860f2ccc778104e5c848b28183d9538" +checksum = "01b3323d890aa384f12148e8d2a1fd18eb66e9e7e825f9de4fa53bcc19b93eef" dependencies = [ "http", "jsonrpsee-client-transport", @@ -4346,6 +4388,18 @@ version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +[[package]] +name = "libgit2-sys" +version = "0.18.1+1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + [[package]] name = "libloading" version = "0.8.6" @@ -4405,12 +4459,12 @@ dependencies = [ [[package]] name = "libsecp256k1" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" +checksum = "e79019718125edc905a079a70cfa5f3820bc76139fc91d6f9abc27ea2a887139" dependencies = [ "arrayref", - "base64 0.13.1", + "base64 0.22.1", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", @@ -4462,6 +4516,18 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "libz-sys" +version = "1.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -4486,9 +4552,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "linux-raw-sys" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9" +checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" [[package]] name = "litemap" @@ -4509,9 +4575,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" dependencies = [ "value-bag", ] @@ -4563,10 +4629,15 @@ dependencies = [ ] [[package]] -name = "match_cfg" -version = "0.1.0" +name = "macro-string" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] [[package]] name = "matchers" @@ -4865,9 +4936,6 @@ name = "notify-types" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" -dependencies = [ - "serde", -] [[package]] name = "ntapi" @@ -5049,9 +5117,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.0" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad" +checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" dependencies = [ "critical-section", "portable-atomic", @@ -5059,9 +5127,9 @@ dependencies = [ [[package]] name = "op-alloy-consensus" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d297150146a63778a29400320700e804ec6e1e4d6ec99857cdbbaf17b3de9241" +checksum = "971eaae9cfc8b6aabb62cef8d7d49640d2e8e948e5aa3177788c4dea3d226452" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5077,9 +5145,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955a7d0ef9161f4a2a8461ef5d784526741c325410103d654706863cf4a32736" +checksum = "b59251cd112cb10792a041ea68d9423391e0e9e3576605ee52800890fdaa483c" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5096,14 +5164,13 @@ dependencies = [ [[package]] name = "op-revm" -version = "1.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "1.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "983c408745202267f1f483d091fb498986613ccd6c95e44d634cc0d7a2a9f275" dependencies = [ "auto_impl", "once_cell", "revm", - "revm-inspector", - "revm-precompile", "serde", ] @@ -5165,9 +5232,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "3.9.2" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" dependencies = [ "num-traits", ] @@ -5354,6 +5421,49 @@ dependencies = [ "rustc_version 0.4.1", ] +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_macros", + "phf_shared", + "serde", +] + +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.10" @@ -5478,7 +5588,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.23", + "zerocopy 0.8.24", ] [[package]] @@ -5693,11 +5803,12 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" +checksum = "c3bd15a6f2967aef83887dcb9fec0014580467e33720d073560cf015a5683012" dependencies = [ "bytes", + "cfg_aliases", "pin-project-lite", "quinn-proto", "quinn-udp", @@ -5707,17 +5818,18 @@ dependencies = [ "thiserror 2.0.12", "tokio", "tracing", + "web-time", ] [[package]] name = "quinn-proto" -version = "0.11.9" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" +checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc" dependencies = [ "bytes", - "getrandom 0.2.15", - "rand 0.8.5", + "getrandom 0.3.2", + "rand 0.9.0", "ring", "rustc-hash 2.1.1", "rustls", @@ -5752,6 +5864,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "radium" version = "0.7.0" @@ -5778,7 +5896,7 @@ checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", - "zerocopy 0.8.23", + "zerocopy 0.8.24", ] [[package]] @@ -5816,7 +5934,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.1", + "getrandom 0.3.2", ] [[package]] @@ -5968,9 +6086,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.13" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389a89e494bbc88bebf30e23da98742c843863a16a352647716116aa71fae80a" +checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" dependencies = [ "base64 0.22.1", "bytes", @@ -5992,7 +6110,7 @@ dependencies = [ "pin-project-lite", "quinn", "rustls", - "rustls-native-certs 0.8.1", + "rustls-native-certs", "rustls-pemfile", "rustls-pki-types", "serde", @@ -6013,18 +6131,17 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +checksum = "48375394603e3dd4b2d64371f7148fd8c7baa2680e28741f2cb8d23b59e3d4c4" dependencies = [ "hostname", - "quick-error", ] [[package]] name = "reth-basic-payload-builder" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6032,14 +6149,14 @@ dependencies = [ "futures-core", "futures-util", "metrics", + "reth-chain-state", "reth-metrics", "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", "reth-primitives-traits", - "reth-provider", "reth-revm", + "reth-storage-api", "reth-tasks", "tokio", "tracing", @@ -6047,8 +6164,8 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6062,9 +6179,9 @@ dependencies = [ "rand 0.8.5", "reth-chainspec", "reth-errors", + "reth-ethereum-primitives", "reth-execution-types", "reth-metrics", - "reth-primitives", "reth-primitives-traits", "reth-storage-api", "reth-trie", @@ -6077,8 +6194,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6097,8 +6214,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-genesis", "clap", @@ -6111,8 +6228,8 @@ dependencies = [ [[package]] name = "reth-cli-commands" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "ahash 0.8.11", "alloy-consensus", @@ -6154,7 +6271,6 @@ dependencies = [ "reth-node-core", "reth-node-events", "reth-node-metrics", - "reth-primitives", "reth-primitives-traits", "reth-provider", "reth-prune", @@ -6173,8 +6289,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "reth-tasks", "tokio", @@ -6183,8 +6299,8 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6200,8 +6316,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6213,16 +6329,17 @@ dependencies = [ "modular-bitfield", "op-alloy-consensus", "reth-codecs-derive", + "reth-zstd-compressors", "serde", "visibility", ] [[package]] name = "reth-codecs-derive" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ - "convert_case 0.7.1", + "convert_case", "proc-macro2", "quote", "syn 2.0.100", @@ -6230,8 +6347,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "eyre", "humantime-serde", @@ -6244,8 +6361,8 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6257,8 +6374,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6269,8 +6386,8 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6292,8 +6409,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "derive_more 2.0.1", @@ -6306,7 +6423,7 @@ dependencies = [ "reth-libmdbx", "reth-metrics", "reth-nippy-jar", - "reth-primitives", + "reth-static-file-types", "reth-storage-errors", "reth-tracing", "rustc-hash 2.1.1", @@ -6318,8 +6435,8 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -6333,8 +6450,8 @@ dependencies = [ "proptest", "reth-codecs", "reth-db-models", + "reth-ethereum-primitives", "reth-optimism-primitives", - "reth-primitives", "reth-primitives-traits", "reth-prune-types", "reth-scroll-primitives", @@ -6347,8 +6464,8 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -6362,9 +6479,10 @@ dependencies = [ "reth-etl", "reth-fs-util", "reth-node-types", - "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-stages-types", + "reth-static-file-types", "reth-trie", "reth-trie-db", "serde", @@ -6375,8 +6493,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6390,8 +6508,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6416,8 +6534,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6440,8 +6558,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "data-encoding", @@ -6464,8 +6582,8 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6481,10 +6599,10 @@ dependencies = [ "reth-consensus", "reth-db", "reth-db-api", + "reth-ethereum-primitives", "reth-metrics", "reth-network-p2p", "reth-network-peers", - "reth-primitives", "reth-primitives-traits", "reth-storage-api", "reth-tasks", @@ -6499,8 +6617,8 @@ dependencies = [ [[package]] name = "reth-e2e-test-utils" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6519,18 +6637,21 @@ dependencies = [ "reth-chainspec", "reth-db", "reth-engine-local", + "reth-ethereum-primitives", "reth-network", "reth-network-api", "reth-network-peers", "reth-node-api", "reth-node-builder", "reth-node-core", + "reth-node-ethereum", "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-rpc-api", + "reth-rpc-builder", "reth-rpc-eth-api", "reth-rpc-layer", "reth-rpc-server-types", @@ -6548,8 +6669,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "aes", "alloy-primitives", @@ -6579,8 +6700,8 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6609,21 +6730,20 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", - "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", "futures", "reth-chain-state", "reth-errors", + "reth-ethereum-primitives", "reth-execution-types", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", "reth-primitives-traits", "reth-trie", "reth-trie-common", @@ -6634,8 +6754,8 @@ dependencies = [ [[package]] name = "reth-engine-service" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "futures", "pin-project", @@ -6643,11 +6763,11 @@ dependencies = [ "reth-consensus", "reth-engine-primitives", "reth-engine-tree", + "reth-ethereum-primitives", "reth-evm", "reth-network-p2p", "reth-node-types", "reth-payload-builder", - "reth-primitives", "reth-provider", "reth-prune", "reth-stages-api", @@ -6657,8 +6777,8 @@ dependencies = [ [[package]] name = "reth-engine-tree" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6707,8 +6827,8 @@ dependencies = [ [[package]] name = "reth-engine-util" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -6722,10 +6842,9 @@ dependencies = [ "reth-evm", "reth-fs-util", "reth-payload-primitives", - "reth-primitives", "reth-primitives-traits", - "reth-provider", "reth-revm", + "reth-storage-api", "serde", "serde_json", "tokio", @@ -6735,8 +6854,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -6747,8 +6866,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6775,19 +6894,19 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-chains", "alloy-consensus", "alloy-eips", + "alloy-hardforks", "alloy-primitives", "alloy-rlp", "bytes", "derive_more 2.0.1", "reth-chainspec", "reth-codecs-derive", - "reth-ethereum-forks", "reth-ethereum-primitives", "reth-primitives-traits", "serde", @@ -6796,8 +6915,8 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "eyre", "reth-chainspec", @@ -6806,8 +6925,8 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6816,31 +6935,31 @@ dependencies = [ "reth-consensus", "reth-consensus-common", "reth-execution-types", - "reth-primitives", "reth-primitives-traits", "tracing", ] [[package]] name = "reth-ethereum-engine-primitives" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", "reth-engine-primitives", + "reth-ethereum-primitives", "reth-payload-primitives", - "reth-primitives", + "reth-primitives-traits", "serde", "sha2 0.10.8", ] [[package]] name = "reth-ethereum-forks" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -6851,10 +6970,37 @@ dependencies = [ "rustc-hash 2.1.1", ] +[[package]] +name = "reth-ethereum-payload-builder" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "reth-basic-payload-builder", + "reth-chainspec", + "reth-errors", + "reth-ethereum-primitives", + "reth-evm", + "reth-evm-ethereum", + "reth-payload-builder", + "reth-payload-builder-primitives", + "reth-payload-primitives", + "reth-payload-validator", + "reth-primitives-traits", + "reth-revm", + "reth-storage-api", + "reth-transaction-pool", + "revm", + "tracing", +] + [[package]] name = "reth-ethereum-primitives" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6873,12 +7019,13 @@ dependencies = [ "revm-context", "secp256k1 0.30.0", "serde", + "serde_with", ] [[package]] name = "reth-etl" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "rayon", "reth-db-api", @@ -6887,8 +7034,8 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6909,14 +7056,31 @@ dependencies = [ "reth-storage-errors", "reth-trie-common", "revm", - "revm-database", "scroll-alloy-evm", ] [[package]] -name = "reth-execution-errors" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +name = "reth-evm-ethereum" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-primitives", + "reth-chainspec", + "reth-ethereum-forks", + "reth-ethereum-primitives", + "reth-evm", + "reth-execution-types", + "reth-primitives-traits", + "revm", +] + +[[package]] +name = "reth-execution-errors" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-evm", "alloy-primitives", @@ -6928,8 +7092,8 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6940,15 +7104,14 @@ dependencies = [ "reth-primitives-traits", "reth-trie-common", "revm", - "revm-database", "serde", "serde_with", ] [[package]] name = "reth-exex" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6961,6 +7124,7 @@ dependencies = [ "reth-chain-state", "reth-chainspec", "reth-config", + "reth-ethereum-primitives", "reth-evm", "reth-exex-types", "reth-fs-util", @@ -6968,7 +7132,6 @@ dependencies = [ "reth-node-api", "reth-node-core", "reth-payload-builder", - "reth-primitives", "reth-primitives-traits", "reth-provider", "reth-prune-types", @@ -6985,14 +7148,13 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eips", "alloy-primitives", "reth-chain-state", "reth-execution-types", - "reth-primitives", "reth-primitives-traits", "serde", "serde_with", @@ -7000,8 +7162,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "serde", "serde_json", @@ -7010,8 +7172,8 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7024,7 +7186,6 @@ dependencies = [ "reth-chainspec", "reth-engine-primitives", "reth-evm", - "reth-primitives", "reth-primitives-traits", "reth-provider", "reth-revm", @@ -7037,8 +7198,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "async-trait", "bytes", @@ -7058,8 +7219,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "bitflags 2.9.0", "byteorder", @@ -7075,8 +7236,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "bindgen", "cc", @@ -7084,8 +7245,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "futures", "metrics", @@ -7096,16 +7257,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-net-nat" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "futures-util", "if-addrs", @@ -7118,8 +7279,8 @@ dependencies = [ [[package]] name = "reth-network" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7142,6 +7303,7 @@ dependencies = [ "reth-discv5", "reth-dns-discovery", "reth-ecies", + "reth-engine-primitives", "reth-eth-wire", "reth-eth-wire-types", "reth-ethereum-forks", @@ -7153,7 +7315,6 @@ dependencies = [ "reth-network-p2p", "reth-network-peers", "reth-network-types", - "reth-primitives", "reth-primitives-traits", "reth-storage-api", "reth-tasks", @@ -7174,8 +7335,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", @@ -7197,8 +7358,8 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7220,8 +7381,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7235,8 +7396,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -7249,8 +7410,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "anyhow", "bincode", @@ -7266,8 +7427,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -7290,8 +7451,8 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7331,7 +7492,6 @@ dependencies = [ "reth-node-events", "reth-node-metrics", "reth-payload-builder", - "reth-primitives", "reth-provider", "reth-prune", "reth-rpc", @@ -7354,8 +7514,8 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7375,12 +7535,12 @@ dependencies = [ "reth-db", "reth-discv4", "reth-discv5", + "reth-engine-primitives", "reth-ethereum-forks", "reth-net-nat", "reth-network", "reth-network-p2p", "reth-network-peers", - "reth-primitives", "reth-primitives-traits", "reth-prune-types", "reth-rpc-eth-types", @@ -7399,12 +7559,49 @@ dependencies = [ "toml", "tracing", "vergen", + "vergen-git2", +] + +[[package]] +name = "reth-node-ethereum" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" +dependencies = [ + "alloy-eips", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "eyre", + "reth-chainspec", + "reth-consensus", + "reth-engine-primitives", + "reth-ethereum-consensus", + "reth-ethereum-engine-primitives", + "reth-ethereum-payload-builder", + "reth-ethereum-primitives", + "reth-evm", + "reth-evm-ethereum", + "reth-network", + "reth-node-api", + "reth-node-builder", + "reth-payload-primitives", + "reth-primitives-traits", + "reth-provider", + "reth-revm", + "reth-rpc", + "reth-rpc-api", + "reth-rpc-builder", + "reth-rpc-eth-types", + "reth-rpc-server-types", + "reth-tracing", + "reth-transaction-pool", + "reth-trie-db", + "revm", ] [[package]] name = "reth-node-events" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7427,8 +7624,8 @@ dependencies = [ [[package]] name = "reth-node-metrics" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "eyre", "http", @@ -7447,8 +7644,8 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "reth-chainspec", "reth-db-api", @@ -7460,8 +7657,8 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7482,12 +7679,13 @@ dependencies = [ "revm-context", "secp256k1 0.30.0", "serde", + "serde_with", ] [[package]] name = "reth-payload-builder" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7499,7 +7697,6 @@ dependencies = [ "reth-metrics", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", "reth-primitives-traits", "tokio", "tokio-stream", @@ -7508,8 +7705,8 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "pin-project", "reth-payload-primitives", @@ -7520,8 +7717,8 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7531,7 +7728,7 @@ dependencies = [ "reth-chain-state", "reth-chainspec", "reth-errors", - "reth-primitives", + "reth-primitives-traits", "scroll-alloy-rpc-types-engine", "serde", "thiserror 2.0.12", @@ -7540,18 +7737,28 @@ dependencies = [ [[package]] name = "reth-payload-util" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-primitives", "reth-transaction-pool", ] +[[package]] +name = "reth-payload-validator" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" +dependencies = [ + "alloy-consensus", + "alloy-rpc-types-engine", + "reth-primitives-traits", +] + [[package]] name = "reth-primitives" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "arbitrary", @@ -7565,8 +7772,8 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7599,8 +7806,8 @@ dependencies = [ [[package]] name = "reth-provider" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7645,8 +7852,8 @@ dependencies = [ [[package]] name = "reth-prune" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7673,8 +7880,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "arbitrary", @@ -7687,8 +7894,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "reth-primitives-traits", @@ -7696,14 +7903,12 @@ dependencies = [ "reth-storage-errors", "reth-trie", "revm", - "revm-database", - "revm-inspector", ] [[package]] name = "reth-rpc" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -7740,13 +7945,13 @@ dependencies = [ "reth-consensus", "reth-engine-primitives", "reth-errors", + "reth-ethereum-primitives", "reth-evm", "reth-metrics", "reth-network-api", "reth-network-peers", "reth-network-types", "reth-node-api", - "reth-primitives", "reth-primitives-traits", "reth-provider", "reth-revm", @@ -7773,8 +7978,8 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eips", "alloy-genesis", @@ -7799,8 +8004,8 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-network", "alloy-provider", @@ -7815,7 +8020,7 @@ dependencies = [ "reth-metrics", "reth-network-api", "reth-node-core", - "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-rpc", "reth-rpc-api", @@ -7836,8 +8041,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7855,6 +8060,7 @@ dependencies = [ "reth-payload-primitives", "reth-primitives-traits", "reth-rpc-api", + "reth-rpc-server-types", "reth-storage-api", "reth-tasks", "reth-transaction-pool", @@ -7866,8 +8072,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -7892,7 +8098,6 @@ dependencies = [ "reth-network-api", "reth-node-api", "reth-payload-builder", - "reth-primitives", "reth-primitives-traits", "reth-provider", "reth-revm", @@ -7904,15 +8109,14 @@ dependencies = [ "reth-trie-common", "revm", "revm-inspectors", - "revm-primitives", "tokio", "tracing", ] [[package]] name = "reth-rpc-eth-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7929,10 +8133,10 @@ dependencies = [ "reth-chain-state", "reth-chainspec", "reth-errors", + "reth-ethereum-primitives", "reth-evm", "reth-execution-types", "reth-metrics", - "reth-primitives", "reth-primitives-traits", "reth-revm", "reth-rpc-server-types", @@ -7942,9 +8146,7 @@ dependencies = [ "reth-transaction-pool", "reth-trie", "revm", - "revm-database", "revm-inspectors", - "revm-primitives", "schnellru", "serde", "thiserror 2.0.12", @@ -7955,8 +8157,8 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-rpc-types-engine", "http", @@ -7969,8 +8171,8 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7985,22 +8187,21 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-rpc-types-eth", "jsonrpsee-types", - "reth-primitives", "reth-primitives-traits", "serde", ] [[package]] name = "reth-scroll-chainspec" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-chains", "alloy-consensus", @@ -8023,8 +8224,8 @@ dependencies = [ [[package]] name = "reth-scroll-cli" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "clap", "eyre", @@ -8046,8 +8247,8 @@ dependencies = [ [[package]] name = "reth-scroll-consensus" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8066,8 +8267,8 @@ dependencies = [ [[package]] name = "reth-scroll-engine-primitives" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8091,8 +8292,8 @@ dependencies = [ [[package]] name = "reth-scroll-evm" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8119,8 +8320,8 @@ dependencies = [ [[package]] name = "reth-scroll-forks" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-chains", "alloy-primitives", @@ -8133,8 +8334,8 @@ dependencies = [ [[package]] name = "reth-scroll-node" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8175,8 +8376,8 @@ dependencies = [ [[package]] name = "reth-scroll-payload" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "reth-basic-payload-builder", "reth-payload-primitives", @@ -8188,8 +8389,8 @@ dependencies = [ [[package]] name = "reth-scroll-primitives" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8216,8 +8417,8 @@ dependencies = [ [[package]] name = "reth-scroll-rpc" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8251,8 +8452,8 @@ dependencies = [ [[package]] name = "reth-stages" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8270,19 +8471,20 @@ dependencies = [ "reth-consensus", "reth-db", "reth-db-api", + "reth-ethereum-primitives", "reth-etl", "reth-evm", "reth-execution-types", "reth-exex", "reth-fs-util", "reth-network-p2p", - "reth-primitives", "reth-primitives-traits", "reth-provider", "reth-prune", "reth-prune-types", "reth-revm", "reth-stages-api", + "reth-static-file-types", "reth-storage-errors", "reth-testing-utils", "reth-trie", @@ -8296,8 +8498,8 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8323,8 +8525,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "arbitrary", @@ -8337,8 +8539,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "parking_lot", @@ -8358,8 +8560,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "clap", @@ -8370,8 +8572,8 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8394,8 +8596,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8410,8 +8612,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "auto_impl", "dyn-clone", @@ -8428,8 +8630,8 @@ dependencies = [ [[package]] name = "reth-testing-utils" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8443,8 +8645,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "tokio", "tokio-stream", @@ -8453,8 +8655,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "clap", "eyre", @@ -8468,8 +8670,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8494,7 +8696,7 @@ dependencies = [ "reth-storage-api", "reth-tasks", "revm-interpreter", - "revm-specification", + "revm-primitives", "rustc-hash 2.1.1", "schnellru", "serde", @@ -8507,8 +8709,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8532,8 +8734,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8558,8 +8760,8 @@ dependencies = [ [[package]] name = "reth-trie-db" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8571,15 +8773,14 @@ dependencies = [ "reth-primitives-traits", "reth-trie", "revm", - "serde", "tracing", "triehash", ] [[package]] name = "reth-trie-parallel" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8587,14 +8788,15 @@ dependencies = [ "itertools 0.14.0", "metrics", "rayon", + "reth-db-api", "reth-execution-errors", "reth-metrics", - "reth-primitives", "reth-provider", "reth-storage-errors", "reth-trie", "reth-trie-common", "reth-trie-db", + "reth-trie-sparse", "thiserror 2.0.12", "tokio", "tracing", @@ -8602,12 +8804,15 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "alloy-rlp", + "auto_impl", + "metrics", "reth-execution-errors", + "reth-metrics", "reth-primitives-traits", "reth-tracing", "reth-trie-common", @@ -8617,16 +8822,17 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "20.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "20.0.0-alpha.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4502328b029ff68ddbbe42994faf7384c8aac0a47d53c3323ea52c7696fe2154" dependencies = [ "revm-bytecode", "revm-context", @@ -8638,59 +8844,59 @@ dependencies = [ "revm-interpreter", "revm-precompile", "revm-primitives", - "revm-specification", "revm-state", ] [[package]] name = "revm-bytecode" -version = "1.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "1.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f018d50979559e6c0fcad3f0e5c5bd54e4ebff3d6f0d4da82ac83fe7f5bc3ac0" dependencies = [ "bitvec", + "phf", "revm-primitives", - "revm-specification", "serde", ] [[package]] name = "revm-context" -version = "1.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "1.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "247e37d3df5918952a004f637b6b6a018daee83163c540f8b2c3b14ae05e9e78" dependencies = [ - "auto_impl", "cfg-if", "derive-where", "revm-bytecode", "revm-context-interface", "revm-database-interface", - "revm-interpreter", "revm-primitives", - "revm-specification", "revm-state", "serde", ] [[package]] name = "revm-context-interface" -version = "1.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "1.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef08da7b423908efbfd5733bb3fb08916319fdec0a879f6d1fb5c8ae1994b239" dependencies = [ "alloy-eip2930", "alloy-eip7702", "auto_impl", "revm-database-interface", "revm-primitives", - "revm-specification", "revm-state", "serde", ] [[package]] name = "revm-database" -version = "1.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "1.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cefe6672af9849f9fd6ef836aff4b32020952992454e66597d32da68341fb89e" dependencies = [ + "alloy-eips", "auto_impl", "revm-bytecode", "revm-database-interface", @@ -8701,8 +8907,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "1.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "1.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8b4ab0ff9891593c719abdfadc8968450e1e2e0a8320339dd6968813a23db9d" dependencies = [ "auto_impl", "revm-primitives", @@ -8712,8 +8919,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "1.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "1.0.0-alpha.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12d95e6f9ccc5e9129d2ee3672125f0e1d7cc4c6a488d99818f7c6559e2bf4bc" dependencies = [ "auto_impl", "revm-bytecode", @@ -8723,31 +8931,32 @@ dependencies = [ "revm-interpreter", "revm-precompile", "revm-primitives", - "revm-specification", "revm-state", "serde", ] [[package]] name = "revm-inspector" -version = "1.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "1.0.0-alpha.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5289f17f28b3ab3be2d1be9e604eca7a1a554e7da336ddbe8860798e2bea88bc" dependencies = [ "auto_impl", "revm-context", "revm-database-interface", "revm-handler", "revm-interpreter", - "revm-precompile", "revm-primitives", "revm-state", "serde", + "serde_json", ] [[package]] name = "revm-inspectors" -version = "0.16.0" -source = "git+https://github.com/paradigmxyz/revm-inspectors?rev=9219073#9219073cb04a774d6ea12b44655bba92b08c1293" +version = "0.17.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1504e2851a11562fb350a9f408e5783351650aef11790aea0b0d0d9ab961c40" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -8763,20 +8972,21 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "16.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "16.0.0-alpha.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a97985e55a551d5d86c07a4469ecdd3b8c0d793cb330bb4a4f747e1ee0af864" dependencies = [ "revm-bytecode", "revm-context-interface", "revm-primitives", - "revm-specification", "serde", ] [[package]] name = "revm-precompile" -version = "17.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "17.0.0-alpha.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5d46dad4a7db8e6de9015f2419c160b41fa5e721345c1678a66db6d9f5ef619" dependencies = [ "aurora-engine-modexp", "blst", @@ -8786,9 +8996,7 @@ dependencies = [ "libsecp256k1", "once_cell", "p256", - "revm-context-interface", "revm-primitives", - "revm-specification", "ripemd", "secp256k1 0.30.0", "sha2 0.10.8", @@ -8797,16 +9005,19 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "16.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "16.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b385df11c27aa339c2d80cb22b8d5621ad95e7464cd319c8b5343448ea8ad673" dependencies = [ "alloy-primitives", + "enumn", + "serde", ] [[package]] name = "revm-scroll" version = "0.1.0" -source = "git+https://github.com/scroll-tech/scroll-revm#12557ed8a512240228d18c4fae85477bf47fbbe3" +source = "git+https://github.com/scroll-tech/scroll-revm#da81341ae9027a46114b16ff98937686bb417bab" dependencies = [ "auto_impl", "enumn", @@ -8817,25 +9028,15 @@ dependencies = [ "serde", ] -[[package]] -name = "revm-specification" -version = "1.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" -dependencies = [ - "enumn", - "revm-primitives", - "serde", -] - [[package]] name = "revm-state" -version = "1.0.0-alpha.1" -source = "git+https://github.com/bluealloy/revm?rev=19a5f3b#19a5f3be55d633f65bcb1291670292073046cdfc" +version = "1.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "217e158f471dd39065b14db956c3d40437f311163efd05254dc9a66b9dc426ba" dependencies = [ "bitflags 2.9.0", "revm-bytecode", "revm-primitives", - "revm-specification", "serde", ] @@ -8967,6 +9168,58 @@ dependencies = [ "chrono", ] +[[package]] +name = "rollup-node" +version = "0.0.1" +dependencies = [ + "alloy-chains", + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types-engine", + "clap", + "eyre", + "futures", + "reqwest", + "reth-cli-util", + "reth-e2e-test-utils", + "reth-engine-local", + "reth-eth-wire-types", + "reth-network", + "reth-network-peers", + "reth-node-api", + "reth-node-builder", + "reth-node-core", + "reth-node-types", + "reth-payload-builder", + "reth-primitives", + "reth-provider", + "reth-rpc-builder", + "reth-rpc-server-types", + "reth-scroll-chainspec", + "reth-scroll-cli", + "reth-scroll-engine-primitives", + "reth-scroll-node", + "reth-scroll-primitives", + "reth-tasks", + "reth-tracing", + "reth-transaction-pool", + "rollup-node-indexer", + "rollup-node-manager", + "rollup-node-watcher", + "scroll-alloy-consensus", + "scroll-alloy-provider", + "scroll-alloy-rpc-types-engine", + "scroll-db", + "scroll-engine", + "scroll-migration", + "scroll-network", + "scroll-wire", + "secp256k1 0.29.1", + "serde_json", + "tokio", + "tracing", +] + [[package]] name = "rollup-node-indexer" version = "0.0.1" @@ -8992,7 +9245,9 @@ dependencies = [ "futures", "reth-scroll-primitives", "reth-tokio-util", + "rollup-node-indexer", "rollup-node-primitives", + "rollup-node-watcher", "scroll-alloy-network", "scroll-alloy-provider", "scroll-engine", @@ -9103,9 +9358,9 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" [[package]] name = "rust_decimal" -version = "1.36.0" +version = "1.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +checksum = "faa7de2ba56ac291bd90c6b9bece784a52ae1411f9506544b3eae36dd2356d50" dependencies = [ "arrayvec", "borsh", @@ -9177,22 +9432,22 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825" +checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96" dependencies = [ "bitflags 2.9.0", "errno", "libc", - "linux-raw-sys 0.9.2", + "linux-raw-sys 0.9.3", "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.23.23" +version = "0.23.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" +checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c" dependencies = [ "log", "once_cell", @@ -9203,19 +9458,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework 2.11.1", -] - [[package]] name = "rustls-native-certs" version = "0.8.1" @@ -9248,23 +9490,23 @@ dependencies = [ [[package]] name = "rustls-platform-verifier" -version = "0.3.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +checksum = "4a5467026f437b4cb2a533865eaa73eb840019a0916f4b9ec563c6e617e086c9" dependencies = [ - "core-foundation 0.9.4", + "core-foundation 0.10.0", "core-foundation-sys", "jni", "log", "once_cell", "rustls", - "rustls-native-certs 0.7.3", + "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", - "security-framework 2.11.1", + "security-framework 3.2.0", "security-framework-sys", - "webpki-roots", - "winapi", + "webpki-root-certs", + "windows-sys 0.59.0", ] [[package]] @@ -9275,9 +9517,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.102.8" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +checksum = "0aa4eeac2588ffff23e9d7a7e9b3f971c5fb5b7ebc9452745e0c232c64f83b2f" dependencies = [ "ring", "rustls-pki-types", @@ -9351,8 +9593,8 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scroll-alloy-consensus" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9369,8 +9611,8 @@ dependencies = [ [[package]] name = "scroll-alloy-evm" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9386,8 +9628,8 @@ dependencies = [ [[package]] name = "scroll-alloy-hardforks" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-hardforks", "auto_impl", @@ -9396,8 +9638,8 @@ dependencies = [ [[package]] name = "scroll-alloy-network" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-network", @@ -9410,8 +9652,8 @@ dependencies = [ [[package]] name = "scroll-alloy-provider" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "alloy-provider", @@ -9431,8 +9673,8 @@ dependencies = [ [[package]] name = "scroll-alloy-rpc-types" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9448,8 +9690,8 @@ dependencies = [ [[package]] name = "scroll-alloy-rpc-types-engine" -version = "1.2.2" -source = "git+https://github.com/scroll-tech/reth.git#2de81fce858e35ed374c8105c45f02831887ff0a" +version = "1.3.4" +source = "git+https://github.com/scroll-tech/reth.git#112588276c4efe2383d636ed418387d69057bbeb" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -9457,52 +9699,6 @@ dependencies = [ "serde", ] -[[package]] -name = "scroll-bridge" -version = "0.0.1" -dependencies = [ - "alloy-chains", - "alloy-primitives", - "alloy-rpc-types-engine", - "clap", - "eyre", - "futures", - "reth-cli-util", - "reth-e2e-test-utils", - "reth-engine-local", - "reth-eth-wire-types", - "reth-network", - "reth-network-peers", - "reth-node-api", - "reth-node-builder", - "reth-node-core", - "reth-node-types", - "reth-payload-builder", - "reth-primitives", - "reth-provider", - "reth-rpc-builder", - "reth-rpc-server-types", - "reth-scroll-chainspec", - "reth-scroll-cli", - "reth-scroll-engine-primitives", - "reth-scroll-node", - "reth-scroll-primitives", - "reth-tasks", - "reth-tracing", - "reth-transaction-pool", - "rollup-node-manager", - "scroll-alloy-consensus", - "scroll-alloy-provider", - "scroll-alloy-rpc-types-engine", - "scroll-engine", - "scroll-network", - "scroll-wire", - "secp256k1 0.29.1", - "serde_json", - "tokio", - "tracing", -] - [[package]] name = "scroll-codec" version = "0.1.0" @@ -9616,7 +9812,6 @@ dependencies = [ "reth-eth-wire", "reth-network", "reth-network-api", - "reth-primitives", "reth-scroll-primitives", "secp256k1 0.29.1", "tokio", @@ -9715,9 +9910,9 @@ dependencies = [ [[package]] name = "sea-query" -version = "0.32.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b731192738ebf56d20580fc8ba2d23940333befe900b04dd08a26a77cd056f02" +checksum = "f5a24d8b9fcd2674a6c878a3d871f4f1380c6c43cc3718728ac96864d888458e" dependencies = [ "bigdecimal", "chrono", @@ -9748,16 +9943,16 @@ dependencies = [ [[package]] name = "sea-query-derive" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9834af2c4bd8c5162f00c89f1701fb6886119a88062cf76fe842ea9e232b9839" +checksum = "bae0cbad6ab996955664982739354128c58d16e126114fe88c2a493642502aab" dependencies = [ "darling", "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.100", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] @@ -9846,7 +10041,6 @@ dependencies = [ "core-foundation 0.9.4", "core-foundation-sys", "libc", - "num-bigint", "security-framework-sys", ] @@ -9938,6 +10132,7 @@ version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ + "indexmap 2.8.0", "itoa", "memchr", "ryu", @@ -10142,6 +10337,12 @@ dependencies = [ "time", ] +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "skeptic" version = "0.13.7" @@ -10556,9 +10757,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac9f9798a84bca5cd4d1760db691075fda8f2c3a5d9647e8bfd29eb9b3fabb87" +checksum = "36dbbf0d465ab9fdfea3093e755ae8839bdc1263dbe18d35064d02d6060f949e" dependencies = [ "paste", "proc-macro2", @@ -10613,15 +10814,14 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.18.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" dependencies = [ - "cfg-if", "fastrand", - "getrandom 0.3.1", + "getrandom 0.3.2", "once_cell", - "rustix 1.0.2", + "rustix 1.0.3", "windows-sys 0.59.0", ] @@ -10686,9 +10886,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.39" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa", @@ -10703,15 +10903,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ "num-conv", "time-core", @@ -10753,9 +10953,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.44.0" +version = "1.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9975ea0f48b5aa3972bf2d888c238182458437cc2a19374b81b25cdf1023fb3a" +checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" dependencies = [ "backtrace", "bytes", @@ -10820,9 +11020,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" +checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" dependencies = [ "bytes", "futures-core", @@ -10997,6 +11197,8 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ + "futures", + "futures-task", "pin-project", "tracing", ] @@ -11302,11 +11504,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.15.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587" +checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" dependencies = [ - "getrandom 0.3.1", + "getrandom 0.3.2", "serde", ] @@ -11330,16 +11532,43 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "8.3.2" +version = "9.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" +checksum = "e0d2f179f8075b805a43a2a21728a46f0cc2921b3c58695b28fa8817e103cd9a" dependencies = [ "anyhow", - "cargo_metadata 0.18.1", - "cfg-if", + "cargo_metadata 0.19.2", + "derive_builder", "regex", "rustversion", "time", + "vergen-lib", +] + +[[package]] +name = "vergen-git2" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86bae87104cb2790cdee615c2bb54729804d307191732ab27b1c5357ea6ddc5" +dependencies = [ + "anyhow", + "derive_builder", + "git2", + "rustversion", + "time", + "vergen", + "vergen-lib", +] + +[[package]] +name = "vergen-lib" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b07e6010c0f3e59fcb164e0163834597da68d1f864e2b8ca49f74de01e9c166" +dependencies = [ + "anyhow", + "derive_builder", + "rustversion", ] [[package]] @@ -11395,9 +11624,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi" -version = "0.13.3+wasi-0.2.2" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" dependencies = [ "wit-bindgen-rt", ] @@ -11513,6 +11742,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "0.26.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09aed61f5e8d2c18344b3faa33a4c837855fe56642757754775548fee21386c4" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "0.26.8" @@ -11524,9 +11762,9 @@ dependencies = [ [[package]] name = "whoami" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" +checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7" dependencies = [ "redox_syscall", "wasite", @@ -11534,9 +11772,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" +checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" [[package]] name = "winapi" @@ -11569,6 +11807,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows" version = "0.57.0" @@ -11669,9 +11917,9 @@ dependencies = [ [[package]] name = "windows-link" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" [[package]] name = "windows-registry" @@ -11679,7 +11927,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" dependencies = [ - "windows-result 0.3.1", + "windows-result 0.3.2", "windows-strings 0.3.1", "windows-targets 0.53.0", ] @@ -11704,9 +11952,9 @@ dependencies = [ [[package]] name = "windows-result" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189" +checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" dependencies = [ "windows-link", ] @@ -11730,6 +11978,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -11757,6 +12014,21 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -11804,6 +12076,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -11822,6 +12100,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -11840,6 +12124,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -11870,6 +12160,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -11888,6 +12184,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -11906,6 +12208,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -11924,6 +12232,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -11944,9 +12258,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" +checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" dependencies = [ "memchr", ] @@ -11963,9 +12277,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rt" -version = "0.33.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ "bitflags 2.9.0", ] @@ -12051,11 +12365,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.23" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6" +checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" dependencies = [ - "zerocopy-derive 0.8.23", + "zerocopy-derive 0.8.24", ] [[package]] @@ -12071,9 +12385,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.8.23" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" +checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" dependencies = [ "proc-macro2", "quote", @@ -12154,18 +12468,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.3" +version = "7.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.14+zstd.1.5.7" +version = "2.0.15+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5" +checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 5111a580..4486562e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ exclude = [".github/"] [workspace] members = [ - "bin/bridge", + "bin/rollup", "crates/database/db", "crates/database/migration", "crates/codec", @@ -131,7 +131,7 @@ scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", defau scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", default-features = false } # reth -reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git" } +reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false } reth-network = { git = "https://github.com/scroll-tech/reth.git", default-features = false } reth-network-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false } reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", default-features = false } @@ -147,6 +147,7 @@ reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", default-fe reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false } # rollup node +rollup-node-indexer = { path = "crates/indexer" } rollup-node-manager = { path = "crates/node" } rollup-node-primitives = { path = "crates/primitives" } rollup-node-watcher = { path = "crates/watcher" } @@ -170,19 +171,3 @@ thiserror = "2.0" tokio = { version = "1.39", default-features = false } tokio-stream = { version = "0.1", default-features = false } tracing = "0.1.0" - -[patch.crates-io] -revm = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -revm-bytecode = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -revm-database = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -revm-state = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -revm-primitives = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -revm-interpreter = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -revm-inspector = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -revm-context = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -revm-context-interface = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -revm-database-interface = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -revm-specification = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } -op-revm = { git = "https://github.com/bluealloy/revm", rev = "19a5f3b" } - -revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "9219073" } diff --git a/bin/bridge/src/main.rs b/bin/bridge/src/main.rs deleted file mode 100644 index 8f77958c..00000000 --- a/bin/bridge/src/main.rs +++ /dev/null @@ -1,47 +0,0 @@ -#[global_allocator] -static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator(); - -fn main() { - use clap::Parser; - use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher}; - use reth_provider::providers::BlockchainProvider; - use reth_scroll_cli::{Cli, ScrollChainSpecParser, ScrollRollupArgs}; - use reth_scroll_node::{ScrollAddOns, ScrollNode}; - reth_cli_util::sigsegv_handler::install(); - - // Enable backtraces unless a RUST_BACKTRACE value has already been explicitly provided. - if std::env::var_os("RUST_BACKTRACE").is_none() { - std::env::set_var("RUST_BACKTRACE", "1"); - } - - if let Err(err) = Cli::::parse() - .run::<_, _, ScrollNode>(|builder, _| async move { - let engine_tree_config = TreeConfig::default() - .with_persistence_threshold(builder.config().engine.persistence_threshold) - .with_memory_block_buffer_target( - builder.config().engine.memory_block_buffer_target, - ); - let handle = builder - .with_types_and_provider::>() - // Override the network builder with the `ScrollBridgeNetworkBuilder` - .with_components( - ScrollNode::components().network(scroll_bridge::ScrollBridgeNetworkBuilder), - ) - .with_add_ons(ScrollAddOns::default()) - .launch_with_fn(|builder| { - let launcher = EngineNodeLauncher::new( - builder.task_executor().clone(), - builder.config().datadir(), - engine_tree_config, - ); - builder.launch_with(launcher) - }) - .await?; - - handle.node_exit_future.await - }) - { - eprintln!("Error: {err:?}"); - std::process::exit(1); - } -} diff --git a/bin/bridge/Cargo.toml b/bin/rollup/Cargo.toml similarity index 89% rename from bin/bridge/Cargo.toml rename to bin/rollup/Cargo.toml index ee8da682..6077a21e 100644 --- a/bin/bridge/Cargo.toml +++ b/bin/rollup/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "scroll-bridge" +name = "rollup-node" version.workspace = true edition.workspace = true rust-version.workspace = true @@ -9,6 +9,7 @@ exclude.workspace = true [dependencies] # alloy alloy-chains.workspace = true +alloy-provider.workspace = true alloy-rpc-types-engine.workspace = true # scroll-alloy @@ -41,13 +42,18 @@ reth-scroll-primitives = { workspace = true } scroll-wire.workspace = true scroll-network.workspace = true scroll-engine = { workspace = true, features = ["test-utils"] } +scroll-db = { workspace = true } +scroll-migration.workspace = true # rollup-node rollup-node-manager.workspace = true +rollup-node-indexer.workspace = true +rollup-node-watcher.workspace = true # misc clap = { version = "4", features = ["derive", "env"] } eyre.workspace = true +reqwest = { version = "0.12", default-features = false } secp256k1 = { workspace = true, features = ["global-context", "recovery"] } tokio = { workspace = true, features = ["full"] } tracing.workspace = true @@ -79,13 +85,15 @@ test-utils = [ "scroll-engine/test-utils", "reth-payload-builder/test-utils", "reth-payload-builder/test-utils", + "rollup-node-watcher/test-utils", + "scroll-db/test-utils", + "scroll-db/test-utils", ] serde = [ "alloy-primitives/serde", "alloy-rpc-types-engine/serde", "reth-eth-wire-types/serde", "reth-network/serde", - "reth-provider/serde", "reth-scroll-primitives/serde", "scroll-alloy-consensus/serde", "scroll-alloy-rpc-types-engine/serde", @@ -95,9 +103,10 @@ serde = [ "secp256k1/serde", "rollup-node-manager/serde", "alloy-chains/serde", + "reth-transaction-pool/serde", ] [[bin]] -name = "bridge" +name = "rollup-node" path = "src/main.rs" required-features = ["serde"] diff --git a/bin/bridge/assets/block_1.json b/bin/rollup/assets/block_1.json similarity index 100% rename from bin/bridge/assets/block_1.json rename to bin/rollup/assets/block_1.json diff --git a/bin/bridge/assets/block_2.json b/bin/rollup/assets/block_2.json similarity index 100% rename from bin/bridge/assets/block_2.json rename to bin/rollup/assets/block_2.json diff --git a/bin/bridge/assets/block_3.json b/bin/rollup/assets/block_3.json similarity index 100% rename from bin/bridge/assets/block_3.json rename to bin/rollup/assets/block_3.json diff --git a/bin/bridge/assets/block_4.json b/bin/rollup/assets/block_4.json similarity index 100% rename from bin/bridge/assets/block_4.json rename to bin/rollup/assets/block_4.json diff --git a/bin/bridge/assets/block_5.json b/bin/rollup/assets/block_5.json similarity index 100% rename from bin/bridge/assets/block_5.json rename to bin/rollup/assets/block_5.json diff --git a/bin/bridge/assets/genesis.json b/bin/rollup/assets/genesis.json similarity index 100% rename from bin/bridge/assets/genesis.json rename to bin/rollup/assets/genesis.json diff --git a/bin/bridge/assets/jwt.hex b/bin/rollup/assets/jwt.hex similarity index 100% rename from bin/bridge/assets/jwt.hex rename to bin/rollup/assets/jwt.hex diff --git a/bin/bridge/assets/reth-mainnet.service b/bin/rollup/assets/reth-mainnet.service similarity index 100% rename from bin/bridge/assets/reth-mainnet.service rename to bin/rollup/assets/reth-mainnet.service diff --git a/bin/rollup/src/args.rs b/bin/rollup/src/args.rs new file mode 100644 index 00000000..8c31a4b4 --- /dev/null +++ b/bin/rollup/src/args.rs @@ -0,0 +1,17 @@ +use std::path::PathBuf; + +/// A struct that represents the arguments for the rollup node. +#[derive(Debug, clap::Args)] +pub struct ScrollRollupNodeArgs { + /// A bool to represent if new blocks should be bridged from the eth wire protocol to the + /// scroll wire protocol. + pub enable_eth_scroll_wire_bridge: bool, + /// A bool that represents if the scroll wire protocol should be enabled. + pub enable_scroll_wire: bool, + /// Database path + pub database_path: Option, + /// The URL for the L1 RPC URL. + pub l1_rpc_url: Option, + /// The EngineAPI URL. + pub engine_api_url: Option, +} diff --git a/bin/bridge/src/import.rs b/bin/rollup/src/import.rs similarity index 81% rename from bin/bridge/src/import.rs rename to bin/rollup/src/import.rs index 34c2f806..5e4b350d 100644 --- a/bin/bridge/src/import.rs +++ b/bin/rollup/src/import.rs @@ -1,6 +1,5 @@ -use reth_network::{import::BlockImport as RethBlockImport, NetworkPrimitives}; +use reth_network::import::{BlockImport as RethBlockImport, NewBlockEvent}; use reth_network_peers::PeerId; -use reth_scroll_node::ScrollNetworkPrimitives; use reth_scroll_primitives::ScrollBlock; use scroll_network::NewBlockWithPeer; use secp256k1::ecdsa::Signature; @@ -63,22 +62,23 @@ impl RethBlockImport for BridgeBlockImport fn on_new_block( &mut self, peer_id: PeerId, - incoming_block: reth_network::message::NewBlockMessage< - ::Block, - >, + incoming_block: NewBlockEvent, ) { // We then delegate the block import to the inner block import. - self.bridge_new_block_to_scroll_wire(peer_id, incoming_block.block); + match incoming_block { + NewBlockEvent::Block(block) => { + self.bridge_new_block_to_scroll_wire(peer_id, block.block) + } + NewBlockEvent::Hashes(_) => { + warn!(target: "scroll::bridge::import", peer_id = %peer_id, "Received NewBlockHashes event, expected NewBlock event"); + } + } } fn poll( &mut self, _cx: &mut Context<'_>, - ) -> Poll< - reth_network::import::BlockImportOutcome< - ::Block, - >, - > { + ) -> Poll> { Poll::Pending } } diff --git a/bin/bridge/src/lib.rs b/bin/rollup/src/lib.rs similarity index 52% rename from bin/bridge/src/lib.rs rename to bin/rollup/src/lib.rs index bf3577b1..038f7e16 100644 --- a/bin/bridge/src/lib.rs +++ b/bin/rollup/src/lib.rs @@ -1,7 +1,10 @@ //! Scroll Network Bridge Components. +mod args; +pub use args::ScrollRollupNodeArgs; + mod import; pub use import::BridgeBlockImport; mod network; -pub use network::ScrollBridgeNetworkBuilder; +pub use network::ScrollRollupNetworkBuilder; diff --git a/bin/rollup/src/main.rs b/bin/rollup/src/main.rs new file mode 100644 index 00000000..5373ca99 --- /dev/null +++ b/bin/rollup/src/main.rs @@ -0,0 +1,49 @@ +#[global_allocator] +static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator(); + +fn main() { + use clap::Parser; + use reth_node_builder::{EngineNodeLauncher, TreeConfig}; + use reth_provider::providers::BlockchainProvider; + use reth_scroll_cli::{Cli, ScrollChainSpecParser}; + use reth_scroll_node::{ScrollAddOns, ScrollNode}; + reth_cli_util::sigsegv_handler::install(); + use rollup_node::ScrollRollupNodeArgs; + + // Enable backtraces unless a RUST_BACKTRACE value has already been explicitly provided. + if std::env::var_os("RUST_BACKTRACE").is_none() { + std::env::set_var("RUST_BACKTRACE", "1"); + } + + if let Err(err) = Cli::::parse() + .run::<_, _, ScrollNode>(|builder, scroll_bridge_node_args| async move { + let engine_tree_config = TreeConfig::default() + .with_persistence_threshold(builder.config().engine.persistence_threshold) + .with_memory_block_buffer_target( + builder.config().engine.memory_block_buffer_target, + ); + let handle = + builder + .with_types_and_provider::>() + // Override the network builder with the `ScrollBridgeNetworkBuilder` + .with_components(ScrollNode::components().network( + rollup_node::ScrollRollupNetworkBuilder::new(scroll_bridge_node_args), + )) + .with_add_ons(ScrollAddOns::default()) + .launch_with_fn(|builder| { + let launcher = EngineNodeLauncher::new( + builder.task_executor().clone(), + builder.config().datadir(), + engine_tree_config, + ); + builder.launch_with(launcher) + }) + .await?; + + handle.node_exit_future.await + }) + { + eprintln!("Error: {err:?}"); + std::process::exit(1); + } +} diff --git a/bin/bridge/src/network.rs b/bin/rollup/src/network.rs similarity index 55% rename from bin/bridge/src/network.rs rename to bin/rollup/src/network.rs index d867f866..385974b7 100644 --- a/bin/bridge/src/network.rs +++ b/bin/rollup/src/network.rs @@ -1,4 +1,6 @@ -use reth_network::{config::NetworkMode, NetworkConfig, NetworkManager, PeersInfo}; +use alloy_provider::ProviderBuilder; +use migration::MigratorTrait; +use reth_network::{config::NetworkMode, NetworkManager, PeersInfo}; use reth_node_api::TxTy; use reth_node_builder::{components::NetworkBuilder, BuilderContext, FullNodeTypes}; use reth_node_types::NodeTypes; @@ -6,18 +8,33 @@ use reth_rpc_builder::config::RethRpcServerConfig; use reth_scroll_chainspec::ScrollChainSpec; use reth_scroll_primitives::ScrollPrimitives; use reth_transaction_pool::{PoolTransaction, TransactionPool}; +use rollup_node_indexer::Indexer; use rollup_node_manager::{PoAConsensus, RollupNodeManager}; +use rollup_node_watcher::L1Watcher; use scroll_alloy_provider::ScrollAuthEngineApiProvider; +use scroll_db::{Database, DatabaseConnectionProvider}; use scroll_engine::{test_utils::NoopExecutionPayloadProvider, EngineDriver, ForkchoiceState}; use scroll_network::NetworkManager as ScrollNetworkManager; use scroll_wire::{ProtocolHandler, ScrollWireConfig}; +use std::{path::PathBuf, sync::Arc}; use tracing::info; +use crate::ScrollRollupNodeArgs; + /// The network builder for the eth-wire to scroll-wire bridge. -#[derive(Debug, Default)] -pub struct ScrollBridgeNetworkBuilder; +#[derive(Debug)] +pub struct ScrollRollupNetworkBuilder { + config: ScrollRollupNodeArgs, +} -impl NetworkBuilder for ScrollBridgeNetworkBuilder +impl ScrollRollupNetworkBuilder { + /// Returns a new [`ScrollRollupNetworkBuilder`] instance with the provided config. + pub fn new(config: ScrollRollupNodeArgs) -> Self { + Self { config } + } +} + +impl NetworkBuilder for ScrollRollupNetworkBuilder where Node: FullNodeTypes>, @@ -37,21 +54,28 @@ where pool: Pool, ) -> eyre::Result> { // Create a new block channel to bridge between eth-wire and scroll-wire protocols. - let (new_block_tx, new_block_rx) = tokio::sync::mpsc::unbounded_channel(); + let (block_tx, block_rx) = + if self.config.enable_eth_scroll_wire_bridge & self.config.enable_scroll_wire { + let (tx, rx) = tokio::sync::mpsc::unbounded_channel(); + (Some(tx), Some(rx)) + } else { + (None, None) + }; // Create a scroll-wire protocol handler. let (scroll_wire_handler, events) = ProtocolHandler::new(ScrollWireConfig::new(true)); // Create the network configuration. - let config = ctx.network_config()?; - let mut config = NetworkConfig { - network_mode: NetworkMode::Work, - block_import: Box::new(super::BridgeBlockImport::new(new_block_tx.clone())), - ..config - }; + let mut config = ctx.network_config()?; + config.network_mode = NetworkMode::Work; + if let Some(tx) = block_tx { + config.block_import = Box::new(super::BridgeBlockImport::new(tx.clone())) + } // Add the scroll-wire protocol handler to the network config. - config.extra_protocols.push(scroll_wire_handler); + if self.config.enable_scroll_wire { + config.extra_protocols.push(scroll_wire_handler); + } // Create the network manager. let network = NetworkManager::::builder(config).await?; @@ -69,18 +93,45 @@ where let engine_api = ScrollAuthEngineApiProvider::new( auth_secret, - format!("http://localhost:{auth_port}").parse()?, + self.config.engine_api_url.unwrap_or(format!("http://localhost:{auth_port}").parse()?), ); let engine = EngineDriver::new(engine_api, payload_provider); + // Instantiate the database + let database_path = if let Some(db_path) = self.config.database_path { + db_path + } else { + PathBuf::from("sqlite://").join(ctx.config().datadir().db().join("scroll.db")) + }; + let db = Database::new(database_path.to_str().unwrap()).await?; + + // Run the database migrations + migration::Migrator::up(db.get_connection(), None).await?; + + // Wrap the database in an Arc + let db = Arc::new(db); + + // Spawn the indexer + let indexer = Indexer::new(db.clone()); + + // Spawn the L1Watcher + let l1_notification_rx = if let Some(l1_rpc_url) = self.config.l1_rpc_url { + Some(L1Watcher::spawn(ProviderBuilder::new().on_http(l1_rpc_url), 20035952).await) + } else { + None + }; + + // Spawn the rollup node manager let rollup_node_manager = RollupNodeManager::new( scroll_network_manager, engine, + l1_notification_rx, + indexer, ForkchoiceState::genesis( ctx.config().chain.chain.try_into().expect("must be a named chain"), ), consensus, - new_block_rx, + block_rx, ); ctx.task_executor().spawn(rollup_node_manager); diff --git a/bin/bridge/tests/e2e.rs b/bin/rollup/tests/e2e.rs similarity index 94% rename from bin/bridge/tests/e2e.rs rename to bin/rollup/tests/e2e.rs index 5a9fd159..42ace7dd 100644 --- a/bin/bridge/tests/e2e.rs +++ b/bin/rollup/tests/e2e.rs @@ -14,6 +14,7 @@ use reth_scroll_chainspec::ScrollChainSpec; use reth_scroll_engine_primitives::ScrollPayloadBuilderAttributes; use reth_scroll_node::{ScrollNetworkPrimitives, ScrollNode}; use reth_tasks::TaskManager; +use rollup_node::ScrollRollupNodeArgs; use scroll_alloy_rpc_types_engine::ScrollPayloadAttributes; use scroll_network::{NewBlockWithPeer, SCROLL_MAINNET}; use scroll_wire::ScrollWireConfig; @@ -131,12 +132,20 @@ pub async fn build_bridge_node( // Create the node for a bridge node that will bridge messages from the eth-wire protocol // to the scroll-wire protocol. + let node_args = ScrollRollupNodeArgs { + enable_eth_scroll_wire_bridge: true, + enable_scroll_wire: true, + database_path: Some(PathBuf::from("sqlite::memory:")), + l1_rpc_url: None, + engine_api_url: None, + }; let node = ScrollNode; let NodeHandle { node, node_exit_future: _ } = NodeBuilder::new(node_config.clone()) .testing_node(exec.clone()) .with_types_and_provider::>() .with_components( - node.components_builder().network(scroll_bridge::ScrollBridgeNetworkBuilder), + node.components_builder() + .network(rollup_node::ScrollRollupNetworkBuilder::new(node_args)), ) .with_add_ons(node.add_ons()) .launch() diff --git a/crates/codec/Cargo.toml b/crates/codec/Cargo.toml index a7fcf846..f0b9a243 100644 --- a/crates/codec/Cargo.toml +++ b/crates/codec/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "scroll-codec" version = "0.1.0" -edition = "2024" +edition = "2021" [dependencies] # alloy diff --git a/crates/codec/src/decoding/macros.rs b/crates/codec/src/decoding/macros.rs index ca2fee94..93434b1a 100644 --- a/crates/codec/src/decoding/macros.rs +++ b/crates/codec/src/decoding/macros.rs @@ -1,7 +1,9 @@ /// Copies the provided slice into $ty using $ty::from_be_bytes and advances the buffer. #[macro_export] macro_rules! from_be_bytes_slice_and_advance_buf { - ($ty: ty, $slice: expr) => {{ $crate::from_be_bytes_slice_and_advance_buf!($ty, ::std::mem::size_of::<$ty>(), $slice) }}; + ($ty: ty, $slice: expr) => {{ + $crate::from_be_bytes_slice_and_advance_buf!($ty, ::std::mem::size_of::<$ty>(), $slice) + }}; ($ty:ty, $size: expr, $slice: expr) => {{ let mut arr = [0u8; ::std::mem::size_of::<$ty>()]; let size = $size; diff --git a/crates/codec/src/decoding/transaction.rs b/crates/codec/src/decoding/transaction.rs index c8967f90..ae116988 100644 --- a/crates/codec/src/decoding/transaction.rs +++ b/crates/codec/src/decoding/transaction.rs @@ -1,4 +1,4 @@ -use alloy_primitives::{Bytes, bytes::Buf}; +use alloy_primitives::{bytes::Buf, Bytes}; use alloy_rlp::Header; /// A RLP encoded transaction. diff --git a/crates/codec/src/decoding/v0/block_context.rs b/crates/codec/src/decoding/v0/block_context.rs index 4b3759ba..586112e2 100644 --- a/crates/codec/src/decoding/v0/block_context.rs +++ b/crates/codec/src/decoding/v0/block_context.rs @@ -1,6 +1,6 @@ -use crate::{BlockContext, from_be_bytes_slice_and_advance_buf}; +use crate::{from_be_bytes_slice_and_advance_buf, BlockContext}; -use alloy_primitives::{U256, bytes::Buf}; +use alloy_primitives::{bytes::Buf, U256}; #[derive(Debug)] pub(crate) struct BlockContextV0 { diff --git a/crates/codec/src/decoding/v0/mod.rs b/crates/codec/src/decoding/v0/mod.rs index 7acfb611..924be9e5 100644 --- a/crates/codec/src/decoding/v0/mod.rs +++ b/crates/codec/src/decoding/v0/mod.rs @@ -3,7 +3,7 @@ pub(crate) use block_context::BlockContextV0; mod block_context; -use crate::{L2Block, decoding::transaction::Transaction, error::DecodingError}; +use crate::{decoding::transaction::Transaction, error::DecodingError, L2Block}; use std::vec::Vec; use alloy_primitives::bytes::Buf; @@ -57,7 +57,7 @@ mod tests { use super::*; use crate::BlockContext; - use alloy_primitives::{U256, bytes}; + use alloy_primitives::{bytes, U256}; #[test] fn test_should_decode_v0() -> eyre::Result<()> { diff --git a/crates/codec/src/decoding/v1/mod.rs b/crates/codec/src/decoding/v1/mod.rs index fc212b8f..b2a777ce 100644 --- a/crates/codec/src/decoding/v1/mod.rs +++ b/crates/codec/src/decoding/v1/mod.rs @@ -1,12 +1,12 @@ use crate::{ - L2Block, check_buf_len, + check_buf_len, decoding::{blob::BlobSliceIter, transaction::Transaction, v0::BlockContextV0}, error::DecodingError, - from_be_bytes_slice_and_advance_buf, + from_be_bytes_slice_and_advance_buf, L2Block, }; use std::vec::Vec; -use alloy_primitives::{Bytes, bytes::Buf}; +use alloy_primitives::{bytes::Buf, Bytes}; use alloy_sol_types::SolCall; use scroll_l1::abi::calls::commitBatchCall; @@ -89,9 +89,9 @@ pub(crate) fn decode_v1_chunk( #[cfg(test)] mod tests { use super::*; - use crate::{BlockContext, decoding::test_utils::read_to_bytes}; + use crate::{decoding::test_utils::read_to_bytes, BlockContext}; - use alloy_primitives::{U256, bytes}; + use alloy_primitives::{bytes, U256}; #[test] fn test_should_decode_v1() -> eyre::Result<()> { diff --git a/crates/codec/src/decoding/v2/mod.rs b/crates/codec/src/decoding/v2/mod.rs index 644b7177..27fdc607 100644 --- a/crates/codec/src/decoding/v2/mod.rs +++ b/crates/codec/src/decoding/v2/mod.rs @@ -1,10 +1,10 @@ pub mod zstd; use crate::{ - L2Block, check_buf_len, + check_buf_len, decoding::{blob::BlobSliceIter, v1::decode_v1_chunk, v2::zstd::decompress_blob_data}, error::DecodingError, - from_be_bytes_slice_and_advance_buf, + from_be_bytes_slice_and_advance_buf, L2Block, }; use std::vec::Vec; @@ -47,9 +47,9 @@ pub fn decode_v2(calldata: &[u8], blob: &[u8]) -> Result, DecodingE #[cfg(test)] mod tests { use super::*; - use crate::{BlockContext, decoding::test_utils::read_to_bytes}; + use crate::{decoding::test_utils::read_to_bytes, BlockContext}; - use alloy_primitives::{U256, bytes}; + use alloy_primitives::{bytes, U256}; #[test] fn test_should_decode_v2() -> eyre::Result<()> { diff --git a/crates/codec/src/decoding/v4/mod.rs b/crates/codec/src/decoding/v4/mod.rs index fc583147..834a4134 100644 --- a/crates/codec/src/decoding/v4/mod.rs +++ b/crates/codec/src/decoding/v4/mod.rs @@ -1,8 +1,8 @@ use crate::{ - L2Block, check_buf_len, + check_buf_len, decoding::{blob::BlobSliceIter, v1::decode_v1_chunk, v2::zstd::decompress_blob_data}, error::DecodingError, - from_be_bytes_slice_and_advance_buf, + from_be_bytes_slice_and_advance_buf, L2Block, }; use std::vec::Vec; @@ -45,9 +45,9 @@ pub fn decode_v4(calldata: &[u8], blob: &[u8]) -> Result, DecodingE #[cfg(test)] mod tests { use super::*; - use crate::{BlockContext, decoding::test_utils::read_to_bytes}; + use crate::{decoding::test_utils::read_to_bytes, BlockContext}; - use alloy_primitives::{U256, bytes}; + use alloy_primitives::{bytes, U256}; #[test] fn test_should_decode_v4_uncompressed() -> eyre::Result<()> { diff --git a/crates/codec/src/decoding/v7/block_context.rs b/crates/codec/src/decoding/v7/block_context.rs index 76b592b0..04b37ecf 100644 --- a/crates/codec/src/decoding/v7/block_context.rs +++ b/crates/codec/src/decoding/v7/block_context.rs @@ -1,6 +1,6 @@ -use crate::{BlockContext, from_be_bytes_slice_and_advance_buf}; +use crate::{from_be_bytes_slice_and_advance_buf, BlockContext}; -use alloy_primitives::{U256, bytes::Buf}; +use alloy_primitives::{bytes::Buf, U256}; #[derive(Debug)] pub(crate) struct BlockContextV7 { diff --git a/crates/codec/src/decoding/v7/mod.rs b/crates/codec/src/decoding/v7/mod.rs index 686c4424..542ce6ae 100644 --- a/crates/codec/src/decoding/v7/mod.rs +++ b/crates/codec/src/decoding/v7/mod.rs @@ -2,14 +2,14 @@ pub(crate) use block_context::BlockContextV7; mod block_context; use crate::{ - L2Block, check_buf_len, + check_buf_len, decoding::{blob::BlobSliceIter, transaction::Transaction, v2::zstd::decompress_blob_data}, error::DecodingError, - from_be_bytes_slice_and_advance_buf, + from_be_bytes_slice_and_advance_buf, L2Block, }; use std::vec::Vec; -use alloy_primitives::{B256, bytes::Buf}; +use alloy_primitives::{bytes::Buf, B256}; /// The offset in the blob to the payload envelope. const BLOB_ENVELOPE_V7_OFFSET_PAYLOAD: usize = 5; @@ -96,9 +96,9 @@ pub(crate) fn decode_v7_payload(blob: &[u8]) -> Result<(Vec, B256, B256 #[cfg(test)] mod tests { use super::*; - use crate::{BlockContext, decoding::test_utils::read_to_bytes}; + use crate::{decoding::test_utils::read_to_bytes, BlockContext}; - use alloy_primitives::{U256, bytes}; + use alloy_primitives::{bytes, U256}; #[test] fn test_should_decode_v7_uncompressed() -> eyre::Result<()> { diff --git a/crates/node/Cargo.toml b/crates/node/Cargo.toml index 7a7fac9e..86e8e1ac 100644 --- a/crates/node/Cargo.toml +++ b/crates/node/Cargo.toml @@ -28,6 +28,8 @@ scroll-wire.workspace = true # rollup node rollup-node-primitives.workspace = true +rollup-node-indexer.workspace = true +rollup-node-watcher.workspace = true # misc futures.workspace = true diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs index 85ee1dba..91f96a59 100644 --- a/crates/node/src/lib.rs +++ b/crates/node/src/lib.rs @@ -6,6 +6,8 @@ use alloy_rpc_types_engine::{ }; use futures::{stream::FuturesOrdered, StreamExt}; use reth_tokio_util::{EventSender, EventStream}; +use rollup_node_indexer::Indexer; +use rollup_node_watcher::L1Notification; use scroll_alloy_network::Scroll as ScrollNetwork; use scroll_alloy_provider::ScrollEngineApi; use scroll_engine::{EngineDriver, EngineDriverError, ExecutionPayloadProvider, ForkchoiceState}; @@ -20,8 +22,8 @@ use std::{ sync::Arc, task::{Context, Poll}, }; -use tokio::sync::mpsc::UnboundedReceiver; -use tokio_stream::wrappers::UnboundedReceiverStream; +use tokio::sync::mpsc::{Receiver, UnboundedReceiver}; +use tokio_stream::wrappers::{ReceiverStream, UnboundedReceiverStream}; use tracing::{error, trace}; mod event; @@ -58,10 +60,14 @@ pub struct RollupNodeManager { network: NetworkManager, /// The engine driver used to communicate with the engine. engine: Arc>, + /// A receiver for [`L1Notification`]s from the [`rollup_node_watcher::L1Watcher`]. + l1_notification_rx: Option>>, + /// An indexer used to index data for the rollup node. + indexer: Indexer, /// The consensus algorithm used by the rollup node. consensus: C, /// The receiver for new blocks received from the network (used to bridge from eth-wire). - new_block_rx: UnboundedReceiverStream, + new_block_rx: Option>, /// The forkchoice state of the rollup node. forkchoice_state: ForkchoiceState, /// A collection of pending block imports. @@ -80,15 +86,19 @@ where pub fn new( network: NetworkManager, engine: EngineDriver, + l1_notification_rx: Option>>, + indexer: Indexer, forkchoice_state: ForkchoiceState, consensus: C, - new_block_rx: UnboundedReceiver, + new_block_rx: Option>, ) -> Self { Self { network, engine: Arc::new(engine), + l1_notification_rx: l1_notification_rx.map(Into::into), + indexer, consensus, - new_block_rx: new_block_rx.into(), + new_block_rx: new_block_rx.map(Into::into), forkchoice_state, pending_block_imports: FuturesOrdered::new(), event_sender: None, @@ -211,6 +221,11 @@ where self.network.handle().block_import_outcome(outcome); } } + + /// Handles an [`L1Notification`] from the L1 watcher. + fn handle_l1_notification(&mut self, notification: L1Notification) { + self.indexer.handle_l1_notification(notification); + } } impl Future for RollupNodeManager @@ -231,8 +246,22 @@ where this.handle_block_import_outcome(block_info, outcome); } + // Drain all L1 notifications. + while let Some(Poll::Ready(Some(event))) = + this.l1_notification_rx.as_mut().map(|x| x.poll_next_unpin(cx)) + { + this.handle_l1_notification((*event).clone()); + } + + // Drain all Indexer events + while let Poll::Ready(Some(event)) = this.indexer.poll_next_unpin(cx) { + tracing::trace!(target: "scroll::node::manager", "Received indexer event: {:?}", event); + } + // Handle blocks received from the eth-wire protocol. - while let Poll::Ready(Some(block)) = this.new_block_rx.poll_next_unpin(cx) { + while let Some(Poll::Ready(Some(block))) = + this.new_block_rx.as_mut().map(|new_block_rx| new_block_rx.poll_next_unpin(cx)) + { this.handle_new_block(block, cx); } diff --git a/crates/scroll-wire/Cargo.toml b/crates/scroll-wire/Cargo.toml index 1d2a1d90..05cfcfb9 100644 --- a/crates/scroll-wire/Cargo.toml +++ b/crates/scroll-wire/Cargo.toml @@ -15,13 +15,12 @@ alloy-primitives = { workspace = true, features = ["map-foldhash"] } alloy-rlp = { version = "0.3.10", default-features = false } # reth -reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git" } +reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", default-features = false } reth-network.workspace = true reth-network-api.workspace = true -reth-primitives.workspace = true # scroll -reth-scroll-primitives = { workspace = true, features = ["serde"] } +reth-scroll-primitives = { workspace = true } # misc futures.workspace = true diff --git a/crates/watcher/src/lib.rs b/crates/watcher/src/lib.rs index e007d187..41fe8576 100644 --- a/crates/watcher/src/lib.rs +++ b/crates/watcher/src/lib.rs @@ -79,7 +79,7 @@ pub struct L1Watcher { } /// The L1 notification type yielded by the [`L1Watcher`]. -#[derive(Debug, PartialEq, Eq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub enum L1Notification { /// A notification for a reorg of the L1 up to a given block number. Reorg(u64),