diff --git a/Cargo.lock b/Cargo.lock index ef21dbea..db8164cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -58,9 +58,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5bedd6a59a2bd3a2f1cb7ff488549a2004302edca4df4d578bf0a814888615" +checksum = "ae58d888221eecf621595e2096836ce7cfc37be06bfa39d7f64aa6a3ea4c9e5b" dependencies = [ "alloy-consensus", "alloy-core", @@ -75,9 +75,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a9cc9d81ace3da457883b0bdf76776e55f1b84219a9e9d55c27ad308548d3f" +checksum = "5674914c2cfdb866c21cb0c09d82374ee39a1395cf512e7515f4c014083b3fff" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -88,15 +88,15 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b77018eec2154eb158869f9f2914a3ea577adf87b11be2764d4795d5ccccf7" +checksum = "73e7f99e3a50210eaee2abd57293a2e72b1a5b7bb251b44c4bf33d02ddd402ab" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-serde", - "alloy-trie 0.9.0", + "alloy-trie", "alloy-tx-macros", "auto_impl", "c-kzg", @@ -105,7 +105,7 @@ dependencies = [ "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell", "rand 0.8.5", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_with", "thiserror 2.0.12", @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bf8b058ff364d6e94bcd2979d7da1862e94d2987065a4eb41fa9eac36e028a" +checksum = "9945351a277c914f3776ae72b3fc1d22f90d2e840276830e48e9be5bf371a8fe" dependencies = [ "alloy-consensus", "alloy-eips", @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d134f3ac4926124eaf521a1031d11ea98816df3d39fc446fcfd6b36884603f" +checksum = "4134375e533d095e045982cd7684a29c37089ab7a605ecf2b4aa17a5e61d72d3" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -194,41 +194,43 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.10.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394b09cf3a32773eedf11828987f9c72dfa74545040be0422e3f5f09a2a3fab9" +checksum = "ff5aae4c6dc600734b206b175f3200085ee82dcdaa388760358830a984ca9869" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-hardforks", "alloy-primitives", + "alloy-rpc-types-eth", "alloy-sol-types", "auto_impl", "derive_more", "op-alloy-consensus", "op-revm", - "revm 24.0.1", + "revm", "thiserror 2.0.12", ] [[package]] name = "alloy-genesis" -version = "1.0.12" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8500bcc1037901953771c25cb77e0d4ec0bffd938d93a04715390230d21a612d" +checksum = "d61d58e94791b74c2566a2f240f3f796366e2479d4d39b4a3ec848c733fb92ce" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-serde", - "alloy-trie 0.8.1", + "alloy-trie", "serde", + "serde_with", ] [[package]] name = "alloy-hardforks" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ce138b29a2f8e7ed97c064af8359dfa6559c12cba5e821ae4eb93081a56557e" +checksum = "819a3620fe125e0fff365363315ee5e24c23169173b19747dfd6deba33db8990" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -252,9 +254,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31cfdacfeb6b6b40bf6becf92e69e575c68c9f80311c3961d019e29c0b8d6be2" +checksum = "1edaf2255b0ea9213ecbb056fa92870d858719911e04fb4260bcc43f7743d370" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -267,9 +269,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.0.13" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fe3fc1d6e5e5914e239f9fb7fb06a55b1bb8fe6e1985933832bd92da327a20" +checksum = "c224eafcd1bd4c54cc45b5fc3634ae42722bdb9253780ac64a5deffd794a6cec" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -293,9 +295,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc2689c8addfc43461544d07a6f5f3a3e1f5f4efae61206cb5783dc383cfc8f" +checksum = "0b21283a28b117505a75ee1f2e63c16ea2ea72afca44f670b1f02795d9f5d988" dependencies = [ "alloy-consensus", "alloy-eips", @@ -333,9 +335,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ced931220f547d30313530ad315654b7862ef52631c90ab857d792865f84a7d" +checksum = "09e5f02654272d9a95c66949b78f30c87701c232cf8302d4a1dab02957f5a0c1" dependencies = [ "alloy-chains", "alloy-consensus", @@ -395,9 +397,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1d1eac6e48b772c7290f0f79211a0e822a38b057535b514cc119abd857d5b6" +checksum = "c956d223a5fa7ef28af1c6ae41b77ecb95a36d686d5644ee22266f6b517615b4" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -420,9 +422,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02cfd7ecb21a1bfe68ac6b551172e4d41f828bcc33a2e1563a65d482d4efc1cf" +checksum = "0c13e5081ae6b99a7f4e46c18b80d652440320ff404790932cb8259ec73f596e" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -431,9 +433,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662b720c498883427ffb9f5e38c7f02b56ac5c0cdd60b457e88ce6b6a20b9ce9" +checksum = "14796fd8574c77213802b0dc0e85886b5cb27c44e72678ab7d0a4a2d5aee79e9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -445,9 +447,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb082c325bdfd05a7c71f52cd1060e62491fbf6edf55962720bdc380847b0784" +checksum = "1bea7326ca6cd6971c58042055a039d5c97a1431e30380d8b4883ad98067c1b5" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -465,9 +467,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f26c17270c2ac1bd555c4304fe067639f0ddafdd3c8d07a200b2bb5a326e03" +checksum = "06c02a06ae34d2354398dc9d2de0503129c3f0904a3eb791b5d0149f267c2688" dependencies = [ "alloy-primitives", "serde", @@ -476,9 +478,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d9fd649d6ed5b8d7e5014e01758efb937e8407124b182a7f711bf487a1a2697" +checksum = "2389ec473fc24735896960b1189f1d92177ed53c4e464d285e54ed3483f9cca3" dependencies = [ "alloy-primitives", "async-trait", @@ -561,9 +563,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b790b89e31e183ae36ac0a1419942e21e94d745066f5281417c3e4299ea39e" +checksum = "b99ffb19be54a61d18599843ef887ddd12c3b713244462c184e2eab67106d51a" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -584,9 +586,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f643645a33a681d09ac1ca2112014c2ca09c68aad301da4400484d59c746bc70" +checksum = "92b5a640491f3ab18d17bd6e521c64744041cd86f741b25cdb6a346ca0e90c66" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -597,22 +599,6 @@ dependencies = [ "url", ] -[[package]] -name = "alloy-trie" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983d99aa81f586cef9dae38443245e585840fcf0fc58b09aee0b1f27aed1d500" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "arrayvec", - "derive_more", - "nybbles 0.3.4", - "serde", - "smallvec", - "tracing", -] - [[package]] name = "alloy-trie" version = "0.9.0" @@ -623,7 +609,7 @@ dependencies = [ "alloy-rlp", "arrayvec", "derive_more", - "nybbles 0.4.0", + "nybbles", "serde", "smallvec", "tracing", @@ -631,9 +617,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ef40a046b9bf141afc440cef596c79292708aade57c450dc74e843270fd8e7" +checksum = "afd621a9ddef2fdc06d17089f45e47cf84d0b46ca5a1bc6c83807c9119636f52" dependencies = [ "alloy-primitives", "darling", @@ -1084,6 +1070,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "az" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" + [[package]] name = "backtrace" version = "0.3.75" @@ -1325,9 +1317,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.27" +version = "1.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362" dependencies = [ "jobserver", "libc", @@ -1361,9 +1353,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.40" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" +checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9" dependencies = [ "clap_builder", "clap_derive", @@ -1371,9 +1363,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.40" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" +checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d" dependencies = [ "anstream", "anstyle", @@ -1383,9 +1375,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.40" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" +checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" dependencies = [ "heck", "proc-macro2", @@ -2174,6 +2166,16 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +[[package]] +name = "gmp-mpfr-sys" +version = "1.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66d61197a68f6323b9afa616cf83d55d69191e1bf364d4eb7d35ae18defe776" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "group" version = "0.13.0" @@ -2187,9 +2189,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5" +checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785" dependencies = [ "atomic-waker", "bytes", @@ -2410,9 +2412,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" +checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df" dependencies = [ "base64", "bytes", @@ -2644,6 +2646,17 @@ dependencies = [ "str_stack", ] +[[package]] +name = "io-uring" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013" +dependencies = [ + "bitflags 2.9.1", + "cfg-if", + "libc", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -3244,24 +3257,12 @@ dependencies = [ [[package]] name = "nybbles" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8983bb634df7248924ee0c4c3a749609b5abcb082c28fffe3254b3eb3602b307" -dependencies = [ - "alloy-rlp", - "const-hex", - "proptest", - "serde", - "smallvec", -] - -[[package]] -name = "nybbles" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d51b0175c49668a033fe7cc69080110d9833b291566cdf332905f3ad9c68a0" +checksum = "675b3a54e5b12af997abc8b6638b0aee51a28caedab70d4967e0d5db3a3f1d06" dependencies = [ "alloy-rlp", + "cfg-if", "proptest", "ruint", "serde", @@ -3295,9 +3296,9 @@ checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] name = "op-alloy-consensus" -version = "0.17.2" +version = "0.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2423a125ef2daa0d15dacc361805a0b6f76d6acfc6e24a1ff6473582087fe75" +checksum = "a8719d9b783b29cfa1cf8d591b894805786b9ab4940adc700a57fd0d5b721cf5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3312,13 +3313,13 @@ dependencies = [ [[package]] name = "op-revm" -version = "5.0.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0e8a3830a2be82166fbe9ead34361149ff4320743ed7ee5502ab779de221361" +checksum = "2b97d2b54651fcd2955b454e86b2336c031e17925a127f4c44e2b63b2eeda923" dependencies = [ "auto_impl", "once_cell", - "revm 24.0.1", + "revm", "serde", ] @@ -4554,9 +4555,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.20" +version = "0.12.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" +checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" dependencies = [ "base64", "bytes", @@ -4598,8 +4599,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-chains", "alloy-consensus", @@ -4607,7 +4608,7 @@ dependencies = [ "alloy-evm", "alloy-genesis", "alloy-primitives", - "alloy-trie 0.8.1", + "alloy-trie", "auto_impl", "derive_more", "reth-ethereum-forks", @@ -4618,14 +4619,14 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives", - "alloy-trie 0.8.1", + "alloy-trie", "bytes", "modular-bitfield", "op-alloy-consensus", @@ -4636,8 +4637,8 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "convert_case", "proc-macro2", @@ -4647,8 +4648,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4657,8 +4658,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -4669,8 +4670,8 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4684,8 +4685,8 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4700,14 +4701,14 @@ dependencies = [ "reth-storage-api", "reth-storage-errors", "reth-trie-common", - "revm 24.0.0", + "revm", "scroll-alloy-evm", ] [[package]] name = "reth-evm-ethereum" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4719,26 +4720,26 @@ dependencies = [ "reth-evm", "reth-execution-types", "reth-primitives-traits", - "revm 24.0.0", + "revm", ] [[package]] name = "reth-execution-errors" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-evm", "alloy-primitives", "alloy-rlp", - "nybbles 0.3.4", + "nybbles", "reth-storage-errors", "thiserror 2.0.12", ] [[package]] name = "reth-execution-types" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4748,13 +4749,13 @@ dependencies = [ "reth-ethereum-primitives", "reth-primitives-traits", "reth-trie-common", - "revm 24.0.0", + "revm", ] [[package]] name = "reth-network-peers" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -4765,8 +4766,8 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "once_cell", @@ -4778,15 +4779,16 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives", "alloy-rlp", - "alloy-trie 0.8.1", + "alloy-rpc-types-eth", + "alloy-trie", "auto_impl", "bytes", "derive_more", @@ -4797,7 +4799,7 @@ dependencies = [ "revm-primitives", "revm-state", "scroll-alloy-consensus", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_with", "thiserror 2.0.12", @@ -4805,8 +4807,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-primitives", "derive_more", @@ -4815,8 +4817,8 @@ dependencies = [ [[package]] name = "reth-scroll-chainspec" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-chains", "alloy-consensus", @@ -4839,8 +4841,8 @@ dependencies = [ [[package]] name = "reth-scroll-evm" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4855,9 +4857,9 @@ dependencies = [ "reth-scroll-chainspec", "reth-scroll-forks", "reth-scroll-primitives", - "revm 24.0.0", + "revm", "revm-primitives", - "revm-scroll 0.1.0 (git+https://github.com/scroll-tech/scroll-revm?rev=6ccb897197d7ed319463df487f428fce0a77b47f)", + "revm-scroll", "scroll-alloy-consensus", "scroll-alloy-evm", "scroll-alloy-hardforks", @@ -4867,8 +4869,8 @@ dependencies = [ [[package]] name = "reth-scroll-forks" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-chains", "alloy-primitives", @@ -4881,8 +4883,8 @@ dependencies = [ [[package]] name = "reth-scroll-primitives" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4898,8 +4900,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-primitives", "reth-trie-common", @@ -4907,8 +4909,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-primitives", "derive_more", @@ -4918,8 +4920,8 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4940,8 +4942,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4956,14 +4958,14 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-trie 0.8.1", + "alloy-trie", "auto_impl", "itertools 0.14.0", "reth-execution-errors", @@ -4978,28 +4980,28 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-rlp", - "alloy-trie 0.8.1", + "alloy-trie", "derive_more", "itertools 0.14.0", - "nybbles 0.3.4", + "nybbles", "reth-primitives-traits", "revm-database", ] [[package]] name = "reth-trie-sparse" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-primitives", "alloy-rlp", - "alloy-trie 0.8.1", + "alloy-trie", "auto_impl", "reth-execution-errors", "reth-primitives-traits", @@ -5010,43 +5012,24 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "24.0.0" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" -dependencies = [ - "revm-bytecode", - "revm-context 5.0.0", - "revm-context-interface", - "revm-database", - "revm-database-interface", - "revm-handler 5.0.0", - "revm-inspector 5.0.0", - "revm-interpreter", - "revm-precompile", - "revm-primitives", - "revm-state", -] - -[[package]] -name = "revm" -version = "24.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d277408ff8d6f747665ad9e52150ab4caf8d5eaf0d787614cf84633c8337b4" +version = "26.0.1" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "revm-bytecode", - "revm-context 5.0.1", + "revm-context", "revm-context-interface", "revm-database", "revm-database-interface", - "revm-handler 5.0.1", - "revm-inspector 5.0.1", + "revm-handler", + "revm-inspector", "revm-interpreter", "revm-precompile", "revm-primitives", @@ -5055,8 +5038,8 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "4.0.1" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" +version = "5.0.0" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "bitvec", "once_cell", @@ -5067,24 +5050,8 @@ dependencies = [ [[package]] name = "revm-context" -version = "5.0.0" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" -dependencies = [ - "cfg-if", - "derive-where", - "revm-bytecode", - "revm-context-interface", - "revm-database-interface", - "revm-primitives", - "revm-state", - "serde", -] - -[[package]] -name = "revm-context" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01aad49e1233f94cebda48a4e5cef022f7c7ed29b4edf0d202b081af23435ef" +version = "7.0.1" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "cfg-if", "derive-where", @@ -5098,8 +5065,8 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "5.0.0" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" +version = "7.0.1" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -5113,8 +5080,8 @@ dependencies = [ [[package]] name = "revm-database" -version = "4.0.1" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" +version = "6.0.0" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "alloy-eips", "revm-bytecode", @@ -5126,8 +5093,8 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "4.0.1" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" +version = "6.0.0" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "auto_impl", "revm-primitives", @@ -5137,30 +5104,13 @@ dependencies = [ [[package]] name = "revm-handler" -version = "5.0.0" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" -dependencies = [ - "auto_impl", - "revm-bytecode", - "revm-context 5.0.0", - "revm-context-interface", - "revm-database-interface", - "revm-interpreter", - "revm-precompile", - "revm-primitives", - "revm-state", - "serde", -] - -[[package]] -name = "revm-handler" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "481e8c3290ff4fa1c066592fdfeb2b172edfd14d12e6cade6f6f5588cad9359a" +version = "7.0.1" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "auto_impl", + "derive-where", "revm-bytecode", - "revm-context 5.0.1", + "revm-context", "revm-context-interface", "revm-database-interface", "revm-interpreter", @@ -5172,30 +5122,14 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "5.0.0" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" -dependencies = [ - "auto_impl", - "revm-context 5.0.0", - "revm-database-interface", - "revm-handler 5.0.0", - "revm-interpreter", - "revm-primitives", - "revm-state", - "serde", - "serde_json", -] - -[[package]] -name = "revm-inspector" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc1167ef8937d8867888e63581d8ece729a72073d322119ef4627d813d99ecb" +version = "7.0.1" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "auto_impl", - "revm-context 5.0.1", + "either", + "revm-context", "revm-database-interface", - "revm-handler 5.0.1", + "revm-handler", "revm-interpreter", "revm-primitives", "revm-state", @@ -5205,8 +5139,8 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "20.0.0" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" +version = "22.0.1" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -5216,8 +5150,8 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "21.0.0" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" +version = "23.0.0" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -5234,14 +5168,15 @@ dependencies = [ "p256", "revm-primitives", "ripemd", - "secp256k1", + "rug", + "secp256k1 0.31.1", "sha2 0.10.9", ] [[package]] name = "revm-primitives" -version = "19.1.0" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" +version = "20.0.0" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "alloy-primitives", "num_enum", @@ -5251,34 +5186,21 @@ dependencies = [ [[package]] name = "revm-scroll" version = "0.1.0" -source = "git+https://github.com/scroll-tech/scroll-revm?rev=6c1942f9a8eaf7aae1807654c4ee99d771150fbd#6c1942f9a8eaf7aae1807654c4ee99d771150fbd" -dependencies = [ - "auto_impl", - "enumn", - "once_cell", - "revm 24.0.0", - "revm-inspector 5.0.0", - "revm-primitives", -] - -[[package]] -name = "revm-scroll" -version = "0.1.0" -source = "git+https://github.com/scroll-tech/scroll-revm?rev=6ccb897197d7ed319463df487f428fce0a77b47f#6ccb897197d7ed319463df487f428fce0a77b47f" +source = "git+https://github.com/scroll-tech/scroll-revm?branch=main#6a1e33df5b9e5ad6585a8469faaba9e6ea5e3f3d" dependencies = [ "auto_impl", "enumn", "once_cell", - "revm 24.0.0", - "revm-inspector 5.0.0", + "revm", + "revm-inspector", "revm-primitives", "serde", ] [[package]] name = "revm-state" -version = "4.0.1" -source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v74#774616019e9562b12cbe1c3f1cdd110793f8084c" +version = "6.0.0" +source = "git+https://github.com/scroll-tech/revm?branch=feat/reth-v78#7689e1dd018467b4987db2b0a5f05bc0e5f54ffd" dependencies = [ "bitflags 2.9.1", "revm-bytecode", @@ -5298,9 +5220,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.50" +version = "0.8.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" +checksum = "a457e416a0f90d246a4c3288bd7a25b2304ca727f253f95be383dd17af56be8f" dependencies = [ "bytemuck", ] @@ -5368,6 +5290,18 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "rug" +version = "1.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4207e8d668e5b8eb574bda8322088ccd0d7782d3d03c7e8d562e82ed82bdcbc3" +dependencies = [ + "az", + "gmp-mpfr-sys", + "libc", + "libm", +] + [[package]] name = "ruint" version = "1.15.0" @@ -5621,8 +5555,8 @@ dependencies = [ "reth-scroll-evm", "reth-scroll-forks", "reth-scroll-primitives", - "revm 24.0.0", - "revm-scroll 0.1.0 (git+https://github.com/scroll-tech/scroll-revm?rev=6c1942f9a8eaf7aae1807654c4ee99d771150fbd)", + "revm", + "revm-scroll", "rkyv", "sbv-helpers", "sbv-kv", @@ -5640,7 +5574,7 @@ name = "sbv-trie" version = "2.0.0" dependencies = [ "alloy-rlp", - "alloy-trie 0.8.1", + "alloy-trie", "reth-trie", "reth-trie-sparse", "sbv-helpers", @@ -5684,6 +5618,18 @@ dependencies = [ "serde_json", ] +[[package]] +name = "schemars" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -5692,8 +5638,8 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scroll-alloy-consensus" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5708,16 +5654,16 @@ dependencies = [ [[package]] name = "scroll-alloy-evm" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-evm", "alloy-primitives", "auto_impl", - "revm 24.0.0", - "revm-scroll 0.1.0 (git+https://github.com/scroll-tech/scroll-revm?rev=6ccb897197d7ed319463df487f428fce0a77b47f)", + "revm", + "revm-scroll", "scroll-alloy-consensus", "scroll-alloy-hardforks", "serde", @@ -5726,8 +5672,8 @@ dependencies = [ [[package]] name = "scroll-alloy-hardforks" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-hardforks", "auto_impl", @@ -5736,8 +5682,8 @@ dependencies = [ [[package]] name = "scroll-alloy-network" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-network", @@ -5751,8 +5697,8 @@ dependencies = [ [[package]] name = "scroll-alloy-rpc-types" -version = "1.4.8" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#b2377df23567e57f1068911d947d2ca0f9c34252" +version = "1.5.0" +source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5789,10 +5735,21 @@ checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ "bitcoin_hashes", "rand 0.8.5", - "secp256k1-sys", + "secp256k1-sys 0.10.1", "serde", ] +[[package]] +name = "secp256k1" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2" +dependencies = [ + "bitcoin_hashes", + "rand 0.9.1", + "secp256k1-sys 0.11.0", +] + [[package]] name = "secp256k1-sys" version = "0.10.1" @@ -5802,6 +5759,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -5933,16 +5899,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42" +checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5" dependencies = [ "base64", "chrono", "hex", "indexmap 1.9.3", "indexmap 2.10.0", - "schemars", + "schemars 0.9.0", + "schemars 1.0.4", "serde", "serde_derive", "serde_json", @@ -5952,9 +5919,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77" +checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f" dependencies = [ "darling", "proc-macro2", @@ -6462,17 +6429,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.45.1" +version = "1.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", + "slab", "socket2", "tokio-macros", "windows-sys 0.52.0", diff --git a/Cargo.toml b/Cargo.toml index 54691fca..2859478c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,33 +34,33 @@ alloy-transport = { version = "1.0", default-features = false } # https://github.com/alloy-rs/rlp alloy-rlp = { version = "0.3", default-features = false } # https://github.com/alloy-rs/trie -alloy-trie = { version = "0.8", default-features = false } +alloy-trie = { version = "0.9", default-features = false } # https://github.com/alloy-rs/core -alloy-primitives = { version = "1.1", default-features = false, features = ["map-hashbrown", "map-fxhash"] } +alloy-primitives = { version = "1.2", default-features = false, features = ["map-hashbrown", "map-fxhash"] } # https://github.com/alloy-rs/evm -alloy-evm = { version = "0.10", default-features = false } - -revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", rev = "6c1942f9a8eaf7aae1807654c4ee99d771150fbd", default-features = false } - -reth-chainspec = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-evm = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-evm-ethereum = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-ethereum-forks = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-execution-types = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-primitives = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-primitives-traits = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-trie = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-trie-sparse = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } - -reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-scroll-evm = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-scroll-forks = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } - -scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } -scroll-alloy-network = { git = "https://github.com/scroll-tech/reth", branch = "scroll", default-features = false } +alloy-evm = { version = "0.12", default-features = false } + +revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", branch = "main", default-features = false } + +reth-chainspec = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-evm = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-evm-ethereum = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-ethereum-forks = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-execution-types = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-primitives = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-primitives-traits = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-trie = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-trie-sparse = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } + +reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-scroll-evm = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-scroll-forks = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } + +scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +scroll-alloy-network = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "3c800070d363237832a66dbe5501d3c365f3c549" } openvm-keccak256 = { git = "https://github.com/openvm-org/openvm.git", rev = "3c800070d363237832a66dbe5501d3c365f3c549" } @@ -120,7 +120,7 @@ sbv-utils = { path = "crates/utils" } [workspace.dependencies.revm] git = "https://github.com/scroll-tech/revm" -branch = "feat/reth-v74" +branch = "feat/reth-v78" default-features = false features = ["std"] @@ -129,18 +129,18 @@ missing-docs = "deny" missing-debug-implementations = "deny" [patch.crates-io] -revm = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-bytecode = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-context = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-context-interface = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-database = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-database-interface = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-handler = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-inspector = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-interpreter = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-precompile = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-primitives = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } -revm-state = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v74" } +revm = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-bytecode = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-context = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-context-interface = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-database = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-database-interface = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-handler = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-inspector = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-interpreter = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-precompile = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-primitives = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } +revm-state = { git = "https://github.com/scroll-tech/revm", branch = "feat/reth-v78" } # patched add rkyv support ruint = { git = "https://github.com/scroll-tech/uint.git", branch = "v1.15.0" } diff --git a/crates/core/src/executor/ethereum.rs b/crates/core/src/executor/ethereum.rs index 13e1e5a3..cba31417 100644 --- a/crates/core/src/executor/ethereum.rs +++ b/crates/core/src/executor/ethereum.rs @@ -30,7 +30,7 @@ use sbv_trie::TrieNode; use std::sync::Arc; /// Ethereum-related EVM configuration with [`SbvEthEvmFactory`] as the factory. -pub type EvmConfig = EthEvmConfig; +pub type EvmConfig = EthEvmConfig; /// EVM executor that handles the block. #[derive(Debug)] diff --git a/crates/trie/src/lib.rs b/crates/trie/src/lib.rs index 442cd5dd..20e52bf3 100644 --- a/crates/trie/src/lib.rs +++ b/crates/trie/src/lib.rs @@ -437,12 +437,12 @@ fn traverse_import_partial_trie< } TrieNode::Leaf(ref leaf) => { let mut full = path.clone(); - full.extend_from_slice_unchecked(&leaf.key); + full.extend(&leaf.key); store_leaf(full, &leaf.value)?; } TrieNode::Extension(ref extension) => { let mut child_path = path.clone(); - child_path.extend_from_slice_unchecked(&extension.key); + child_path.extend(&extension.key); if let Some(child_node) = decode_rlp_node(nodes, &extension.child)? { traverse_import_partial_trie(&child_path, child_node, nodes, trie, store_leaf)?;