diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index b70113e2..1fb05852 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -128,11 +128,11 @@ jobs: - type: wasm target: wasm32-unknown-unknown exclude: | - scroll-engine,scroll-wire,rollup-node,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,scroll-codec,scroll-derivation-pipeline,rollup-node-providers,rollup-node-sequencer,rollup-node-signer,tests + scroll-engine,scroll-wire,rollup-node,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,scroll-codec,scroll-derivation-pipeline,rollup-node-providers,rollup-node-sequencer,rollup-node-signer,tests,rollup-node-primitives - type: riscv target: riscv32imac-unknown-none-elf exclude: | - scroll-engine,scroll-wire,rollup-node,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,scroll-codec,scroll-derivation-pipeline,rollup-node-providers,rollup-node-sequencer,rollup-node-signer,tests + scroll-engine,scroll-wire,rollup-node,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,scroll-codec,scroll-derivation-pipeline,rollup-node-providers,rollup-node-sequencer,rollup-node-signer,tests,rollup-node-primitives steps: - uses: actions/checkout@v5 - uses: rui314/setup-mold@v1 diff --git a/Cargo.lock b/Cargo.lock index 2f00b76c..ccbd423d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,7 +146,7 @@ dependencies = [ "once_cell", "rand 0.8.5", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -172,7 +172,7 @@ dependencies = [ "secp256k1 0.30.0", "serde", "serde_with", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -219,7 +219,7 @@ dependencies = [ "crc", "rand 0.8.5", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -248,7 +248,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_with", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -311,7 +311,7 @@ dependencies = [ "op-alloy-consensus", "op-revm", "revm", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -365,7 +365,7 @@ dependencies = [ "http 1.3.1", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", "tracing", ] @@ -392,7 +392,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -474,7 +474,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", "url", @@ -522,7 +522,7 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -610,7 +610,7 @@ dependencies = [ "alloy-rpc-types-engine 0.14.0", "serde", "serde_with", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -626,7 +626,7 @@ dependencies = [ "ethereum_ssz_derive", "serde", "serde_with", - "thiserror 2.0.12", + "thiserror 2.0.14", "tree_hash", "tree_hash_derive", ] @@ -699,7 +699,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -728,7 +728,7 @@ dependencies = [ "alloy-serde 1.0.24", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -789,7 +789,7 @@ dependencies = [ "either", "elliptic-curve", "k256", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -806,7 +806,7 @@ dependencies = [ "aws-sdk-kms", "k256", "spki", - "thiserror 2.0.12", + "thiserror 2.0.14", "tracing", ] @@ -825,7 +825,7 @@ dependencies = [ "coins-bip39", "k256", "rand 0.8.5", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -839,7 +839,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -855,7 +855,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", "syn-solidity", "tiny-keccak", ] @@ -872,7 +872,7 @@ dependencies = [ "macro-string", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", "syn-solidity", ] @@ -914,7 +914,7 @@ dependencies = [ "parking_lot 0.12.4", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tower", "tracing", @@ -1009,7 +1009,7 @@ dependencies = [ "arrayvec", "derive_arbitrary", "derive_more", - "nybbles 0.4.1", + "nybbles 0.4.3", "proptest", "proptest-derive", "serde", @@ -1027,7 +1027,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -1103,9 +1103,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" [[package]] name = "aquamarine" @@ -1118,14 +1118,14 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] name = "arbitrary" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" dependencies = [ "derive_arbitrary", ] @@ -1260,7 +1260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -1298,7 +1298,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -1387,7 +1387,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -1476,18 +1476,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] name = "async-trait" -version = "0.1.88" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -1534,7 +1534,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -1545,9 +1545,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.4" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "483020b893cdef3d89637e428d588650c71cfae7ea2e6ecbaee4de4ff99fb2dd" +checksum = "c478f5b10ce55c9a33f87ca3404ca92768b144fc1bfdede7c0121214a8283a25" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1634,9 +1634,9 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "1.82.0" +version = "1.84.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5296e1ff23bcb95f58a8250e2d00525daf23888ed2021c05bdfdbf79e1531784" +checksum = "98037a2a0745914d2f0fee41acb6cf88a76f0ed31dd75753b4dc318aa5a4da39" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1656,9 +1656,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.79.0" +version = "1.81.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a847168f15b46329fa32c7aca4e4f1a2e072f9b422f0adb19756f2e1457f111" +checksum = "79ede098271e3471036c46957cba2ba30888f53bda2515bf04b560614a30a36e" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1678,9 +1678,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.80.0" +version = "1.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b654dd24d65568738593e8239aef279a86a15374ec926ae8714e2d7245f34149" +checksum = "43326f724ba2cc957e6f3deac0ca1621a3e5d4146f5970c24c8a108dac33070f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1700,9 +1700,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.81.0" +version = "1.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92ea8a7602321c83615c82b408820ad54280fb026e92de0eeea937342fafa24" +checksum = "a5468593c47efc31fdbe6c902d1a5fde8d9c82f78a3f8ccfe907b1e9434748cb" dependencies = [ "aws-credential-types", "aws-runtime", @@ -2046,7 +2046,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.104", + "syn 2.0.105", "which", ] @@ -2065,7 +2065,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -2199,7 +2199,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -2371,7 +2371,7 @@ dependencies = [ "semver 1.0.26", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -2498,9 +2498,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.43" +version = "4.5.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f" +checksum = "1fc0e74a703892159f5ae7d3aac52c8e6c392f5ae5f359c70b5881d60aaac318" dependencies = [ "clap_builder", "clap_derive", @@ -2508,9 +2508,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.43" +version = "4.5.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65" +checksum = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8" dependencies = [ "anstream", "anstyle", @@ -2520,14 +2520,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.41" +version = "4.5.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" +checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -2960,7 +2960,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -2984,7 +2984,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -2995,7 +2995,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3048,7 +3048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976" dependencies = [ "data-encoding", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3108,18 +3108,18 @@ checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] name = "derive_arbitrary" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" +checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3140,7 +3140,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3150,7 +3150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3171,7 +3171,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", "unicode-xid", ] @@ -3285,7 +3285,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3361,7 +3361,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3445,7 +3445,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3465,7 +3465,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3476,7 +3476,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3563,7 +3563,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3810,7 +3810,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -3943,9 +3943,9 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "gloo-net" @@ -4187,7 +4187,7 @@ dependencies = [ "rand 0.9.2", "ring", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tinyvec", "tokio", "tracing", @@ -4211,7 +4211,7 @@ dependencies = [ "resolv-conf", "serde", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -4625,7 +4625,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -4703,7 +4703,7 @@ checksum = "6c38228f24186d9cc68c729accb4d413be9eaed6ad07ff79e0270d9e56f3de13" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -4746,7 +4746,7 @@ dependencies = [ "indoc", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -4940,7 +4940,7 @@ dependencies = [ "rustls-pki-types", "rustls-platform-verifier", "soketto", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-rustls 0.26.2", "tokio-util", @@ -4968,7 +4968,7 @@ dependencies = [ "rustc-hash 2.1.1", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tower", @@ -4993,7 +4993,7 @@ dependencies = [ "rustls-platform-verifier", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tower", "url", @@ -5009,7 +5009,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -5031,7 +5031,7 @@ dependencies = [ "serde", "serde_json", "soketto", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tokio-util", @@ -5048,7 +5048,7 @@ dependencies = [ "http 1.3.1", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -5163,9 +5163,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.174" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "libgit2-sys" @@ -5209,7 +5209,7 @@ dependencies = [ "multihash", "quick-protobuf", "sha2 0.10.9", - "thiserror 2.0.12", + "thiserror 2.0.14", "tracing", "zeroize", ] @@ -5435,7 +5435,7 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -5491,7 +5491,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -5880,7 +5880,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -5911,9 +5911,9 @@ dependencies = [ [[package]] name = "nybbles" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675b3a54e5b12af997abc8b6638b0aee51a28caedab70d4967e0d5db3a3f1d06" +checksum = "63cb50036b1ad148038105af40aaa70ff24d8a14fbc44ae5c914e1348533d12e" dependencies = [ "alloy-rlp", "arbitrary", @@ -5970,7 +5970,7 @@ dependencies = [ "derive_more", "serde", "serde_with", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -5991,7 +5991,7 @@ dependencies = [ "op-alloy-consensus", "serde", "snap", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -6034,7 +6034,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -6091,7 +6091,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -6155,7 +6155,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -6260,7 +6260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" dependencies = [ "memchr", - "thiserror 2.0.12", + "thiserror 2.0.14", "ucd-trie", ] @@ -6314,7 +6314,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -6343,7 +6343,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -6481,7 +6481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2" dependencies = [ "proc-macro2", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -6532,14 +6532,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] name = "proc-macro2" -version = "1.0.96" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beef09f85ae72cea1ef96ba6870c51e6382ebfa4f0e85b643459331f3daa5be0" +checksum = "d61789d7719defeb74ea5fe81f2fdfdbd28a803847077cecce2ff14e1472f6f1" dependencies = [ "unicode-ident", ] @@ -6552,7 +6552,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", "version_check", "yansi", ] @@ -6620,7 +6620,7 @@ checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -6698,7 +6698,7 @@ dependencies = [ "rustc-hash 2.1.1", "rustls 0.23.31", "socket2 0.5.10", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", "web-time", @@ -6719,7 +6719,7 @@ dependencies = [ "rustls 0.23.31", "rustls-pki-types", "slab", - "thiserror 2.0.12", + "thiserror 2.0.14", "tinyvec", "tracing", "web-time", @@ -6872,9 +6872,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -6882,9 +6882,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -6933,7 +6933,7 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.16", "libredox", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -6953,7 +6953,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -7017,9 +7017,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.22" +version = "0.12.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" +checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" dependencies = [ "base64 0.22.1", "bytes", @@ -7110,7 +7110,7 @@ checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3" [[package]] name = "reth-basic-payload-builder" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7134,7 +7134,7 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7165,7 +7165,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-chains", "alloy-consensus 1.0.24", @@ -7185,7 +7185,7 @@ dependencies = [ [[package]] name = "reth-cli" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-genesis", "clap", @@ -7199,7 +7199,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "ahash 0.8.12", "alloy-chains", @@ -7272,7 +7272,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "reth-tasks", "tokio", @@ -7282,7 +7282,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-primitives", @@ -7293,13 +7293,13 @@ dependencies = [ "reth-fs-util", "secp256k1 0.30.0", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-codecs" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7319,18 +7319,18 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] name = "reth-config" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "eyre", "humantime-serde", @@ -7345,20 +7345,20 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", "auto_impl", "reth-execution-types", "reth-primitives-traits", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-consensus-common" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7370,7 +7370,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7395,7 +7395,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "derive_more", @@ -7415,13 +7415,13 @@ dependencies = [ "strum 0.27.2", "sysinfo", "tempfile", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-db-api" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-genesis", @@ -7450,7 +7450,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-genesis", @@ -7472,14 +7472,14 @@ dependencies = [ "reth-trie-db", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", "tracing", ] [[package]] name = "reth-db-models" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-primitives", @@ -7494,7 +7494,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7511,7 +7511,7 @@ dependencies = [ "schnellru", "secp256k1 0.30.0", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tracing", @@ -7520,7 +7520,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7536,7 +7536,7 @@ dependencies = [ "reth-metrics", "reth-network-peers", "secp256k1 0.30.0", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -7544,7 +7544,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "data-encoding", @@ -7559,7 +7559,7 @@ dependencies = [ "secp256k1 0.30.0", "serde", "serde_with", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tracing", @@ -7568,7 +7568,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7593,7 +7593,7 @@ dependencies = [ "reth-tasks", "reth-testing-utils", "tempfile", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tokio-util", @@ -7603,7 +7603,7 @@ dependencies = [ [[package]] name = "reth-e2e-test-utils" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7665,7 +7665,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "aes", "alloy-primitives", @@ -7685,7 +7685,7 @@ dependencies = [ "secp256k1 0.30.0", "sha2 0.10.9", "sha3", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tokio-util", @@ -7696,7 +7696,7 @@ dependencies = [ [[package]] name = "reth-engine-local" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", @@ -7719,7 +7719,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7737,14 +7737,14 @@ dependencies = [ "reth-trie", "reth-trie-common", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", ] [[package]] name = "reth-engine-service" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "futures", "pin-project", @@ -7761,13 +7761,13 @@ dependencies = [ "reth-prune", "reth-stages-api", "reth-tasks", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-engine-tree" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7812,7 +7812,7 @@ dependencies = [ "revm", "revm-primitives", "schnellru", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -7820,7 +7820,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-rpc-types-engine 1.0.24", @@ -7847,7 +7847,7 @@ dependencies = [ [[package]] name = "reth-era" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7857,13 +7857,13 @@ dependencies = [ "ethereum_ssz_derive", "reth-ethereum-primitives", "snap", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-era-downloader" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "bytes", @@ -7878,7 +7878,7 @@ dependencies = [ [[package]] name = "reth-era-utils" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", @@ -7902,18 +7902,18 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "reth-consensus", "reth-execution-errors", "reth-storage-errors", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-eth-wire" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-chains", "alloy-primitives", @@ -7931,7 +7931,7 @@ dependencies = [ "reth-primitives-traits", "serde", "snap", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tokio-util", @@ -7941,7 +7941,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-chains", "alloy-consensus 1.0.24", @@ -7956,13 +7956,13 @@ dependencies = [ "reth-ethereum-primitives", "reth-primitives-traits", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-ethereum-consensus" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -7978,7 +7978,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-primitives", @@ -7990,13 +7990,13 @@ dependencies = [ "reth-primitives-traits", "serde", "sha2 0.10.9", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-ethereum-forks" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -8010,7 +8010,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8037,7 +8037,7 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8055,7 +8055,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "rayon", "reth-db-api", @@ -8065,7 +8065,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8089,7 +8089,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8107,20 +8107,20 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-evm", "alloy-primitives", "alloy-rlp", - "nybbles 0.4.1", + "nybbles 0.4.3", "reth-storage-errors", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-execution-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8138,7 +8138,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8167,7 +8167,7 @@ dependencies = [ "reth-tasks", "reth-tracing", "rmp-serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-util", "tracing", @@ -8176,7 +8176,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-primitives", @@ -8190,17 +8190,17 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-invalid-block-hooks" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", @@ -8228,7 +8228,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "bytes", "futures", @@ -8237,7 +8237,7 @@ dependencies = [ "jsonrpsee", "pin-project", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tokio-util", @@ -8248,7 +8248,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "bitflags 2.9.1", "byteorder", @@ -8258,14 +8258,14 @@ dependencies = [ "parking_lot 0.12.4", "reth-mdbx-sys", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.14", "tracing", ] [[package]] name = "reth-mdbx-sys" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "bindgen 0.70.1", "cc", @@ -8274,7 +8274,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "futures", "metrics", @@ -8286,7 +8286,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", ] @@ -8294,13 +8294,13 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "futures-util", "if-addrs", "reqwest", "serde_with", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -8308,7 +8308,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8353,7 +8353,7 @@ dependencies = [ "secp256k1 0.30.0", "serde", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tokio-util", @@ -8363,7 +8363,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", @@ -8381,7 +8381,7 @@ dependencies = [ "reth-primitives-traits", "reth-tokio-util", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", ] @@ -8389,7 +8389,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8412,14 +8412,14 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "alloy-rlp", "enr", "secp256k1 0.30.0", "serde_with", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "url", ] @@ -8427,7 +8427,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -8441,7 +8441,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "anyhow", "bincode", @@ -8450,7 +8450,7 @@ dependencies = [ "memmap2", "reth-fs-util", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tracing", "zstd", ] @@ -8458,7 +8458,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-rpc-types-engine 1.0.24", "eyre", @@ -8482,7 +8482,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8548,7 +8548,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8589,7 +8589,7 @@ dependencies = [ "serde", "shellexpand", "strum 0.27.2", - "thiserror 2.0.12", + "thiserror 2.0.14", "toml", "tracing", "url", @@ -8600,7 +8600,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-network", @@ -8638,7 +8638,7 @@ dependencies = [ [[package]] name = "reth-node-ethstats" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", @@ -8651,7 +8651,7 @@ dependencies = [ "reth-transaction-pool", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tokio-tungstenite", @@ -8662,7 +8662,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8686,7 +8686,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "eyre", "http 1.3.1", @@ -8706,7 +8706,7 @@ dependencies = [ [[package]] name = "reth-node-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "reth-chainspec", "reth-db-api", @@ -8719,7 +8719,7 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8738,7 +8738,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", @@ -8759,7 +8759,7 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "pin-project", "reth-payload-primitives", @@ -8771,7 +8771,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-primitives", @@ -8784,14 +8784,14 @@ dependencies = [ "reth-primitives-traits", "scroll-alloy-rpc-types-engine", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", ] [[package]] name = "reth-payload-util" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", @@ -8801,7 +8801,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-rpc-types-engine 1.0.24", @@ -8811,7 +8811,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "arbitrary", @@ -8826,7 +8826,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8854,13 +8854,13 @@ dependencies = [ "secp256k1 0.30.0", "serde", "serde_with", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-provider" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8905,7 +8905,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -8925,7 +8925,7 @@ dependencies = [ "reth-static-file-types", "reth-tokio-util", "rustc-hash 2.1.1", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -8933,7 +8933,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "arbitrary", @@ -8941,13 +8941,13 @@ dependencies = [ "modular-bitfield", "reth-codecs", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-revm" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "reth-primitives-traits", @@ -8960,7 +8960,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-dyn-abi", @@ -9026,7 +9026,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tower", @@ -9037,7 +9037,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-genesis", @@ -9065,7 +9065,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-network", "alloy-provider", @@ -9092,7 +9092,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-util", "tower", @@ -9103,7 +9103,7 @@ dependencies = [ [[package]] name = "reth-rpc-convert" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-json-rpc", @@ -9122,13 +9122,13 @@ dependencies = [ "scroll-alloy-consensus", "scroll-alloy-evm", "scroll-alloy-rpc-types", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-rpc-engine-api" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-primitives", @@ -9150,7 +9150,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -9158,7 +9158,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-dyn-abi", @@ -9203,7 +9203,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9238,7 +9238,7 @@ dependencies = [ "revm-inspectors", "schnellru", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tracing", @@ -9247,7 +9247,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-rpc-types-engine 1.0.24", "http 1.3.1", @@ -9261,7 +9261,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-primitives", @@ -9277,7 +9277,7 @@ dependencies = [ [[package]] name = "reth-scroll-chainspec" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-chains", "alloy-consensus 1.0.24", @@ -9302,7 +9302,7 @@ dependencies = [ [[package]] name = "reth-scroll-cli" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "clap", "eyre", @@ -9326,7 +9326,7 @@ dependencies = [ [[package]] name = "reth-scroll-consensus" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", @@ -9338,14 +9338,14 @@ dependencies = [ "reth-primitives-traits", "reth-scroll-primitives", "scroll-alloy-hardforks", - "thiserror 2.0.12", + "thiserror 2.0.14", "tracing", ] [[package]] name = "reth-scroll-engine-primitives" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9370,7 +9370,7 @@ dependencies = [ [[package]] name = "reth-scroll-evm" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9392,14 +9392,14 @@ dependencies = [ "scroll-alloy-consensus", "scroll-alloy-evm", "scroll-alloy-hardforks", - "thiserror 2.0.12", + "thiserror 2.0.14", "tracing", ] [[package]] name = "reth-scroll-forks" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-chains", "alloy-primitives", @@ -9413,7 +9413,7 @@ dependencies = [ [[package]] name = "reth-scroll-node" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-genesis", @@ -9465,7 +9465,7 @@ dependencies = [ [[package]] name = "reth-scroll-payload" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", @@ -9489,14 +9489,14 @@ dependencies = [ "reth-transaction-pool", "revm", "scroll-alloy-hardforks", - "thiserror 2.0.12", + "thiserror 2.0.14", "tracing", ] [[package]] name = "reth-scroll-primitives" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9516,7 +9516,7 @@ dependencies = [ [[package]] name = "reth-scroll-rpc" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9549,7 +9549,7 @@ dependencies = [ "scroll-alloy-hardforks", "scroll-alloy-network", "scroll-alloy-rpc-types", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -9557,7 +9557,7 @@ dependencies = [ [[package]] name = "reth-scroll-txpool" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9580,7 +9580,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9622,7 +9622,7 @@ dependencies = [ "reth-trie-db", "serde", "tempfile", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -9630,7 +9630,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-primitives", @@ -9649,7 +9649,7 @@ dependencies = [ "reth-static-file", "reth-static-file-types", "reth-tokio-util", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -9657,7 +9657,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "arbitrary", @@ -9671,7 +9671,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "parking_lot 0.12.4", @@ -9691,7 +9691,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "clap", @@ -9703,7 +9703,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9727,7 +9727,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-eips 1.0.24", "alloy-primitives", @@ -9737,13 +9737,13 @@ dependencies = [ "reth-prune-types", "reth-static-file-types", "revm-database-interface", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] name = "reth-tasks" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "auto_impl", "dyn-clone", @@ -9752,7 +9752,7 @@ dependencies = [ "pin-project", "rayon", "reth-metrics", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", "tracing-futures", @@ -9761,7 +9761,7 @@ dependencies = [ [[package]] name = "reth-testing-utils" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9777,7 +9777,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "tokio", "tokio-stream", @@ -9787,7 +9787,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "clap", "eyre", @@ -9802,7 +9802,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9832,7 +9832,7 @@ dependencies = [ "schnellru", "serde", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tracing", @@ -9841,7 +9841,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -9866,7 +9866,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-primitives", @@ -9879,7 +9879,7 @@ dependencies = [ "derive_more", "hash-db", "itertools 0.14.0", - "nybbles 0.4.1", + "nybbles 0.4.3", "plain_hasher", "reth-codecs", "reth-primitives-traits", @@ -9891,7 +9891,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "reth-db-api", @@ -9904,7 +9904,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9921,7 +9921,7 @@ dependencies = [ "reth-trie-common", "reth-trie-db", "reth-trie-sparse", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -9929,7 +9929,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9947,7 +9947,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse-parallel" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9963,7 +9963,7 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "zstd", ] @@ -10112,7 +10112,7 @@ dependencies = [ "revm", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", ] [[package]] @@ -10409,7 +10409,7 @@ dependencies = [ "scroll-alloy-hardforks", "scroll-db", "strum 0.27.2", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", ] @@ -10464,7 +10464,11 @@ dependencies = [ "alloy-rpc-types-engine 1.0.24", "arbitrary", "derive_more", + "eyre", + "reth-chainspec", + "reth-node-core", "reth-primitives-traits", + "reth-scroll-chainspec", "reth-scroll-primitives", "scroll-alloy-consensus", "scroll-alloy-rpc-types-engine", @@ -10493,7 +10497,7 @@ dependencies = [ "scroll-alloy-rpc-types-engine", "scroll-db", "serde", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", ] @@ -10527,7 +10531,7 @@ dependencies = [ "scroll-db", "scroll-engine", "tempfile", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -10545,7 +10549,7 @@ dependencies = [ "reth-scroll-primitives", "reth-tracing", "rollup-node-primitives", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tracing", @@ -10577,7 +10581,7 @@ dependencies = [ "rollup-node-providers", "scroll-alloy-consensus", "scroll-l1", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -10953,7 +10957,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scroll-alloy-consensus" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -10972,7 +10976,7 @@ dependencies = [ [[package]] name = "scroll-alloy-evm" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -10990,7 +10994,7 @@ dependencies = [ [[package]] name = "scroll-alloy-hardforks" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-hardforks", "auto_impl", @@ -11000,7 +11004,7 @@ dependencies = [ [[package]] name = "scroll-alloy-network" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-network", @@ -11015,7 +11019,7 @@ dependencies = [ [[package]] name = "scroll-alloy-provider" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "alloy-provider", @@ -11033,14 +11037,14 @@ dependencies = [ "reth-scroll-engine-primitives", "scroll-alloy-network", "scroll-alloy-rpc-types-engine", - "thiserror 2.0.12", + "thiserror 2.0.14", "tower", ] [[package]] name = "scroll-alloy-rpc-types" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-consensus 1.0.24", "alloy-eips 1.0.24", @@ -11057,7 +11061,7 @@ dependencies = [ [[package]] name = "scroll-alloy-rpc-types-engine" version = "1.6.0" -source = "git+https://github.com/scroll-tech/reth.git#b364426fe29db2fbfe83ce4a6740296707409ff3" +source = "git+https://github.com/scroll-tech/reth.git#85a5d1d9c36df363b5f00e7982f265fdc5f2bf57" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine 1.0.24", @@ -11078,7 +11082,7 @@ dependencies = [ "scroll-alloy-consensus", "scroll-l1", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.14", "zstd", ] @@ -11098,7 +11102,7 @@ dependencies = [ "scroll-alloy-rpc-types-engine", "scroll-migration", "sea-orm", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -11122,7 +11126,7 @@ dependencies = [ "scroll-alloy-rpc-types-engine", "scroll-codec", "scroll-db", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -11160,7 +11164,7 @@ dependencies = [ "scroll-alloy-rpc-types-engine", "scroll-engine", "scroll-network", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tracing", ] @@ -11212,7 +11216,7 @@ dependencies = [ "reth-scroll-primitives", "reth-storage-api", "scroll-wire", - "thiserror 2.0.12", + "thiserror 2.0.14", "tokio", "tokio-stream", "tracing", @@ -11254,7 +11258,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -11279,7 +11283,7 @@ dependencies = [ "serde_json", "sqlx", "strum 0.26.3", - "thiserror 2.0.12", + "thiserror 2.0.14", "time", "tracing", "url", @@ -11314,7 +11318,7 @@ dependencies = [ "proc-macro2", "quote", "sea-bae", - "syn 2.0.104", + "syn 2.0.105", "unicode-ident", ] @@ -11377,8 +11381,8 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.104", - "thiserror 2.0.12", + "syn 2.0.105", + "thiserror 2.0.14", ] [[package]] @@ -11403,7 +11407,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -11560,7 +11564,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -11626,7 +11630,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -11772,7 +11776,7 @@ checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" dependencies = [ "num-bigint", "num-traits", - "thiserror 2.0.12", + "thiserror 2.0.14", "time", ] @@ -11924,7 +11928,7 @@ dependencies = [ "serde_json", "sha2 0.10.9", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.14", "time", "tokio", "tokio-stream", @@ -11943,7 +11947,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -11966,7 +11970,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.104", + "syn 2.0.105", "tokio", "url", ] @@ -12011,7 +12015,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.12", + "thiserror 2.0.14", "time", "tracing", "uuid", @@ -12054,7 +12058,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.12", + "thiserror 2.0.14", "time", "tracing", "uuid", @@ -12081,7 +12085,7 @@ dependencies = [ "serde", "serde_urlencoded", "sqlx-core", - "thiserror 2.0.12", + "thiserror 2.0.14", "time", "tracing", "url", @@ -12145,7 +12149,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -12157,7 +12161,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -12179,9 +12183,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.104" +version = "2.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +checksum = "7bc3fcb250e53458e712715cf74285c1f889686520d79294a9ef3bd7aa1fc619" dependencies = [ "proc-macro2", "quote", @@ -12197,7 +12201,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -12217,7 +12221,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -12316,11 +12320,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "0b0949c3a6c842cbde3f1686d6eea5a010516deb7085f79db747562d4102f41e" dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl 2.0.14", ] [[package]] @@ -12331,18 +12335,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "cc5b44b4ab9c2fdd0e0512e6bece8388e214c0749f5862b114cc5b7a25daf227" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -12468,7 +12472,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -12681,7 +12685,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -12800,7 +12804,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -12840,7 +12844,7 @@ dependencies = [ "rustls 0.23.31", "rustls-pki-types", "sha1", - "thiserror 2.0.12", + "thiserror 2.0.14", "utf-8", ] @@ -13014,9 +13018,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be" dependencies = [ "getrandom 0.3.3", "js-sys", @@ -13091,7 +13095,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -13171,7 +13175,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", "wasm-bindgen-shared", ] @@ -13206,7 +13210,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -13476,7 +13480,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -13487,7 +13491,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -13498,7 +13502,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -13509,7 +13513,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -13520,7 +13524,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -13531,7 +13535,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -13951,7 +13955,7 @@ dependencies = [ "pharos", "rustc_version 0.4.1", "send_wrapper 0.6.0", - "thiserror 2.0.12", + "thiserror 2.0.14", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -14008,7 +14012,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", "synstructure", ] @@ -14029,7 +14033,7 @@ checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -14049,7 +14053,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", "synstructure", ] @@ -14070,7 +14074,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] @@ -14103,7 +14107,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.105", ] [[package]] diff --git a/crates/engine/src/fcs.rs b/crates/engine/src/fcs.rs index 72e3528d..784d57d6 100644 --- a/crates/engine/src/fcs.rs +++ b/crates/engine/src/fcs.rs @@ -127,10 +127,10 @@ impl ForkchoiceState { pub fn genesis_hash_from_chain_spec>( chain_spec: CS, ) -> Option { - match chain_spec.chain().named()? { - NamedChain::Scroll => Some(SCROLL_MAINNET_GENESIS_HASH), - NamedChain::ScrollSepolia => Some(SCROLL_SEPOLIA_GENESIS_HASH), - NamedChain::Dev => Some(chain_spec.genesis_header().hash_slow()), + match chain_spec.chain().named() { + Some(NamedChain::Scroll) => Some(SCROLL_MAINNET_GENESIS_HASH), + Some(NamedChain::ScrollSepolia) => Some(SCROLL_SEPOLIA_GENESIS_HASH), + Some(NamedChain::Dev) | None => Some(chain_spec.genesis_header().hash_slow()), _ => None, } } diff --git a/crates/node/src/args.rs b/crates/node/src/args.rs index 58bdf228..9068a8b5 100644 --- a/crates/node/src/args.rs +++ b/crates/node/src/args.rs @@ -3,6 +3,7 @@ use crate::{ constants::{self}, context::RollupNodeContext, }; +use scroll_migration::MigratorTrait; use std::{fs, path::PathBuf, sync::Arc, time::Duration}; use alloy_primitives::{hex, Address}; @@ -146,9 +147,8 @@ impl ScrollRollupNodeConfig { // Get the chain spec. let chain_spec = ctx.chain_spec; - // Get the rollup node config. - let named_chain = chain_spec.chain().named().expect("expected named chain"); - let node_config = Arc::new(NodeConfig::from_named_chain(named_chain)); + // Build NodeConfig directly from the chainspec. + let node_config = Arc::new(NodeConfig::from_chainspec(&chain_spec)?); // Create the engine api client. let engine_api = ScrollAuthApiEngineClient::new(rpc_server_handles.auth.http_client()); @@ -187,10 +187,16 @@ impl ScrollRollupNodeConfig { let db = Database::new(&database_path).await?; // Run the database migrations - named_chain - .migrate(db.get_connection(), self.test) - .await - .expect("failed to perform migration"); + if let Some(named) = chain_spec.chain().named() { + named + .migrate(db.get_connection(), self.test) + .await + .expect("failed to perform migration"); + } else { + scroll_migration::Migrator::<()>::up(db.get_connection(), None) + .await + .expect("failed to perform migration (custom chain)"); + } // Wrap the database in an Arc let db = Arc::new(db); diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 7dbbc3ca..d98f06dc 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -20,14 +20,18 @@ alloy-rpc-types-engine.workspace = true # scroll scroll-alloy-consensus.workspace = true scroll-alloy-rpc-types-engine.workspace = true +reth-scroll-chainspec.workspace = true # reth reth-primitives-traits.workspace = true reth-scroll-primitives.workspace = true +reth-chainspec.workspace = true +reth-node-core.workspace = true # misc arbitrary = { workspace = true, optional = true } derive_more = { workspace = true, features = ["from"] } +eyre.workspace = true [features] default = ["std"] @@ -42,6 +46,8 @@ std = [ "reth-primitives-traits/std", "alloy-consensus/std", "alloy-chains/std", + "reth-chainspec/std", + "reth-scroll-chainspec/std", ] arbitrary = [ "std", @@ -56,4 +62,5 @@ arbitrary = [ "alloy-consensus/arbitrary", "alloy-rpc-types-engine/arbitrary", "alloy-chains/arbitrary", + "reth-chainspec/arbitrary", ] diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs index 241c14fe..0ed6b7dc 100644 --- a/crates/primitives/src/lib.rs +++ b/crates/primitives/src/lib.rs @@ -29,12 +29,12 @@ pub use node::{ config::{ NodeConfig, DEVNET_L1_MESSAGE_QUEUE_V1_CONTRACT_ADDRESS, DEVNET_L1_MESSAGE_QUEUE_V2_CONTRACT_ADDRESS, DEVNET_ROLLUP_CONTRACT_ADDRESS, - DEV_L1_START_BLOCK_NUMBER, DEV_SYSTEM_CONTRAT_ADDRESS, + DEV_L1_START_BLOCK_NUMBER, DEV_SYSTEM_CONTRACT_ADDRESS, MAINNET_L1_MESSAGE_QUEUE_V1_CONTRACT_ADDRESS, MAINNET_L1_MESSAGE_QUEUE_V2_CONTRACT_ADDRESS, MAINNET_L1_START_BLOCK_NUMBER, MAINNET_ROLLUP_CONTRACT_ADDRESS, - MAINNET_SYSTEM_CONTRAT_ADDRESS, SEPOLIA_L1_MESSAGE_QUEUE_V1_CONTRACT_ADDRESS, + MAINNET_SYSTEM_CONTRACT_ADDRESS, SEPOLIA_L1_MESSAGE_QUEUE_V1_CONTRACT_ADDRESS, SEPOLIA_L1_MESSAGE_QUEUE_V2_CONTRACT_ADDRESS, SEPOLIA_L1_START_BLOCK_NUMBER, - SEPOLIA_ROLLUP_CONTRACT_ADDRESS, SEPOLIA_SYSTEM_CONTRAT_ADDRESS, + SEPOLIA_ROLLUP_CONTRACT_ADDRESS, SEPOLIA_SYSTEM_CONTRACT_ADDRESS, }, consensus::ConsensusUpdate, }; diff --git a/crates/primitives/src/node/config.rs b/crates/primitives/src/node/config.rs index 91a8786c..489307c3 100644 --- a/crates/primitives/src/node/config.rs +++ b/crates/primitives/src/node/config.rs @@ -1,5 +1,8 @@ use alloy_chains::NamedChain; use alloy_primitives::{address, Address}; +use reth_chainspec::EthChainSpec; +use reth_node_core::primitives::BlockHeader; +use reth_scroll_chainspec::{ChainConfig, ScrollChainConfig}; /// The address of the Scroll Rollup contract on Mainnet. pub const MAINNET_ROLLUP_CONTRACT_ADDRESS: Address = @@ -38,15 +41,15 @@ pub const DEVNET_L1_MESSAGE_QUEUE_V2_CONTRACT_ADDRESS: Address = address!("000000000000000000000000000000000002dead"); /// The address of the system contract on Mainnet. -pub const MAINNET_SYSTEM_CONTRAT_ADDRESS: Address = +pub const MAINNET_SYSTEM_CONTRACT_ADDRESS: Address = address!("8432728A257646449245558B8b7Dbe51A16c7a4D"); /// The address of the system contract on Sepolia. -pub const SEPOLIA_SYSTEM_CONTRAT_ADDRESS: Address = +pub const SEPOLIA_SYSTEM_CONTRACT_ADDRESS: Address = address!("C706Ba9fa4fedF4507CB7A898b4766c1bbf9be57"); /// The address of the system contract on Devnet. -pub const DEV_SYSTEM_CONTRAT_ADDRESS: Address = +pub const DEV_SYSTEM_CONTRACT_ADDRESS: Address = address!("000000000000000000000000000000000003dead"); /// The L1 start block for Mainnet. @@ -81,6 +84,42 @@ pub struct ScrollAddressBook { } impl NodeConfig { + /// Returns the node configuration from a chain specification. + /// This method extracts the configuration directly from the chainspec, + /// supporting both named and custom chains. + pub fn from_chainspec(chain_spec: &CS) -> eyre::Result + where + CS: EthChainSpec + ChainConfig + Clone, + { + // Try to get configuration from named chain first + if let Some(named_chain) = chain_spec.chain().named() { + return Ok(Self::from_named_chain(named_chain)); + } + + // If not a named chain, extract the configuration from the chain spec + let config = chain_spec.chain_config(); + + let genesis = chain_spec.genesis(); + let l1_message_queue_v2_deployment_block = genesis + .config + .extra_fields + .get("scroll") + .and_then(|scroll| scroll.get("l1Config")) + .and_then(|l1_config| l1_config.get("l1MessageQueueV2DeploymentBlock")) + .and_then(|v| v.as_u64()) + .ok_or_else(|| eyre::eyre!("Invalid or missing 'l1MessageQueueV2DeploymentBlock'"))?; + + Ok(Self { + address_book: ScrollAddressBook { + rollup_node_contract_address: config.l1_config.scroll_chain_address, + v1_message_queue_address: config.l1_config.l1_message_queue_address, + v2_message_queue_address: config.l1_config.l1_message_queue_v2_address, + system_contract_address: config.l1_config.l2_system_config_address, + }, + start_l1_block: l1_message_queue_v2_deployment_block, + }) + } + /// Returns the node configuration for Mainnet. pub const fn mainnet() -> Self { Self { @@ -88,7 +127,7 @@ impl NodeConfig { rollup_node_contract_address: MAINNET_ROLLUP_CONTRACT_ADDRESS, v1_message_queue_address: MAINNET_L1_MESSAGE_QUEUE_V1_CONTRACT_ADDRESS, v2_message_queue_address: MAINNET_L1_MESSAGE_QUEUE_V2_CONTRACT_ADDRESS, - system_contract_address: MAINNET_SYSTEM_CONTRAT_ADDRESS, + system_contract_address: MAINNET_SYSTEM_CONTRACT_ADDRESS, }, start_l1_block: MAINNET_L1_START_BLOCK_NUMBER, } @@ -101,7 +140,7 @@ impl NodeConfig { rollup_node_contract_address: SEPOLIA_ROLLUP_CONTRACT_ADDRESS, v1_message_queue_address: SEPOLIA_L1_MESSAGE_QUEUE_V1_CONTRACT_ADDRESS, v2_message_queue_address: SEPOLIA_L1_MESSAGE_QUEUE_V2_CONTRACT_ADDRESS, - system_contract_address: SEPOLIA_SYSTEM_CONTRAT_ADDRESS, + system_contract_address: SEPOLIA_SYSTEM_CONTRACT_ADDRESS, }, start_l1_block: SEPOLIA_L1_START_BLOCK_NUMBER, } @@ -114,9 +153,9 @@ impl NodeConfig { rollup_node_contract_address: DEVNET_ROLLUP_CONTRACT_ADDRESS, v1_message_queue_address: DEVNET_L1_MESSAGE_QUEUE_V1_CONTRACT_ADDRESS, v2_message_queue_address: DEVNET_L1_MESSAGE_QUEUE_V2_CONTRACT_ADDRESS, - system_contract_address: DEV_SYSTEM_CONTRAT_ADDRESS, + system_contract_address: DEV_SYSTEM_CONTRACT_ADDRESS, }, - start_l1_block: SEPOLIA_L1_START_BLOCK_NUMBER, + start_l1_block: DEV_L1_START_BLOCK_NUMBER, } } diff --git a/tests/docker-compose.test.yml b/tests/docker-compose.test.yml index 2212d3ec..94476ba1 100644 --- a/tests/docker-compose.test.yml +++ b/tests/docker-compose.test.yml @@ -1,6 +1,17 @@ version: '3.8' services: + l1-node: + image: ghcr.io/foundry-rs/foundry:latest + container_name: l1-node + entrypoint: [ "bash", "/launch_l1.bash" ] + ports: + - "8544:8545" + volumes: + - ./launch_l1.bash:/launch_l1.bash:ro + networks: + - test-scroll-network + rollup-node-sequencer: build: context: ../ @@ -8,7 +19,6 @@ services: container_name: rollup-node-sequencer entrypoint: ["bash", "/launch_rollup_node_sequencer.bash"] environment: - - ENV=dev - RUST_LOG=info ports: - "8545:8545" # JSON-RPC @@ -17,9 +27,13 @@ services: volumes: - ./launch_rollup_node_sequencer.bash:/launch_rollup_node_sequencer.bash:ro - ./discovery-secret:/l2reth/discovery-secret:ro + - ./sequencer-key.txt:/l2reth/sequencer-key.txt:ro + - ./l2reth-genesis-e2e.json:/l2reth/l2reth-genesis-e2e.json:ro - l2reth-sequencer:/l2reth networks: - test-scroll-network + depends_on: + - l1-node rollup-node-follower: build: @@ -28,7 +42,6 @@ services: container_name: rollup-node-follower entrypoint: ["bash", "/launch_rollup_node_follower.bash"] environment: - - ENV=dev - RUST_LOG=info ports: - "8547:8545" # JSON-RPC @@ -36,12 +49,31 @@ services: - "6061:6060" # Metrics volumes: - ./launch_rollup_node_follower.bash:/launch_rollup_node_follower.bash:ro + - ./l2reth-genesis-e2e.json:/l2reth/l2reth-genesis-e2e.json:ro - l2reth-follower:/l2reth networks: - test-scroll-network depends_on: - rollup-node-sequencer + l2geth: + image: scrolltech/l2geth:scroll-v5.8.74 + platform: linux/amd64 + container_name: l2geth + entrypoint: ["bash", "/launch_l2geth.bash"] + ports: + - "8549:8545" # JSON-RPC + - "8550:8546" # WebSocket + - "6062:6060" # Metrics + volumes: + - ./l2geth-genesis-e2e.json:/l2geth-genesis-e2e.json:ro + - ./launch_l2geth.bash:/launch_l2geth.bash:ro + - l2geth-data:/l2geth + networks: + - test-scroll-network + depends_on: + - rollup-node-sequencer + networks: test-scroll-network: driver: bridge @@ -49,3 +81,4 @@ networks: volumes: l2reth-sequencer: l2reth-follower: + l2geth-data: diff --git a/tests/l2geth-genesis-e2e.json b/tests/l2geth-genesis-e2e.json new file mode 100644 index 00000000..491867ab --- /dev/null +++ b/tests/l2geth-genesis-e2e.json @@ -0,0 +1,114 @@ +{ + "config": { + "chainId": 1337, + "homesteadBlock": 0, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "archimedesBlock": 0, + "shanghaiBlock": 0, + "bernoulliBlock": 0, + "curieBlock": 0, + "darwinTime": 0, + "darwinV2Time": 0, + "euclidTime": 0, + "euclidV2Time": 0, + "feynmanTime": 0, + "systemContract": { + "period": 1, + "system_contract_address": "0x55B150d210356452e4E79cCb6B778b4e1B167091", + "system_contract_slot": "0x0000000000000000000000000000000000000000000000000000000000000067" + }, + "scroll": { + "useZktrie": false, + "maxTxPerBlock": 100, + "maxTxPayloadBytesPerBlock": 122880, + "feeVaultAddress": "0x5300000000000000000000000000000000000005", + "l1Config": { + "l1ChainId": "22222222", + "l1MessageQueueAddress": "0x0000000000000000000000000000000000000001", + "l1MessageQueueV2Address": "0x160dd98613ba6C6E0a14086a87cf36244558422E", + "l1MessageQueueV2DeploymentBlock": 0, + "scrollChainAddress": "0x84044d3a645843bAF0752eA591E1EAB643beD904", + "l2SystemConfigAddress": "0x2E48aC0df81f1fa57722e115e807C9dB1819bA13", + "numL1MessagesPerBlock": "10" + } + } + }, + "nonce": "0x0", + "timestamp": "0x00000000000000000000000000000000000000000000000000000000689b3f30", + "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "gasLimit": "30000000", + "difficulty": "0x1", + "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "coinbase": "0x0000000000000000000000000000000000000000", + "baseFeePerGas": "0x1", + "alloc": { + "0x4e59b44847b379578588920ca78fbf26c0b4956c": { + "balance": "0x0", + "code": "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3", + "nonce": "0x1", + "storage": {} + }, + "0x5300000000000000000000000000000000000000": { + "balance": "0x0", + "code": "0x608060405234801561000f575f80fd5b5060043610610090575f3560e01c806383cc76601161006357806383cc7660146100f85780638da5cb5b1461010b578063c4d66de81461011e578063d4b9f4fa14610131578063f2fde38b14610139575f80fd5b806326aad7b7146100945780633cb747bf146100b0578063600a2e77146100db578063715018a6146100ee575b5f80fd5b61009d60015481565b6040519081526020015b60405180910390f35b6053546100c3906001600160a01b031681565b6040516001600160a01b0390911681526020016100a7565b61009d6100e9366004610539565b61014c565b6100f66101ef565b005b61009d610106366004610539565b610224565b6052546100c3906001600160a01b031681565b6100f661012c366004610550565b61023a565b61009d5f5481565b6100f6610147366004610550565b6102d2565b6053545f906001600160a01b0316331461019e5760405162461bcd60e51b815260206004820152600e60248201526d37b7363c9036b2b9b9b2b733b2b960911b60448201526064015b60405180910390fd5b5f806101a98461035e565b60408051838152602081018890529294509092507ffaa617c2d8ce12c62637dbce76efcc18dae60574aa95709bdcedce7e76071693910160405180910390a19392505050565b6052546001600160a01b031633146102195760405162461bcd60e51b81526004016101959061057d565b6102225f610477565b565b602a8160288110610233575f80fd5b0154905081565b6052546001600160a01b031633146102645760405162461bcd60e51b81526004016101959061057d565b600154156102a85760405162461bcd60e51b815260206004820152601160248201527063616e6e6f7420696e697469616c697a6560781b6044820152606401610195565b6102b06104c8565b605380546001600160a01b0319166001600160a01b0392909216919091179055565b6052546001600160a01b031633146102fc5760405162461bcd60e51b81526004016101959061057d565b6001600160a01b0381166103525760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f20616464726573730000006044820152606401610195565b61035b81610477565b50565b6003545f9081906103b15760405162461bcd60e51b815260206004820152601a60248201527f63616c6c206265666f726520696e697469616c697a6174696f6e0000000000006044820152606401610195565b600154835f5b8215610448576103c86002846105c8565b5f036104125781602a82602881106103e2576103e26105b4565b015561040b82600283602881106103fb576103fb6105b4565b01545f9182526020526040902090565b915061043c565b610439602a8260288110610428576104286105b4565b0154835f9182526020526040902090565b91505b600192831c92016103b7565b81602a826028811061045c5761045c6105b4565b0155505f819055600180548082019091559590945092505050565b605280546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0905f90a35050565b5f5b60286104d78260016105fb565b101561035b57610508600282602881106104f3576104f36105b4565b0154600283602881106103fb576103fb6105b4565b60026105158360016105fb565b60288110610525576105256105b4565b01558061053181610614565b9150506104ca565b5f60208284031215610549575f80fd5b5035919050565b5f60208284031215610560575f80fd5b81356001600160a01b0381168114610576575f80fd5b9392505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b634e487b7160e01b5f52603260045260245ffd5b5f826105e257634e487b7160e01b5f52601260045260245ffd5b500690565b634e487b7160e01b5f52601160045260245ffd5b8082018082111561060e5761060e6105e7565b92915050565b5f60018201610625576106256105e7565b506001019056fea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000052": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266" + } + }, + "0x5300000000000000000000000000000000000002": { + "balance": "0x0", + "code": "0x608060405234801561000f575f80fd5b50600436106101a1575f3560e01c806384189161116100f3578063c63b9e2d11610093578063e88a60ad1161006e578063e88a60ad1461032e578063f2fde38b14610341578063f45e65d814610354578063fe5b04151461035d575f80fd5b8063c63b9e2d146102ff578063c91e514914610312578063de26c4a11461031b575f80fd5b8063944b247f116100ce578063944b247f146102be578063a911d77f146102d1578063aa5e9334146102d9578063bede39b5146102ec575f80fd5b806384189161146102785780638da5cb5b1461028157806393e59dc1146102ab575f80fd5b80633d0f963e1161015e5780636112d6db116101395780636112d6db1461024b5780636a5e67e514610254578063704655971461025d578063715018a614610270575f80fd5b80633d0f963e1461021c57806349948e0e1461022f578063519b4bd314610242575f80fd5b80630c18c162146101a557806313dad5be146101c157806323e524ac146101de5780633577afc5146101e757806339455d3a146101fc5780633b7656bb1461020f575b5f80fd5b6101ae60025481565b6040519081526020015b60405180910390f35b6008546101ce9060ff1681565b60405190151581526020016101b8565b6101ae60065481565b6101fa6101f5366004610c73565b610365565b005b6101fa61020a366004610c8a565b6103f7565b600b546101ce9060ff1681565b6101fa61022a366004610caa565b6104f4565b6101ae61023d366004610ceb565b610577565b6101ae60015481565b6101ae600a5481565b6101ae60075481565b6101fa61026b366004610c73565b6105b0565b6101fa61063e565b6101ae60055481565b5f54610293906001600160a01b031681565b6040516001600160a01b0390911681526020016101b8565b600454610293906001600160a01b031681565b6101fa6102cc366004610c73565b610672565b6101fa6106fe565b6101fa6102e7366004610c73565b61075a565b6101fa6102fa366004610c73565b6107f4565b6101fa61030d366004610c73565b6108b1565b6101ae60095481565b6101ae610329366004610ceb565b61094a565b6101fa61033c366004610c73565b610974565b6101fa61034f366004610caa565b610a00565b6101ae60035481565b6101fa610a8b565b5f546001600160a01b031633146103975760405162461bcd60e51b815260040161038e90610d96565b60405180910390fd5b621c9c388111156103bb57604051635742c80560e11b815260040160405180910390fd5b60028190556040518181527f32740b35c0ea213650f60d44366b4fb211c9033b50714e4a1d34e65d5beb9bb4906020015b60405180910390a150565b6004805460405163efc7840160e01b815233928101929092526001600160a01b03169063efc7840190602401602060405180830381865afa15801561043e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104629190610dcd565b61047f576040516326b3506d60e11b815260040160405180910390fd5b600182905560058190556040518281527f351fb23757bb5ea0546c85b7996ddd7155f96b939ebaa5ff7bc49c75f27f2c449060200160405180910390a16040518181527f9a14bfb5d18c4c3cf14cae19c23d7cf1bcede357ea40ca1f75cd49542c71c214906020015b60405180910390a15050565b5f546001600160a01b0316331461051d5760405162461bcd60e51b815260040161038e90610d96565b600480546001600160a01b038381166001600160a01b031983168117909355604080519190921680825260208201939093527f22d1c35fe072d2e42c3c8f9bd4a0d34aa84a0101d020a62517b33fdb3174e5f791016104e8565b600b545f9060ff16156105935761058d82610ae7565b92915050565b60085460ff16156105a75761058d82610b45565b61058d82610b81565b5f546001600160a01b031633146105d95760405162461bcd60e51b815260040161038e90610d96565b6105e9633b9aca006103e8610e00565b81111561060957604051631e44fdeb60e11b815260040160405180910390fd5b60038190556040518181527f3336cd9708eaf2769a0f0dc0679f30e80f15dcd88d1921b5a16858e8b85c591a906020016103ec565b5f546001600160a01b031633146106675760405162461bcd60e51b815260040161038e90610d96565b6106705f610bc4565b565b5f546001600160a01b0316331461069b5760405162461bcd60e51b815260040161038e90610d96565b6106a9633b9aca0080610e00565b8111156106c95760405163874f603160e01b815260040160405180910390fd5b60068190556040518181527f2ab3f5a4ebbcbf3c24f62f5454f52f10e1a8c9dcc5acac8f19199ce881a6a108906020016103ec565b5f546001600160a01b031633146107275760405162461bcd60e51b815260040161038e90610d96565b60085460ff161561074b576040516379f9c57560e01b815260040160405180910390fd5b6008805460ff19166001179055565b5f546001600160a01b031633146107835760405162461bcd60e51b815260040161038e90610d96565b633b9aca008110806107a1575061079e633b9aca0080610e00565b81115b156107bf5760405163d9b5dcdf60e01b815260040160405180910390fd5b60098190556040518181527fd50d3079c77df569cd58d55d4e5614bfe7066449009425d22bde8e75242f50bb906020016103ec565b6004805460405163efc7840160e01b815233928101929092526001600160a01b03169063efc7840190602401602060405180830381865afa15801561083b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061085f9190610dcd565b61087c576040516326b3506d60e11b815260040160405180910390fd5b60018190556040518181527f351fb23757bb5ea0546c85b7996ddd7155f96b939ebaa5ff7bc49c75f27f2c44906020016103ec565b5f546001600160a01b031633146108da5760405162461bcd60e51b815260040161038e90610d96565b633b9aca008110806108f857506108f5633b9aca0080610e00565b81115b156109155760405162ae184360e01b815260040160405180910390fd5b600a8190556040518181527f8647cebb7e57360673a28415c0bed2f68c42a86c5035f1c9b2eda2b09509288a906020016103ec565b600b545f9060ff168061095f575060085460ff165b1561096b57505f919050565b61058d82610c13565b5f546001600160a01b0316331461099d5760405162461bcd60e51b815260040161038e90610d96565b6109ab633b9aca0080610e00565b8111156109cb5760405163f37ec21560e01b815260040160405180910390fd5b60078190556040518181527f6b332a036d8c3ead57dcb06c87243bd7a2aed015ddf2d0528c2501dae56331aa906020016103ec565b5f546001600160a01b03163314610a295760405162461bcd60e51b815260040161038e90610d96565b6001600160a01b038116610a7f5760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f2061646472657373000000604482015260640161038e565b610a8881610bc4565b50565b5f546001600160a01b03163314610ab45760405162461bcd60e51b815260040161038e90610d96565b600b5460ff1615610ad857604051631a7c228b60e21b815260040160405180910390fd5b600b805460ff19166001179055565b5f633b9aca0080600a548451600554600754610b039190610e00565b600154600654610b139190610e00565b610b1d9190610e17565b610b279190610e00565b610b319190610e00565b610b3b9190610e2a565b61058d9190610e2a565b5f633b9aca006005548351600754610b5d9190610e00565b610b679190610e00565b600154600654610b779190610e00565b610b3b9190610e17565b5f80610b8c83610c13565b90505f60015482610b9d9190610e00565b9050633b9aca0060035482610bb29190610e00565b610bbc9190610e2a565b949350505050565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b80515f908190815b81811015610c6457848181518110610c3557610c35610e49565b01602001516001600160f81b0319165f03610c5557600483019250610c5c565b6010830192505b600101610c1b565b50506002540160400192915050565b5f60208284031215610c83575f80fd5b5035919050565b5f8060408385031215610c9b575f80fd5b50508035926020909101359150565b5f60208284031215610cba575f80fd5b81356001600160a01b0381168114610cd0575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f60208284031215610cfb575f80fd5b813567ffffffffffffffff80821115610d12575f80fd5b818401915084601f830112610d25575f80fd5b813581811115610d3757610d37610cd7565b604051601f8201601f19908116603f01168101908382118183101715610d5f57610d5f610cd7565b81604052828152876020848701011115610d77575f80fd5b826020860160208301375f928101602001929092525095945050505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b5f60208284031215610ddd575f80fd5b81518015158114610cd0575f80fd5b634e487b7160e01b5f52601160045260245ffd5b808202811582820484141761058d5761058d610dec565b8082018082111561058d5761058d610dec565b5f82610e4457634e487b7160e01b5f52601260045260245ffd5b500490565b634e487b7160e01b5f52603260045260245ffdfea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266", + "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000001", + "0x0000000000000000000000000000000000000000000000000000000000000009": "0x000000000000000000000000000000000000000000000000000000003b9aca00", + "0x000000000000000000000000000000000000000000000000000000000000000a": "0x000000000000000000000000000000000000000000000000000000003b9aca00", + "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000001" + } + }, + "0x5300000000000000000000000000000000000003": { + "balance": "0x0", + "code": "0x608060405234801561000f575f80fd5b5060043610610055575f3560e01c8063715018a61461005957806379586dd7146100635780638da5cb5b14610076578063efc78401146100a5578063f2fde38b146100e0575b5f80fd5b6100616100f3565b005b61006161007136600461033a565b610130565b5f54610088906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b6100d06100b336600461040c565b6001600160a01b03165f9081526001602052604090205460ff1690565b604051901515815260200161009c565b6100616100ee36600461040c565b610222565b5f546001600160a01b031633146101255760405162461bcd60e51b815260040161011c9061042c565b60405180910390fd5b61012e5f6102ad565b565b5f546001600160a01b031633146101595760405162461bcd60e51b815260040161011c9061042c565b5f5b825181101561021d578160015f85848151811061017a5761017a610463565b60200260200101516001600160a01b03166001600160a01b031681526020019081526020015f205f6101000a81548160ff0219169083151502179055508281815181106101c9576101c9610463565b60200260200101516001600160a01b03167f8daaf060c3306c38e068a75c054bf96ecd85a3db1252712c4d93632744c42e0d8360405161020d911515815260200190565b60405180910390a260010161015b565b505050565b5f546001600160a01b0316331461024b5760405162461bcd60e51b815260040161011c9061042c565b6001600160a01b0381166102a15760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f2061646472657373000000604482015260640161011c565b6102aa816102ad565b50565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b634e487b7160e01b5f52604160045260245ffd5b80356001600160a01b0381168114610326575f80fd5b919050565b80358015158114610326575f80fd5b5f806040838503121561034b575f80fd5b823567ffffffffffffffff80821115610362575f80fd5b818501915085601f830112610375575f80fd5b8135602082821115610389576103896102fc565b8160051b604051601f19603f830116810181811086821117156103ae576103ae6102fc565b6040529283528183019350848101820192898411156103cb575f80fd5b948201945b838610156103f0576103e186610310565b855294820194938201936103d0565b96506103ff905087820161032b565b9450505050509250929050565b5f6020828403121561041c575f80fd5b61042582610310565b9392505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b634e487b7160e01b5f52603260045260245ffdfea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266" + } + }, + "0x5300000000000000000000000000000000000005": { + "balance": "0x0", + "code": "0x6080604052600436106100a8575f3560e01c806384411d651161006257806384411d651461017a5780638da5cb5b1461018f5780639e7adc79146101ad578063f2fde38b146101cc578063feec756c146101eb578063ff4f35461461020a575f80fd5b80632e1a7d4d146100b35780633cb747bf146100d45780633ccfd60b14610110578063457e1a491461012457806366d003ac14610147578063715018a614610166575f80fd5b366100af57005b5f80fd5b3480156100be575f80fd5b506100d26100cd366004610663565b610229565b005b3480156100df575f80fd5b506002546100f3906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b34801561011b575f80fd5b506100d26103e9565b34801561012f575f80fd5b5061013960015481565b604051908152602001610107565b348015610152575f80fd5b506003546100f3906001600160a01b031681565b348015610171575f80fd5b506100d26103f6565b348015610185575f80fd5b5061013960045481565b34801561019a575f80fd5b505f546100f3906001600160a01b031681565b3480156101b8575f80fd5b506100d26101c736600461067a565b61042a565b3480156101d7575f80fd5b506100d26101e636600461067a565b6104a4565b3480156101f6575f80fd5b506100d261020536600461067a565b61052c565b348015610215575f80fd5b506100d2610224366004610663565b6105a6565b6001548110156102b95760405162461bcd60e51b815260206004820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d20776974686472616064820152691dd85b08185b5bdd5b9d60b21b608482015260a4015b60405180910390fd5b478082111561031d5760405162461bcd60e51b815260206004820152602a60248201527f4665655661756c743a20696e73756666696369656e742062616c616e636520746044820152696f20776974686472617760b01b60648201526084016102b0565b6004805483019055600354604080518481526001600160a01b0390921660208301523382820152517fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba9181900360600190a1600254600354604080516020810182525f808252915163b2267a7b60e01b81526001600160a01b039485169463b2267a7b9488946103b79491909216928592906004016106a7565b5f604051808303818588803b1580156103ce575f80fd5b505af11580156103e0573d5f803e3d5ffd5b50505050505050565b476103f381610229565b50565b5f546001600160a01b0316331461041f5760405162461bcd60e51b81526004016102b090610711565b6104285f610614565b565b5f546001600160a01b031633146104535760405162461bcd60e51b81526004016102b090610711565b600280546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f1c928c417a10a21c3cddad148c5dba5d710e4b1442d6d8a36de345935ad84612905f90a35050565b5f546001600160a01b031633146104cd5760405162461bcd60e51b81526004016102b090610711565b6001600160a01b0381166105235760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f206164647265737300000060448201526064016102b0565b6103f381610614565b5f546001600160a01b031633146105555760405162461bcd60e51b81526004016102b090610711565b600380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f7e1e96961a397c8aa26162fe259cc837afc95e33aad4945ddc61c18dabb7a6ad905f90a35050565b5f546001600160a01b031633146105cf5760405162461bcd60e51b81526004016102b090610711565b600180549082905560408051828152602081018490527f0d3c80219fe57713b9f9c83d1e51426792d0c14d8e330e65b102571816140965910160405180910390a15050565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f60208284031215610673575f80fd5b5035919050565b5f6020828403121561068a575f80fd5b81356001600160a01b03811681146106a0575f80fd5b9392505050565b60018060a01b03851681525f60208560208401526080604084015284518060808501525f5b818110156106e85786810183015185820160a0015282016106cc565b505f60a0828601015260a0601f19601f8301168501019250505082606083015295945050505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e657200000000000000000060408201526060019056fea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266", + "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000", + "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000df45f4790e20509959fccc0d09245b216abdaa37", + "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266" + } + }, + "0xdf45f4790e20509959fccc0d09245b216abdaa37": { + "balance": "0x7ffffffffffffffffffffffffffffffffffffffffffffff21f494c589c0000", + "code": "0x", + "nonce": "0x0", + "storage": { + "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x0000000000000000000000000000000000000000000000000000000000000000" + } + }, + "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266": { + "balance": "0xde0b6b3a7640000", + "code": "0x", + "nonce": "0x1", + "storage": {} + } + } +} diff --git a/tests/l2reth-genesis-e2e.json b/tests/l2reth-genesis-e2e.json new file mode 100644 index 00000000..d0ea06de --- /dev/null +++ b/tests/l2reth-genesis-e2e.json @@ -0,0 +1,114 @@ +{ + "config": { + "chainId": 1337, + "homesteadBlock": 0, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "archimedesBlock": 0, + "shanghaiBlock": 0, + "bernoulliBlock": 0, + "curieBlock": 0, + "darwinTime": 0, + "darwinV2Time": 0, + "euclidTime": 0, + "euclidV2Time": 0, + "feynmanTime": 0, + "systemContract": { + "period": 1, + "system_contract_address": "0x55B150d210356452e4E79cCb6B778b4e1B167091", + "system_contract_slot": "0x0000000000000000000000000000000000000000000000000000000000000067" + }, + "scroll": { + "useZktrie": false, + "maxTxPerBlock": 100, + "maxTxPayloadBytesPerBlock": 122880, + "feeVaultAddress": "0x5300000000000000000000000000000000000005", + "l1Config": { + "l1ChainId": 22222222, + "l1MessageQueueAddress": "0x0000000000000000000000000000000000000001", + "l1MessageQueueV2Address": "0x160dd98613ba6C6E0a14086a87cf36244558422E", + "l1MessageQueueV2DeploymentBlock": 0, + "scrollChainAddress": "0x84044d3a645843bAF0752eA591E1EAB643beD904", + "l2SystemConfigAddress": "0x2E48aC0df81f1fa57722e115e807C9dB1819bA13", + "numL1MessagesPerBlock": 10 + } + } + }, + "nonce": "0x0", + "timestamp": "0x00000000000000000000000000000000000000000000000000000000689b3f30", + "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "gasLimit": "30000000", + "difficulty": "0x1", + "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "coinbase": "0x0000000000000000000000000000000000000000", + "baseFeePerGas": "0x1", + "alloc": { + "0x4e59b44847b379578588920ca78fbf26c0b4956c": { + "balance": "0x0", + "code": "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3", + "nonce": "0x1", + "storage": {} + }, + "0x5300000000000000000000000000000000000000": { + "balance": "0x0", + "code": "0x608060405234801561000f575f80fd5b5060043610610090575f3560e01c806383cc76601161006357806383cc7660146100f85780638da5cb5b1461010b578063c4d66de81461011e578063d4b9f4fa14610131578063f2fde38b14610139575f80fd5b806326aad7b7146100945780633cb747bf146100b0578063600a2e77146100db578063715018a6146100ee575b5f80fd5b61009d60015481565b6040519081526020015b60405180910390f35b6053546100c3906001600160a01b031681565b6040516001600160a01b0390911681526020016100a7565b61009d6100e9366004610539565b61014c565b6100f66101ef565b005b61009d610106366004610539565b610224565b6052546100c3906001600160a01b031681565b6100f661012c366004610550565b61023a565b61009d5f5481565b6100f6610147366004610550565b6102d2565b6053545f906001600160a01b0316331461019e5760405162461bcd60e51b815260206004820152600e60248201526d37b7363c9036b2b9b9b2b733b2b960911b60448201526064015b60405180910390fd5b5f806101a98461035e565b60408051838152602081018890529294509092507ffaa617c2d8ce12c62637dbce76efcc18dae60574aa95709bdcedce7e76071693910160405180910390a19392505050565b6052546001600160a01b031633146102195760405162461bcd60e51b81526004016101959061057d565b6102225f610477565b565b602a8160288110610233575f80fd5b0154905081565b6052546001600160a01b031633146102645760405162461bcd60e51b81526004016101959061057d565b600154156102a85760405162461bcd60e51b815260206004820152601160248201527063616e6e6f7420696e697469616c697a6560781b6044820152606401610195565b6102b06104c8565b605380546001600160a01b0319166001600160a01b0392909216919091179055565b6052546001600160a01b031633146102fc5760405162461bcd60e51b81526004016101959061057d565b6001600160a01b0381166103525760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f20616464726573730000006044820152606401610195565b61035b81610477565b50565b6003545f9081906103b15760405162461bcd60e51b815260206004820152601a60248201527f63616c6c206265666f726520696e697469616c697a6174696f6e0000000000006044820152606401610195565b600154835f5b8215610448576103c86002846105c8565b5f036104125781602a82602881106103e2576103e26105b4565b015561040b82600283602881106103fb576103fb6105b4565b01545f9182526020526040902090565b915061043c565b610439602a8260288110610428576104286105b4565b0154835f9182526020526040902090565b91505b600192831c92016103b7565b81602a826028811061045c5761045c6105b4565b0155505f819055600180548082019091559590945092505050565b605280546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0905f90a35050565b5f5b60286104d78260016105fb565b101561035b57610508600282602881106104f3576104f36105b4565b0154600283602881106103fb576103fb6105b4565b60026105158360016105fb565b60288110610525576105256105b4565b01558061053181610614565b9150506104ca565b5f60208284031215610549575f80fd5b5035919050565b5f60208284031215610560575f80fd5b81356001600160a01b0381168114610576575f80fd5b9392505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b634e487b7160e01b5f52603260045260245ffd5b5f826105e257634e487b7160e01b5f52601260045260245ffd5b500690565b634e487b7160e01b5f52601160045260245ffd5b8082018082111561060e5761060e6105e7565b92915050565b5f60018201610625576106256105e7565b506001019056fea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000052": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266" + } + }, + "0x5300000000000000000000000000000000000002": { + "balance": "0x0", + "code": "0x608060405234801561000f575f80fd5b50600436106101a1575f3560e01c806384189161116100f3578063c63b9e2d11610093578063e88a60ad1161006e578063e88a60ad1461032e578063f2fde38b14610341578063f45e65d814610354578063fe5b04151461035d575f80fd5b8063c63b9e2d146102ff578063c91e514914610312578063de26c4a11461031b575f80fd5b8063944b247f116100ce578063944b247f146102be578063a911d77f146102d1578063aa5e9334146102d9578063bede39b5146102ec575f80fd5b806384189161146102785780638da5cb5b1461028157806393e59dc1146102ab575f80fd5b80633d0f963e1161015e5780636112d6db116101395780636112d6db1461024b5780636a5e67e514610254578063704655971461025d578063715018a614610270575f80fd5b80633d0f963e1461021c57806349948e0e1461022f578063519b4bd314610242575f80fd5b80630c18c162146101a557806313dad5be146101c157806323e524ac146101de5780633577afc5146101e757806339455d3a146101fc5780633b7656bb1461020f575b5f80fd5b6101ae60025481565b6040519081526020015b60405180910390f35b6008546101ce9060ff1681565b60405190151581526020016101b8565b6101ae60065481565b6101fa6101f5366004610c73565b610365565b005b6101fa61020a366004610c8a565b6103f7565b600b546101ce9060ff1681565b6101fa61022a366004610caa565b6104f4565b6101ae61023d366004610ceb565b610577565b6101ae60015481565b6101ae600a5481565b6101ae60075481565b6101fa61026b366004610c73565b6105b0565b6101fa61063e565b6101ae60055481565b5f54610293906001600160a01b031681565b6040516001600160a01b0390911681526020016101b8565b600454610293906001600160a01b031681565b6101fa6102cc366004610c73565b610672565b6101fa6106fe565b6101fa6102e7366004610c73565b61075a565b6101fa6102fa366004610c73565b6107f4565b6101fa61030d366004610c73565b6108b1565b6101ae60095481565b6101ae610329366004610ceb565b61094a565b6101fa61033c366004610c73565b610974565b6101fa61034f366004610caa565b610a00565b6101ae60035481565b6101fa610a8b565b5f546001600160a01b031633146103975760405162461bcd60e51b815260040161038e90610d96565b60405180910390fd5b621c9c388111156103bb57604051635742c80560e11b815260040160405180910390fd5b60028190556040518181527f32740b35c0ea213650f60d44366b4fb211c9033b50714e4a1d34e65d5beb9bb4906020015b60405180910390a150565b6004805460405163efc7840160e01b815233928101929092526001600160a01b03169063efc7840190602401602060405180830381865afa15801561043e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104629190610dcd565b61047f576040516326b3506d60e11b815260040160405180910390fd5b600182905560058190556040518281527f351fb23757bb5ea0546c85b7996ddd7155f96b939ebaa5ff7bc49c75f27f2c449060200160405180910390a16040518181527f9a14bfb5d18c4c3cf14cae19c23d7cf1bcede357ea40ca1f75cd49542c71c214906020015b60405180910390a15050565b5f546001600160a01b0316331461051d5760405162461bcd60e51b815260040161038e90610d96565b600480546001600160a01b038381166001600160a01b031983168117909355604080519190921680825260208201939093527f22d1c35fe072d2e42c3c8f9bd4a0d34aa84a0101d020a62517b33fdb3174e5f791016104e8565b600b545f9060ff16156105935761058d82610ae7565b92915050565b60085460ff16156105a75761058d82610b45565b61058d82610b81565b5f546001600160a01b031633146105d95760405162461bcd60e51b815260040161038e90610d96565b6105e9633b9aca006103e8610e00565b81111561060957604051631e44fdeb60e11b815260040160405180910390fd5b60038190556040518181527f3336cd9708eaf2769a0f0dc0679f30e80f15dcd88d1921b5a16858e8b85c591a906020016103ec565b5f546001600160a01b031633146106675760405162461bcd60e51b815260040161038e90610d96565b6106705f610bc4565b565b5f546001600160a01b0316331461069b5760405162461bcd60e51b815260040161038e90610d96565b6106a9633b9aca0080610e00565b8111156106c95760405163874f603160e01b815260040160405180910390fd5b60068190556040518181527f2ab3f5a4ebbcbf3c24f62f5454f52f10e1a8c9dcc5acac8f19199ce881a6a108906020016103ec565b5f546001600160a01b031633146107275760405162461bcd60e51b815260040161038e90610d96565b60085460ff161561074b576040516379f9c57560e01b815260040160405180910390fd5b6008805460ff19166001179055565b5f546001600160a01b031633146107835760405162461bcd60e51b815260040161038e90610d96565b633b9aca008110806107a1575061079e633b9aca0080610e00565b81115b156107bf5760405163d9b5dcdf60e01b815260040160405180910390fd5b60098190556040518181527fd50d3079c77df569cd58d55d4e5614bfe7066449009425d22bde8e75242f50bb906020016103ec565b6004805460405163efc7840160e01b815233928101929092526001600160a01b03169063efc7840190602401602060405180830381865afa15801561083b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061085f9190610dcd565b61087c576040516326b3506d60e11b815260040160405180910390fd5b60018190556040518181527f351fb23757bb5ea0546c85b7996ddd7155f96b939ebaa5ff7bc49c75f27f2c44906020016103ec565b5f546001600160a01b031633146108da5760405162461bcd60e51b815260040161038e90610d96565b633b9aca008110806108f857506108f5633b9aca0080610e00565b81115b156109155760405162ae184360e01b815260040160405180910390fd5b600a8190556040518181527f8647cebb7e57360673a28415c0bed2f68c42a86c5035f1c9b2eda2b09509288a906020016103ec565b600b545f9060ff168061095f575060085460ff165b1561096b57505f919050565b61058d82610c13565b5f546001600160a01b0316331461099d5760405162461bcd60e51b815260040161038e90610d96565b6109ab633b9aca0080610e00565b8111156109cb5760405163f37ec21560e01b815260040160405180910390fd5b60078190556040518181527f6b332a036d8c3ead57dcb06c87243bd7a2aed015ddf2d0528c2501dae56331aa906020016103ec565b5f546001600160a01b03163314610a295760405162461bcd60e51b815260040161038e90610d96565b6001600160a01b038116610a7f5760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f2061646472657373000000604482015260640161038e565b610a8881610bc4565b50565b5f546001600160a01b03163314610ab45760405162461bcd60e51b815260040161038e90610d96565b600b5460ff1615610ad857604051631a7c228b60e21b815260040160405180910390fd5b600b805460ff19166001179055565b5f633b9aca0080600a548451600554600754610b039190610e00565b600154600654610b139190610e00565b610b1d9190610e17565b610b279190610e00565b610b319190610e00565b610b3b9190610e2a565b61058d9190610e2a565b5f633b9aca006005548351600754610b5d9190610e00565b610b679190610e00565b600154600654610b779190610e00565b610b3b9190610e17565b5f80610b8c83610c13565b90505f60015482610b9d9190610e00565b9050633b9aca0060035482610bb29190610e00565b610bbc9190610e2a565b949350505050565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b80515f908190815b81811015610c6457848181518110610c3557610c35610e49565b01602001516001600160f81b0319165f03610c5557600483019250610c5c565b6010830192505b600101610c1b565b50506002540160400192915050565b5f60208284031215610c83575f80fd5b5035919050565b5f8060408385031215610c9b575f80fd5b50508035926020909101359150565b5f60208284031215610cba575f80fd5b81356001600160a01b0381168114610cd0575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f60208284031215610cfb575f80fd5b813567ffffffffffffffff80821115610d12575f80fd5b818401915084601f830112610d25575f80fd5b813581811115610d3757610d37610cd7565b604051601f8201601f19908116603f01168101908382118183101715610d5f57610d5f610cd7565b81604052828152876020848701011115610d77575f80fd5b826020860160208301375f928101602001929092525095945050505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b5f60208284031215610ddd575f80fd5b81518015158114610cd0575f80fd5b634e487b7160e01b5f52601160045260245ffd5b808202811582820484141761058d5761058d610dec565b8082018082111561058d5761058d610dec565b5f82610e4457634e487b7160e01b5f52601260045260245ffd5b500490565b634e487b7160e01b5f52603260045260245ffdfea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266", + "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000001", + "0x0000000000000000000000000000000000000000000000000000000000000009": "0x000000000000000000000000000000000000000000000000000000003b9aca00", + "0x000000000000000000000000000000000000000000000000000000000000000a": "0x000000000000000000000000000000000000000000000000000000003b9aca00", + "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000001" + } + }, + "0x5300000000000000000000000000000000000003": { + "balance": "0x0", + "code": "0x608060405234801561000f575f80fd5b5060043610610055575f3560e01c8063715018a61461005957806379586dd7146100635780638da5cb5b14610076578063efc78401146100a5578063f2fde38b146100e0575b5f80fd5b6100616100f3565b005b61006161007136600461033a565b610130565b5f54610088906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b6100d06100b336600461040c565b6001600160a01b03165f9081526001602052604090205460ff1690565b604051901515815260200161009c565b6100616100ee36600461040c565b610222565b5f546001600160a01b031633146101255760405162461bcd60e51b815260040161011c9061042c565b60405180910390fd5b61012e5f6102ad565b565b5f546001600160a01b031633146101595760405162461bcd60e51b815260040161011c9061042c565b5f5b825181101561021d578160015f85848151811061017a5761017a610463565b60200260200101516001600160a01b03166001600160a01b031681526020019081526020015f205f6101000a81548160ff0219169083151502179055508281815181106101c9576101c9610463565b60200260200101516001600160a01b03167f8daaf060c3306c38e068a75c054bf96ecd85a3db1252712c4d93632744c42e0d8360405161020d911515815260200190565b60405180910390a260010161015b565b505050565b5f546001600160a01b0316331461024b5760405162461bcd60e51b815260040161011c9061042c565b6001600160a01b0381166102a15760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f2061646472657373000000604482015260640161011c565b6102aa816102ad565b50565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b634e487b7160e01b5f52604160045260245ffd5b80356001600160a01b0381168114610326575f80fd5b919050565b80358015158114610326575f80fd5b5f806040838503121561034b575f80fd5b823567ffffffffffffffff80821115610362575f80fd5b818501915085601f830112610375575f80fd5b8135602082821115610389576103896102fc565b8160051b604051601f19603f830116810181811086821117156103ae576103ae6102fc565b6040529283528183019350848101820192898411156103cb575f80fd5b948201945b838610156103f0576103e186610310565b855294820194938201936103d0565b96506103ff905087820161032b565b9450505050509250929050565b5f6020828403121561041c575f80fd5b61042582610310565b9392505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e6572000000000000000000604082015260600190565b634e487b7160e01b5f52603260045260245ffdfea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266" + } + }, + "0x5300000000000000000000000000000000000005": { + "balance": "0x0", + "code": "0x6080604052600436106100a8575f3560e01c806384411d651161006257806384411d651461017a5780638da5cb5b1461018f5780639e7adc79146101ad578063f2fde38b146101cc578063feec756c146101eb578063ff4f35461461020a575f80fd5b80632e1a7d4d146100b35780633cb747bf146100d45780633ccfd60b14610110578063457e1a491461012457806366d003ac14610147578063715018a614610166575f80fd5b366100af57005b5f80fd5b3480156100be575f80fd5b506100d26100cd366004610663565b610229565b005b3480156100df575f80fd5b506002546100f3906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b34801561011b575f80fd5b506100d26103e9565b34801561012f575f80fd5b5061013960015481565b604051908152602001610107565b348015610152575f80fd5b506003546100f3906001600160a01b031681565b348015610171575f80fd5b506100d26103f6565b348015610185575f80fd5b5061013960045481565b34801561019a575f80fd5b505f546100f3906001600160a01b031681565b3480156101b8575f80fd5b506100d26101c736600461067a565b61042a565b3480156101d7575f80fd5b506100d26101e636600461067a565b6104a4565b3480156101f6575f80fd5b506100d261020536600461067a565b61052c565b348015610215575f80fd5b506100d2610224366004610663565b6105a6565b6001548110156102b95760405162461bcd60e51b815260206004820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d20776974686472616064820152691dd85b08185b5bdd5b9d60b21b608482015260a4015b60405180910390fd5b478082111561031d5760405162461bcd60e51b815260206004820152602a60248201527f4665655661756c743a20696e73756666696369656e742062616c616e636520746044820152696f20776974686472617760b01b60648201526084016102b0565b6004805483019055600354604080518481526001600160a01b0390921660208301523382820152517fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba9181900360600190a1600254600354604080516020810182525f808252915163b2267a7b60e01b81526001600160a01b039485169463b2267a7b9488946103b79491909216928592906004016106a7565b5f604051808303818588803b1580156103ce575f80fd5b505af11580156103e0573d5f803e3d5ffd5b50505050505050565b476103f381610229565b50565b5f546001600160a01b0316331461041f5760405162461bcd60e51b81526004016102b090610711565b6104285f610614565b565b5f546001600160a01b031633146104535760405162461bcd60e51b81526004016102b090610711565b600280546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f1c928c417a10a21c3cddad148c5dba5d710e4b1442d6d8a36de345935ad84612905f90a35050565b5f546001600160a01b031633146104cd5760405162461bcd60e51b81526004016102b090610711565b6001600160a01b0381166105235760405162461bcd60e51b815260206004820152601d60248201527f6e6577206f776e657220697320746865207a65726f206164647265737300000060448201526064016102b0565b6103f381610614565b5f546001600160a01b031633146105555760405162461bcd60e51b81526004016102b090610711565b600380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f7e1e96961a397c8aa26162fe259cc837afc95e33aad4945ddc61c18dabb7a6ad905f90a35050565b5f546001600160a01b031633146105cf5760405162461bcd60e51b81526004016102b090610711565b600180549082905560408051828152602081018490527f0d3c80219fe57713b9f9c83d1e51426792d0c14d8e330e65b102571816140965910160405180910390a15050565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f60208284031215610673575f80fd5b5035919050565b5f6020828403121561068a575f80fd5b81356001600160a01b03811681146106a0575f80fd5b9392505050565b60018060a01b03851681525f60208560208401526080604084015284518060808501525f5b818110156106e85786810183015185820160a0015282016106cc565b505f60a0828601015260a0601f19601f8301168501019250505082606083015295945050505050565b60208082526017908201527f63616c6c6572206973206e6f7420746865206f776e657200000000000000000060408201526060019056fea164736f6c6343000818000a", + "nonce": "0x0", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266", + "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000", + "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000df45f4790e20509959fccc0d09245b216abdaa37", + "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266" + } + }, + "0xdf45f4790e20509959fccc0d09245b216abdaa37": { + "balance": "0x7ffffffffffffffffffffffffffffffffffffffffffffff21f494c589c0000", + "code": "0x", + "nonce": "0x0", + "storage": { + "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x0000000000000000000000000000000000000000000000000000000000000000" + } + }, + "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266": { + "balance": "0xde0b6b3a7640000", + "code": "0x", + "nonce": "0x1", + "storage": {} + } + } +} diff --git a/tests/launch_l1.bash b/tests/launch_l1.bash new file mode 100644 index 00000000..ab86207c --- /dev/null +++ b/tests/launch_l1.bash @@ -0,0 +1,48 @@ +#!/usr/bin/env bash +set -e + +# Start anvil in background +anvil --host 0.0.0.0 --port 8545 --chain-id 22222222 --accounts 10 --balance 10000 --code-size-limit 100000000 & +ANVIL_PID=$! + +# Wait for anvil to start (with retry) +echo "Waiting for anvil to start..." +for i in {1..10}; do + if cast rpc eth_blockNumber --rpc-url http://localhost:8545 > /dev/null 2>&1; then + echo "anvil is ready" + break + fi + sleep 1 + echo "Waiting ($i/10)..." +done + +# Check if anvil is running +if ! cast rpc eth_blockNumber --rpc-url http://localhost:8545 > /dev/null 2>&1; then + echo "Error: anvil failed to start" + exit 1 +fi + +# Set storage +echo "Setting storage..." +cast rpc anvil_setStorageAt \ + 0x55B150d210356452e4E79cCb6B778b4e1B167091 \ + 0x0000000000000000000000000000000000000000000000000000000000000067 \ + 0x000000000000000000000000b674Ff99cca262c99D3eAb5B32796a99188543dA \ + --rpc-url http://localhost:8545 + +# Verify storage +echo "Verifying storage..." +storage_value=$(cast storage 0x55B150d210356452e4E79cCb6B778b4e1B167091 0x67 --rpc-url http://localhost:8545) +expected_value="0x000000000000000000000000b674ff99cca262c99d3eab5b32796a99188543da" + +if [ "$storage_value" != "$expected_value" ]; then + echo "Error: Storage verify failed" + echo "Expected: $expected_value" + echo "Actual: $storage_value" + exit 1 +fi + +echo "anvil started and configured, PID: $ANVIL_PID" + +# Keep container running +wait $ANVIL_PID diff --git a/tests/launch_l2geth.bash b/tests/launch_l2geth.bash new file mode 100644 index 00000000..991ad8f9 --- /dev/null +++ b/tests/launch_l2geth.bash @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +set -e + +geth init --datadir=/l2geth /l2geth-genesis-e2e.json + +# Create config.toml with static nodes instead of bootnodes +echo '[Node.P2P]' > /l2geth/config.toml +echo 'StaticNodes = ["enode://3983278a7cab48862d9ab3187278edf376a0736a7deb55472a5650592f6922ce626a1ea7d74b77b9a679694b343f5e93ea97d5d60a9db4e4b51bb0c23a36d01b@rollup-node-sequencer:30303"]' >> /l2geth/config.toml + +echo "Starting l2geth as follower..." +exec geth --datadir=/l2geth \ + --config /l2geth/config.toml \ + --port 30303 --syncmode full --networkid 1337 --nodiscover \ + --http --http.addr 0.0.0.0 --http.port 8545 --http.vhosts "*" --http.corsdomain "*" --http.api "eth,scroll,net,web3,debug" \ + --ws --ws.addr 0.0.0.0 --ws.port 8546 --ws.api "eth,scroll,net,web3,debug" \ + --pprof --pprof.addr 0.0.0.0 --pprof.port 6060 --metrics --verbosity 5 --log.debug \ + --l1.endpoint "http://l1-node:8545" --l1.confirmations finalized --l1.sync.startblock 0 \ + --gcmode archive --cache.noprefetch --cache.snapshot=0 --snapshot=false \ + --nat extip:0.0.0.0 diff --git a/tests/launch_rollup_node_follower.bash b/tests/launch_rollup_node_follower.bash index 117608f7..4556c108 100644 --- a/tests/launch_rollup_node_follower.bash +++ b/tests/launch_rollup_node_follower.bash @@ -1,13 +1,15 @@ #!/usr/bin/env bash set -e -exec rollup-node node --chain dev --datadir=/l2reth --metrics=0.0.0.0:6060 --network.scroll-wire --network.bridge \ +export RUST_LOG=sqlx=off,scroll=trace,reth=trace,rollup=trace,info + +exec rollup-node node --chain /l2reth/l2reth-genesis-e2e.json --datadir=/l2reth --metrics=0.0.0.0:6060 --network.scroll-wire --network.bridge \ --http --http.addr=0.0.0.0 --http.port=8545 --http.corsdomain "*" --http.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \ --ws --ws.addr=0.0.0.0 --ws.port=8546 --ws.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \ --log.stdout.format log-fmt -vvv \ - --test \ --txpool.pending-max-count=1000 \ - --builder.gaslimit=20000000 \ + --builder.gaslimit=30000000 \ --rpc.max-connections=5000 \ --trusted-peers enode://3983278a7cab48862d9ab3187278edf376a0736a7deb55472a5650592f6922ce626a1ea7d74b77b9a679694b343f5e93ea97d5d60a9db4e4b51bb0c23a36d01b@rollup-node-sequencer:30303 \ - --consensus.algorithm=noop + --engine.sync-at-startup false \ + --consensus.authorized-signer 0xb674Ff99cca262c99D3eAb5B32796a99188543dA diff --git a/tests/launch_rollup_node_sequencer.bash b/tests/launch_rollup_node_sequencer.bash index fa032efb..86626dab 100644 --- a/tests/launch_rollup_node_sequencer.bash +++ b/tests/launch_rollup_node_sequencer.bash @@ -1,15 +1,18 @@ #!/usr/bin/env bash set -e -exec rollup-node node --chain dev --datadir=/l2reth --metrics=0.0.0.0:6060 --network.scroll-wire --network.bridge \ +export RUST_LOG=sqlx=off,scroll=trace,reth=trace,rollup=trace,info + +exec rollup-node node --chain /l2reth/l2reth-genesis-e2e.json --datadir=/l2reth --metrics=0.0.0.0:6060 --network.scroll-wire --network.bridge \ --http --http.addr=0.0.0.0 --http.port=8545 --http.corsdomain "*" --http.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \ --ws --ws.addr=0.0.0.0 --ws.port=8546 --ws.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \ --log.stdout.format log-fmt -vvv \ - --test \ --sequencer.enabled \ + --signer.key-file /l2reth/sequencer-key.txt \ --sequencer.block-time 250 \ --sequencer.payload-building-duration 230 \ --txpool.pending-max-count=1000 \ - --builder.gaslimit=20000000 \ + --builder.gaslimit=30000000 \ --rpc.max-connections=5000 \ - --consensus.algorithm=noop + --engine.sync-at-startup false \ + --consensus.authorized-signer 0xb674Ff99cca262c99D3eAb5B32796a99188543dA diff --git a/tests/sequencer-key.txt b/tests/sequencer-key.txt new file mode 100644 index 00000000..9ad7efd8 --- /dev/null +++ b/tests/sequencer-key.txt @@ -0,0 +1 @@ +0xd510c4b7c61a604f800c4f06803b1ee14b9a63de345e53426ae50425f2dbb058 \ No newline at end of file diff --git a/tests/src/docker_compose.rs b/tests/src/docker_compose.rs index 06c29a73..565b344f 100644 --- a/tests/src/docker_compose.rs +++ b/tests/src/docker_compose.rs @@ -18,6 +18,9 @@ impl DockerComposeEnv { /// The follower node RPC URL for the Docker Compose environment. const FOLLOWER_RPC_URL: &str = "http://localhost:8547"; + /// The l2geth node RPC URL for the Docker Compose environment. + const L2GETH_RPC_URL: &str = "http://localhost:8549"; + // ===== CONSTRUCTOR AND LIFECYCLE ===== /// Create a new DockerComposeEnv and wait for all services to be ready @@ -40,6 +43,7 @@ impl DockerComposeEnv { tracing::info!("⏳ Waiting for services to be ready..."); env.wait_for_sequencer_ready().await?; env.wait_for_follower_ready().await?; + env.wait_for_l2geth_ready().await?; tracing::info!("✅ All services are ready!"); Ok(env) @@ -121,6 +125,11 @@ impl DockerComposeEnv { Self::wait_for_l2_node_ready(Self::FOLLOWER_RPC_URL, 30).await } + /// Wait for l2geth to be ready + async fn wait_for_l2geth_ready(&self) -> Result<()> { + Self::wait_for_l2_node_ready(Self::L2GETH_RPC_URL, 30).await // Same timeout as others + } + /// Wait for L2 node to be ready async fn wait_for_l2_node_ready(provider_url: &str, max_retries: u32) -> Result<()> { for i in 0..max_retries { @@ -173,6 +182,15 @@ impl DockerComposeEnv { .map_err(|e| eyre::eyre!("Failed to connect to follower: {}", e)) } + /// Get a configured l2geth provider + pub async fn get_l2geth_provider(&self) -> Result> { + ProviderBuilder::<_, _, Scroll>::default() + .with_recommended_fillers() + .connect(Self::L2GETH_RPC_URL) + .await + .map_err(|e| eyre::eyre!("Failed to connect to l2geth: {}", e)) + } + // ===== UTILITIES ===== /// Show logs for all containers diff --git a/tests/tests/block_propagation_multi_clients.rs b/tests/tests/block_propagation_multi_clients.rs new file mode 100644 index 00000000..4383ea67 --- /dev/null +++ b/tests/tests/block_propagation_multi_clients.rs @@ -0,0 +1,148 @@ +//! Tests for block propagation to both geth and reth follower nodes. + +use alloy_provider::Provider; +use alloy_rpc_types_eth::BlockNumberOrTag; +use eyre::Result; +use scroll_alloy_network::Scroll; +use std::time::Duration; +use tests::DockerComposeEnv; + +#[tokio::test] +async fn test_docker_block_propagation_to_both_clients() -> Result<()> { + tracing::info!("=== STARTING test_docker_block_propagation_to_both_clients ==="); + let env = DockerComposeEnv::new("multi-client-propagation").await?; + + let sequencer = env.get_sequencer_provider().await?; + tracing::info!("✅ Sequencer provider created"); + + let reth_follower = env.get_follower_provider().await?; + tracing::info!("✅ Reth follower provider created"); + + let geth_follower = env.get_l2geth_provider().await?; + tracing::info!("✅ Geth follower provider created"); + + // Verify all nodes have the same chain ID + let seq_chain_id = sequencer.get_chain_id().await?; + let reth_chain_id = reth_follower.get_chain_id().await?; + let geth_chain_id = geth_follower.get_chain_id().await?; + + tracing::info!( + "✅ All clients connected - Sequencer: {seq_chain_id}, Reth: {reth_chain_id}, Geth: {geth_chain_id}" + ); + + assert_eq!(seq_chain_id, reth_chain_id, "Sequencer and Reth chain IDs must match"); + assert_eq!(seq_chain_id, geth_chain_id, "Sequencer and Geth chain IDs must match"); + + // Wait for sequencer to produce blocks + let target_block = wait_for_sequencer_blocks(&sequencer, 15).await?; + tracing::info!( + "Sequencer produced {target_block} blocks, now waiting for followers to sync..." + ); + + // Wait for both followers to sync + wait_for_follower_sync(&reth_follower, "Reth", target_block).await?; + wait_for_follower_sync(&geth_follower, "Geth", target_block).await?; + + // Verify blocks match across all clients + for block_num in 1..=target_block { + verify_blocks_match_all_clients(&sequencer, &reth_follower, &geth_follower, block_num) + .await?; + } + + tracing::info!( + "✅ Block hashes match across all clients for blocks 1-{target_block}. Multi-client propagation test completed successfully!" + ); + + Ok(()) +} + +/// Waits for the sequencer to produce a specific number of new blocks. +async fn wait_for_sequencer_blocks( + sequencer: &impl Provider, + num_blocks: u64, +) -> Result { + let start_block = sequencer.get_block_number().await?; + let target_block = start_block + num_blocks; + tracing::info!( + "⏳ Waiting for sequencer to produce {num_blocks} blocks (target: {target_block})..." + ); + + for _ in 0..15 { + // 15 second timeout + let current_block = sequencer.get_block_number().await?; + if current_block >= target_block { + tracing::info!("✅ Sequencer reached block {current_block}"); + return Ok(current_block); + } + tokio::time::sleep(Duration::from_secs(1)).await; + } + eyre::bail!("Timeout waiting for sequencer to produce blocks") +} + +/// Waits for a follower to sync up to the target block. +async fn wait_for_follower_sync( + follower: &impl Provider, + client_name: &str, + target_block: u64, +) -> Result<()> { + tracing::info!("⏳ Waiting for {client_name} follower to sync to block {target_block}..."); + + for _ in 0..20 { + // 20 second timeout for followers + let follower_block = follower.get_block_number().await?; + if follower_block >= target_block { + tracing::info!("✅ {client_name} follower synced to block {follower_block}"); + return Ok(()); + } + tokio::time::sleep(Duration::from_secs(1)).await; + } + eyre::bail!("Timeout waiting for {client_name} follower to sync") +} + +/// Verifies that block hashes match across all three clients for a given block number. +async fn verify_blocks_match_all_clients( + sequencer: &impl Provider, + reth_follower: &impl Provider, + geth_follower: &impl Provider, + block_number: u64, +) -> Result<()> { + let seq_block_opt = + sequencer.get_block_by_number(BlockNumberOrTag::Number(block_number)).await?; + let reth_block_opt = + reth_follower.get_block_by_number(BlockNumberOrTag::Number(block_number)).await?; + let geth_block_opt = + geth_follower.get_block_by_number(BlockNumberOrTag::Number(block_number)).await?; + + let seq_block = + seq_block_opt.ok_or_else(|| eyre::eyre!("Sequencer block {} not found", block_number))?; + let reth_block = + reth_block_opt.ok_or_else(|| eyre::eyre!("Reth block {} not found", block_number))?; + let geth_block = + geth_block_opt.ok_or_else(|| eyre::eyre!("Geth block {} not found", block_number))?; + + // Compare block hashes + let seq_hash = seq_block.header.hash; + let reth_hash = reth_block.header.hash; + let geth_hash = geth_block.header.hash; + + if seq_hash != reth_hash { + eyre::bail!( + "Block {} hashes differ between sequencer and reth: sequencer={:?}, reth={:?}", + block_number, + seq_hash, + reth_hash + ); + } + + if seq_hash != geth_hash { + eyre::bail!( + "Block {} hashes differ between sequencer and geth: sequencer={:?}, geth={:?}", + block_number, + seq_hash, + geth_hash + ); + } + + tracing::debug!("✅ Block {block_number} matches across all clients: hash={seq_hash:?}"); + Ok(()) +}