diff --git a/Cargo.lock b/Cargo.lock index 51f1fe7dbe764..dc155a550b4e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,7 +133,7 @@ dependencies = [ "either", "k256", "once_cell", - "rand 0.8.5", + "rand 0.8.6", "secp256k1 0.30.0", "serde", "serde_json", @@ -339,9 +339,9 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.32.0" +version = "0.33.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f107d0e588e5d25fcf2db216390445d5804b875a22a419407ad0389b925bb4d" +checksum = "6fc4b83cb672156663e6094d098beb509965b7fe684bb3d6e44bb9ca2e9ae714" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -455,7 +455,7 @@ dependencies = [ [[package]] name = "alloy-op-evm" version = "0.30.0" -source = "git+https://github.com/foundry-rs/optimism?branch=develop#0dc3c00bd1b3b2976f53503ba92fe84c602deca6" +source = "git+https://github.com/foundry-rs/optimism?branch=rusowsky%2Frevm-38#76ee088e7a86f413c7d15bc07eab071b1009c685" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -472,7 +472,7 @@ dependencies = [ [[package]] name = "alloy-op-hardforks" version = "0.4.7" -source = "git+https://github.com/foundry-rs/optimism?branch=develop#0dc3c00bd1b3b2976f53503ba92fe84c602deca6" +source = "git+https://github.com/foundry-rs/optimism?branch=rusowsky%2Frevm-38#76ee088e7a86f413c7d15bc07eab071b1009c685" dependencies = [ "alloy-chains", "alloy-hardforks", @@ -715,7 +715,7 @@ dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", "jsonwebtoken", - "rand 0.8.5", + "rand 0.8.6", "serde", "strum", ] @@ -878,7 +878,7 @@ dependencies = [ "coins-bip39", "eth-keystore", "k256", - "rand 0.8.5", + "rand 0.8.6", "thiserror 2.0.18", "zeroize", ] @@ -1194,7 +1194,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1218,7 +1218,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1274,7 +1274,7 @@ dependencies = [ "op-alloy-rpc-types", "op-revm", "parking_lot", - "rand 0.8.5", + "rand 0.8.6", "rand 0.9.4", "reqwest 0.13.2", "revm", @@ -1630,7 +1630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "num-traits", - "rand 0.8.5", + "rand 0.8.6", ] [[package]] @@ -1640,7 +1640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand 0.8.6", ] [[package]] @@ -1650,7 +1650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" dependencies = [ "num-traits", - "rand 0.8.5", + "rand 0.8.6", ] [[package]] @@ -2086,9 +2086,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.10.3" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028999056d2d2fd58a697232f9eec4a643cf73a71cf327690a7edad1d2af2110" +checksum = "0504b1ab12debb5959e5165ee5fe97dd387e7aa7ea6a477bfd7635dfe769a4f5" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -2111,11 +2111,12 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.11.6" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876ab3c9c29791ba4ba02b780a3049e21ec63dabda09268b175272c3733a79e6" +checksum = "b71a13df6ada0aafbf21a73bdfcdf9324cfa9df77d96b8446045be3cde61b42e" dependencies = [ "aws-smithy-async", + "aws-smithy-runtime-api-macros", "aws-smithy-types", "bytes", "http 0.2.12", @@ -2126,6 +2127,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "aws-smithy-runtime-api-macros" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7396fd9500589e62e460e987ecb671bad374934e55ec3b5f498cc7a8a8a7b7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "aws-smithy-types" version = "1.4.7" @@ -2558,7 +2570,7 @@ version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "519bd3116aeeb42d5372c29d982d16d0170d3d4a5ed85fc7dd91642ffff3c67c" dependencies = [ - "darling 0.20.11", + "darling 0.23.0", "ident_case", "prettyplease", "proc-macro2", @@ -2771,7 +2783,7 @@ dependencies = [ "op-alloy-consensus", "op-alloy-flz", "op-alloy-network", - "rand 0.8.5", + "rand 0.8.6", "rand 0.9.4", "rayon", "regex", @@ -3021,7 +3033,7 @@ dependencies = [ "terminfo", "thiserror 2.0.18", "which", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3089,7 +3101,7 @@ dependencies = [ "hmac", "once_cell", "pbkdf2 0.12.2", - "rand 0.8.5", + "rand 0.8.6", "sha2 0.10.9", "thiserror 1.0.69", ] @@ -3174,7 +3186,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3214,7 +3226,7 @@ dependencies = [ "cfg-if", "commonware-macros", "paste", - "rand 0.8.5", + "rand 0.8.6", "rand_chacha 0.3.1", "thiserror 2.0.18", ] @@ -3245,7 +3257,7 @@ dependencies = [ "num-rational", "num-traits", "p256", - "rand 0.8.5", + "rand 0.8.6", "rand_chacha 0.3.1", "rand_core 0.6.4", "sha2 0.10.9", @@ -3321,7 +3333,7 @@ dependencies = [ "num-traits", "parking_lot", "pin-project", - "rand 0.8.5", + "rand 0.8.6", "thiserror 2.0.18", "tokio", "zeroize", @@ -3422,11 +3434,12 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.35" +version = "0.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" +checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e" dependencies = [ "const_format_proc_macros", + "konst", ] [[package]] @@ -3958,7 +3971,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4263,7 +4276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4284,7 +4297,7 @@ dependencies = [ "hex", "hmac", "pbkdf2 0.11.0", - "rand 0.8.5", + "rand 0.8.6", "scrypt", "serde", "serde_json", @@ -4475,7 +4488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand 0.8.6", "rustc-hex", "static_assertions", ] @@ -5430,8 +5443,7 @@ dependencies = [ [[package]] name = "foundry-fork-db" version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fb3be6425c3f9c58761c96abf6511d3bc7275b85e060b253d81623351ce721" +source = "git+https://github.com/foundry-rs/foundry-fork-db?branch=rusowsky%2Frevm-38#4a02cd65e5627c07c00bb80f031d2f7a24bd6c09" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6155,7 +6167,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.6", + "webpki-roots 1.0.7", ] [[package]] @@ -6565,7 +6577,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -6820,6 +6832,21 @@ dependencies = [ "sha3-asm", ] +[[package]] +name = "konst" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb" +dependencies = [ + "konst_macro_rules", +] + +[[package]] +name = "konst_macro_rules" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" + [[package]] name = "kqueue" version = "1.1.1" @@ -7480,7 +7507,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -7709,7 +7736,7 @@ dependencies = [ [[package]] name = "op-alloy" version = "0.24.0" -source = "git+https://github.com/foundry-rs/optimism?branch=develop#0dc3c00bd1b3b2976f53503ba92fe84c602deca6" +source = "git+https://github.com/foundry-rs/optimism?branch=rusowsky%2Frevm-38#76ee088e7a86f413c7d15bc07eab071b1009c685" dependencies = [ "op-alloy-consensus", "op-alloy-network", @@ -7721,7 +7748,7 @@ dependencies = [ [[package]] name = "op-alloy-consensus" version = "0.24.0" -source = "git+https://github.com/foundry-rs/optimism?branch=develop#0dc3c00bd1b3b2976f53503ba92fe84c602deca6" +source = "git+https://github.com/foundry-rs/optimism?branch=rusowsky%2Frevm-38#76ee088e7a86f413c7d15bc07eab071b1009c685" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -7748,7 +7775,7 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" [[package]] name = "op-alloy-network" version = "0.24.0" -source = "git+https://github.com/foundry-rs/optimism?branch=develop#0dc3c00bd1b3b2976f53503ba92fe84c602deca6" +source = "git+https://github.com/foundry-rs/optimism?branch=rusowsky%2Frevm-38#76ee088e7a86f413c7d15bc07eab071b1009c685" dependencies = [ "alloy-consensus", "alloy-network", @@ -7761,7 +7788,7 @@ dependencies = [ [[package]] name = "op-alloy-provider" version = "0.24.0" -source = "git+https://github.com/foundry-rs/optimism?branch=develop#0dc3c00bd1b3b2976f53503ba92fe84c602deca6" +source = "git+https://github.com/foundry-rs/optimism?branch=rusowsky%2Frevm-38#76ee088e7a86f413c7d15bc07eab071b1009c685" dependencies = [ "alloy-network", "alloy-primitives", @@ -7775,7 +7802,7 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" version = "0.24.0" -source = "git+https://github.com/foundry-rs/optimism?branch=develop#0dc3c00bd1b3b2976f53503ba92fe84c602deca6" +source = "git+https://github.com/foundry-rs/optimism?branch=rusowsky%2Frevm-38#76ee088e7a86f413c7d15bc07eab071b1009c685" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -7795,7 +7822,7 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" version = "0.24.0" -source = "git+https://github.com/foundry-rs/optimism?branch=develop#0dc3c00bd1b3b2976f53503ba92fe84c602deca6" +source = "git+https://github.com/foundry-rs/optimism?branch=rusowsky%2Frevm-38#76ee088e7a86f413c7d15bc07eab071b1009c685" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -7816,8 +7843,7 @@ dependencies = [ [[package]] name = "op-revm" version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52bcf58dcec47d4e9af496935af52dee3d4b35ede142b46371438fc0ac77434e" +source = "git+https://github.com/foundry-rs/op-revm?branch=rusowsky%2Frevm-38#9e636210d19b4be71335e0e0ebe916aa76f83370" dependencies = [ "auto_impl", "revm", @@ -8103,7 +8129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared 0.11.3", - "rand 0.8.5", + "rand 0.8.6", ] [[package]] @@ -8227,9 +8253,9 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "portable-atomic-util" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3" +checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" dependencies = [ "portable-atomic", ] @@ -8464,7 +8490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.117", @@ -8675,9 +8701,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -8979,7 +9005,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams 0.4.2", "web-sys", - "webpki-roots 1.0.6", + "webpki-roots 1.0.7", ] [[package]] @@ -9029,7 +9055,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-chains", "alloy-consensus", @@ -9068,8 +9094,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79b3247ae4fbb1d4d35ce83a11fc596428a4c6ea836c98a75a55340192578a4" +source = "git+https://github.com/paradigmxyz/reth-core?rev=6b12498#6b12498871bc1b1d42c6dcf28968c271660de8c0" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -9098,8 +9123,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5dbae40c272b8a1b4fcc08ee2d4e77d3b0ccdb187c1313f412a73ff54ff2a2" +source = "git+https://github.com/paradigmxyz/reth-core?rev=6b12498#6b12498871bc1b1d42c6dcf28968c271660de8c0" dependencies = [ "proc-macro2", "quote", @@ -9109,7 +9133,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -9122,7 +9146,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -9135,7 +9159,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -9159,7 +9183,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-eips 2.0.0", "alloy-primitives", @@ -9173,7 +9197,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -9189,7 +9213,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -9202,7 +9226,7 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -9216,7 +9240,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -9238,7 +9262,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -9258,7 +9282,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-evm", "alloy-primitives", @@ -9271,7 +9295,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -9290,7 +9314,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9328,8 +9352,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc759fd87c3f65440e5d3bfa3107fe8a13a61a6807cd485c62c49d63c7bf6717" +source = "git+https://github.com/paradigmxyz/reth-core?rev=6b12498#6b12498871bc1b1d42c6dcf28968c271660de8c0" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -9348,7 +9371,7 @@ dependencies = [ "reth-codecs 0.3.0", "revm-bytecode 10.0.0", "revm-primitives 23.0.0", - "revm-state 11.0.0", + "revm-state 11.0.1", "secp256k1 0.30.0", "serde", "thiserror 2.0.18", @@ -9357,7 +9380,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-primitives", "derive_more", @@ -9372,7 +9395,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9385,7 +9408,7 @@ dependencies = [ [[package]] name = "reth-rpc-convert" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-evm", @@ -9435,7 +9458,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-primitives", "bytes", @@ -9448,7 +9471,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-primitives", "derive_more", @@ -9462,7 +9485,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -9485,7 +9508,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-eips 2.0.0", "alloy-primitives", @@ -9496,14 +9519,14 @@ dependencies = [ "reth-prune-types", "reth-static-file-types", "revm-database-interface", - "revm-state 11.0.0", + "revm-state 11.0.1", "thiserror 2.0.18", ] [[package]] name = "reth-trie-common" version = "2.0.0" -source = "git+https://github.com/paradigmxyz/reth?rev=0b33057#0b33057414c8815ed499e0aa837ae52d4d366150" +source = "git+https://github.com/paradigmxyz/reth?rev=c8979d0#c8979d0a1dcf701988f5cc86e738b13c845ac8c2" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -9535,17 +9558,16 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fa54c341d926ec9b0f7fc0c87f831aa4959de699e69caab1a0bfd914326c09" +source = "git+https://github.com/paradigmxyz/reth-core?rev=6b12498#6b12498871bc1b1d42c6dcf28968c271660de8c0" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "37.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11353f234577a63048066df974d8a56e8c090d4de8b5f7d5f2a0d0c3a1ffaa2d" +checksum = "91202d39dbe8e8d10e9e8f2b76c30da68ecd1d25be69ba6d853ad0d03a3a398a" dependencies = [ "revm-bytecode 10.0.0", "revm-context", @@ -9557,7 +9579,7 @@ dependencies = [ "revm-interpreter", "revm-precompile", "revm-primitives 23.0.0", - "revm-state 11.0.0", + "revm-state 11.0.1", ] [[package]] @@ -9586,9 +9608,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "16.0.0" +version = "16.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0e3d41127977e351ed795689147e6e59b0fa88e387840f921e46c440bb2fb44" +checksum = "c5f68d928d8b228e0faeb1c6ed75c4fde7d124f1ddf9119b67e7a0ad4041237d" dependencies = [ "bitvec", "cfg-if", @@ -9597,15 +9619,15 @@ dependencies = [ "revm-context-interface", "revm-database-interface", "revm-primitives 23.0.0", - "revm-state 11.0.0", + "revm-state 11.0.1", "serde", ] [[package]] name = "revm-context-interface" -version = "17.0.0" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd61f0f2f646ae74a75e12e7f1d57554868e2dc5c83fc9a761cb95735cb58309" +checksum = "1f3758e6167c4ba7a59a689c519a047edaefcd4c37d74f279b93ed87bc8aece4" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -9613,43 +9635,43 @@ dependencies = [ "either", "revm-database-interface", "revm-primitives 23.0.0", - "revm-state 11.0.0", + "revm-state 11.0.1", "serde", ] [[package]] name = "revm-database" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54f97178ab32358be770d09649d6fa86303923cab7afb95577353e7305a04193" +checksum = "c281a1f11d3bcb8c0bba1199ed6bcb001d1aeb3d4fb366819e14f88723989a4e" dependencies = [ "alloy-eips 1.8.3", "revm-bytecode 10.0.0", "revm-database-interface", "revm-primitives 23.0.0", - "revm-state 11.0.0", + "revm-state 11.0.1", "serde", ] [[package]] name = "revm-database-interface" -version = "11.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e48ddde8f5ef2adaf1e920ccbf57fa6ef2c63c11e3e37d7d9137657873eecc" +checksum = "d89efb9832a4e3742bb4ded5f7fe5bf905e8860e69427d4dfec153484fc6d304" dependencies = [ "auto_impl", "either", "revm-primitives 23.0.0", - "revm-state 11.0.0", + "revm-state 11.0.1", "serde", "thiserror 2.0.18", ] [[package]] name = "revm-handler" -version = "18.0.0" +version = "18.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f18b03319aee860ecc4631c9180abb0828480f5a4c39507fc735a417bd906984" +checksum = "783e903d6922b7f5f9a940d1bb229530502d2924b1aed9d5ca5a94ebf065d460" dependencies = [ "auto_impl", "derive-where", @@ -9660,15 +9682,15 @@ dependencies = [ "revm-interpreter", "revm-precompile", "revm-primitives 23.0.0", - "revm-state 11.0.0", + "revm-state 11.0.1", "serde", ] [[package]] name = "revm-inspector" -version = "18.0.0" +version = "19.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f33e8327376dff859eb18dea3623aa55ef5d580fe38fa0fd4bb92bd95ace60ad" +checksum = "8216ad58422090d0daa9eb430e0a081f7ad07e7fd30681dee71f8420c99624e0" dependencies = [ "auto_impl", "either", @@ -9677,16 +9699,16 @@ dependencies = [ "revm-handler", "revm-interpreter", "revm-primitives 23.0.0", - "revm-state 11.0.0", + "revm-state 11.0.1", "serde", "serde_json", ] [[package]] name = "revm-inspectors" -version = "0.38.1" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e41c7dc3d85c6186e57ec1438a426e7ddfac579d8255930cf8ed324a6c317e79" +checksum = "731b682530a732ef9c189ef831589128e2ce34d4a306c956322ae2dffe009715" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -9704,22 +9726,22 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "35.0.0" +version = "35.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5f438f47d40d9830c0498fa3ca16a447b3148ab7b78742cbb1b27a51a50963" +checksum = "1ece9f41b69658c15d748288a4dbdfc06a63f3ce93d983af440de3f1631dce6a" dependencies = [ "revm-bytecode 10.0.0", "revm-context-interface", "revm-primitives 23.0.0", - "revm-state 11.0.0", + "revm-state 11.0.1", "serde", ] [[package]] name = "revm-precompile" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c07bfcc9361f7b23970a68cbd17bfe255e70182cfb1a8896d06832217fc5439" +checksum = "a346a8cc6c8c39bd65306641c692191299c0a7b63d38810e39e8fe9b92378660" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -9779,9 +9801,9 @@ dependencies = [ [[package]] name = "revm-state" -version = "11.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e480426a7d76b458789e4a1be3ffbce9df798f0145f0520c1cdf967755cfcbf" +checksum = "c32490ed687dba31c3c882beb8c20408bdd30ef96690d8f145b0ee9a87040bfe" dependencies = [ "alloy-eip7928", "bitflags 2.11.1", @@ -9905,7 +9927,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand 0.8.5", + "rand 0.8.6", "rand 0.9.4", "rlp", "ruint-macro", @@ -9942,7 +9964,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" dependencies = [ - "rand 0.8.5", + "rand 0.8.6", ] [[package]] @@ -10000,7 +10022,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -10059,7 +10081,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -10251,7 +10273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ "bitcoin_hashes", - "rand 0.8.5", + "rand 0.8.6", "secp256k1-sys 0.10.1", "serde", ] @@ -10762,7 +10784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -10830,7 +10852,7 @@ dependencies = [ "derive_more", "dunce", "inturn", - "itertools 0.12.1", + "itertools 0.14.0", "itoa", "normalize-path", "once_map", @@ -10865,7 +10887,7 @@ dependencies = [ "alloy-primitives", "bitflags 2.11.1", "bumpalo", - "itertools 0.12.1", + "itertools 0.14.0", "memchr", "num-bigint", "num-rational", @@ -11289,13 +11311,13 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "tempo-alloy" version = "1.6.0" -source = "git+https://github.com/tempoxyz/tempo?rev=6f4f5cc#6f4f5cca86a0f2aea8a863dee4b06430866ff9e5" +source = "git+https://github.com/tempoxyz/tempo?rev=c095527#c095527841c1de8387a6ed8579ad54cf49625571" dependencies = [ "alloy-consensus", "alloy-contract", @@ -11321,7 +11343,7 @@ dependencies = [ [[package]] name = "tempo-chainspec" version = "1.5.3" -source = "git+https://github.com/tempoxyz/tempo?rev=6f4f5cc#6f4f5cca86a0f2aea8a863dee4b06430866ff9e5" +source = "git+https://github.com/tempoxyz/tempo?rev=c095527#c095527841c1de8387a6ed8579ad54cf49625571" dependencies = [ "alloy-eips 2.0.0", "alloy-evm", @@ -11340,7 +11362,7 @@ dependencies = [ [[package]] name = "tempo-consensus" version = "1.6.0" -source = "git+https://github.com/tempoxyz/tempo?rev=6f4f5cc#6f4f5cca86a0f2aea8a863dee4b06430866ff9e5" +source = "git+https://github.com/tempoxyz/tempo?rev=c095527#c095527841c1de8387a6ed8579ad54cf49625571" dependencies = [ "alloy-consensus", "alloy-evm", @@ -11356,7 +11378,7 @@ dependencies = [ [[package]] name = "tempo-contracts" version = "1.6.0" -source = "git+https://github.com/tempoxyz/tempo?rev=6f4f5cc#6f4f5cca86a0f2aea8a863dee4b06430866ff9e5" +source = "git+https://github.com/tempoxyz/tempo?rev=c095527#c095527841c1de8387a6ed8579ad54cf49625571" dependencies = [ "alloy-contract", "alloy-primitives", @@ -11367,7 +11389,7 @@ dependencies = [ [[package]] name = "tempo-evm" version = "1.6.0" -source = "git+https://github.com/tempoxyz/tempo?rev=6f4f5cc#6f4f5cca86a0f2aea8a863dee4b06430866ff9e5" +source = "git+https://github.com/tempoxyz/tempo?rev=c095527#c095527841c1de8387a6ed8579ad54cf49625571" dependencies = [ "alloy-consensus", "alloy-evm", @@ -11394,7 +11416,7 @@ dependencies = [ [[package]] name = "tempo-precompiles" version = "1.6.0" -source = "git+https://github.com/tempoxyz/tempo?rev=6f4f5cc#6f4f5cca86a0f2aea8a863dee4b06430866ff9e5" +source = "git+https://github.com/tempoxyz/tempo?rev=c095527#c095527841c1de8387a6ed8579ad54cf49625571" dependencies = [ "alloy", "alloy-evm", @@ -11414,7 +11436,7 @@ dependencies = [ [[package]] name = "tempo-precompiles-macros" version = "1.6.0" -source = "git+https://github.com/tempoxyz/tempo?rev=6f4f5cc#6f4f5cca86a0f2aea8a863dee4b06430866ff9e5" +source = "git+https://github.com/tempoxyz/tempo?rev=c095527#c095527841c1de8387a6ed8579ad54cf49625571" dependencies = [ "alloy", "proc-macro2", @@ -11425,7 +11447,7 @@ dependencies = [ [[package]] name = "tempo-primitives" version = "1.6.0" -source = "git+https://github.com/tempoxyz/tempo?rev=6f4f5cc#6f4f5cca86a0f2aea8a863dee4b06430866ff9e5" +source = "git+https://github.com/tempoxyz/tempo?rev=c095527#c095527841c1de8387a6ed8579ad54cf49625571" dependencies = [ "alloy-consensus", "alloy-eips 2.0.0", @@ -11456,7 +11478,7 @@ dependencies = [ [[package]] name = "tempo-revm" version = "1.6.0" -source = "git+https://github.com/tempoxyz/tempo?rev=6f4f5cc#6f4f5cca86a0f2aea8a863dee4b06430866ff9e5" +source = "git+https://github.com/tempoxyz/tempo?rev=c095527#c095527841c1de8387a6ed8579ad54cf49625571" dependencies = [ "alloy-consensus", "alloy-evm", @@ -11493,7 +11515,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8c27177b12a6399ffc08b98f76f7c9a1f4fe9fc967c784c5a071fa8d93cf7e1" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -11503,7 +11525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874" dependencies = [ "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -11680,9 +11702,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.0" +version = "1.52.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91135f59b1cbf38c91e73cf3386fca9bb77915c45ce2771460c9d92f0f3d776" +checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" dependencies = [ "bytes", "libc", @@ -11885,7 +11907,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "webpki-roots 1.0.6", + "webpki-roots 1.0.7", ] [[package]] @@ -12720,7 +12742,7 @@ dependencies = [ "watchexec-events", "watchexec-signals", "watchexec-supervisor", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -12792,9 +12814,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe985f41e291eecef5e5c0770a18d28390addb03331c043964d9e916453d6f16" +checksum = "0fc95580916af1e68ff6a7be07446fc5db73ebf71cf092de939bbf5f7e189f72" dependencies = [ "core-foundation 0.10.1", "jni 0.22.4", @@ -12808,9 +12830,9 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca" +checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c" dependencies = [ "rustls-pki-types", ] @@ -12821,14 +12843,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.6", + "webpki-roots 1.0.7", ] [[package]] name = "webpki-roots" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" +checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" dependencies = [ "rustls-pki-types", ] @@ -12870,7 +12892,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fca25dafac713..9076e877a7300 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -410,12 +410,12 @@ op-alloy-rpc-types = "0.24.0" op-alloy-flz = "0.13.1" ## alloy-evm -alloy-evm = "0.32.0" +alloy-evm = "0.33.2" alloy-op-evm = "0.30.0" # revm -revm = { version = "37.0.0", default-features = false } -revm-inspectors = { version = "0.38.1", features = ["serde"] } +revm = { version = "38.0.0", default-features = false } +revm-inspectors = { version = "0.39.0", features = ["serde"] } op-revm = { version = "18.0.0", default-features = false } ## cli @@ -513,15 +513,17 @@ mpp = { git = "https://github.com/tempoxyz/mpp-rs", rev = "310c9a1f3fe485fa9c7a8 "client", "reqwest-rustls-tls", ] } -tempo-chainspec = { git = "https://github.com/tempoxyz/tempo", rev = "6f4f5cc", default-features = false } -tempo-primitives = { git = "https://github.com/tempoxyz/tempo", rev = "6f4f5cc", default-features = false, features = [ +tempo-chainspec = { git = "https://github.com/tempoxyz/tempo", rev = "c095527", default-features = false } +tempo-primitives = { git = "https://github.com/tempoxyz/tempo", rev = "c095527", default-features = false, features = [ "serde", ] } -tempo-alloy = { git = "https://github.com/tempoxyz/tempo", rev = "6f4f5cc", default-features = false } -tempo-evm = { git = "https://github.com/tempoxyz/tempo", rev = "6f4f5cc", default-features = false } -tempo-revm = { git = "https://github.com/tempoxyz/tempo", rev = "6f4f5cc", default-features = false, features = ["serde"] } -tempo-contracts = { git = "https://github.com/tempoxyz/tempo", rev = "6f4f5cc" } -tempo-precompiles = { git = "https://github.com/tempoxyz/tempo", rev = "6f4f5cc" } +tempo-alloy = { git = "https://github.com/tempoxyz/tempo", rev = "c095527", default-features = false } +tempo-evm = { git = "https://github.com/tempoxyz/tempo", rev = "c095527", default-features = false } +tempo-revm = { git = "https://github.com/tempoxyz/tempo", rev = "c095527", default-features = false, features = [ + "serde", +] } +tempo-contracts = { git = "https://github.com/tempoxyz/tempo", rev = "c095527" } +tempo-precompiles = { git = "https://github.com/tempoxyz/tempo", rev = "c095527" } ## Pinned dependencies. Enabled for the workspace in crates/test-utils. @@ -585,32 +587,30 @@ rexpect = { git = "https://github.com/rust-cli/rexpect", rev = "2ed0b1898d7edaf6 ## alloy-evm # alloy-evm = { git = "https://github.com/paradigmxyz/evm.git", rev = "04d8e4a" } -## reth-core -# reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth-core", rev = "af2174c" } -# reth-codecs = { git = "https://github.com/paradigmxyz/reth-core", rev = "af2174c" } -# reth-codecs-derive = { git = "https://github.com/paradigmxyz/reth-core", rev = "af2174c" } -# reth-rpc-traits = { git = "https://github.com/paradigmxyz/reth-core", rev = "af2174c" } +## reth-core — Bytecode::new_analyzed is unsafe in patched revm +reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth-core", rev = "6b12498" } +reth-codecs = { git = "https://github.com/paradigmxyz/reth-core", rev = "6b12498" } +reth-codecs-derive = { git = "https://github.com/paradigmxyz/reth-core", rev = "6b12498" } +reth-zstd-compressors = { git = "https://github.com/paradigmxyz/reth-core", rev = "6b12498" } ## op-alloy / alloy-op-evm -op-alloy-consensus = { git = "https://github.com/foundry-rs/optimism", branch = "develop" } -op-alloy-network = { git = "https://github.com/foundry-rs/optimism", branch = "develop" } -op-alloy-rpc-types = { git = "https://github.com/foundry-rs/optimism", branch = "develop" } -op-alloy = { git = "https://github.com/foundry-rs/optimism", branch = "develop" } -alloy-op-evm = { git = "https://github.com/foundry-rs/optimism", branch = "develop" } -alloy-op-hardforks = { git = "https://github.com/foundry-rs/optimism", branch = "develop" } - -## revm -# revm = { git = "https://github.com/bluealloy/revm.git", rev = "7e59936" } -# op-revm = { git = "https://github.com/bluealloy/revm.git", rev = "7e59936" } -# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors.git", rev = "22dcee2" } +op-alloy-consensus = { git = "https://github.com/foundry-rs/optimism", branch = "rusowsky/revm-38" } +op-alloy-network = { git = "https://github.com/foundry-rs/optimism", branch = "rusowsky/revm-38" } +op-alloy-rpc-types = { git = "https://github.com/foundry-rs/optimism", branch = "rusowsky/revm-38" } +op-alloy = { git = "https://github.com/foundry-rs/optimism", branch = "rusowsky/revm-38" } +alloy-op-evm = { git = "https://github.com/foundry-rs/optimism", branch = "rusowsky/revm-38" } +alloy-op-hardforks = { git = "https://github.com/foundry-rs/optimism", branch = "rusowsky/revm-38" } + +## revm 38 (crates.io) + op-revm (git, bumped to revm 38) +op-revm = { git = "https://github.com/foundry-rs/op-revm", branch = "rusowsky/revm-38" } ## foundry-fork-db -# foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "b139c57c2b54bc06a9e4c9783941f5bbd4bd3a1f" } +foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", branch = "rusowsky/revm-38" } ## tempo — unify crates.io versions (pulled by mpp) with git rev -tempo-primitives = { git = "https://github.com/tempoxyz/tempo", rev = "6f4f5cc" } -tempo-alloy = { git = "https://github.com/tempoxyz/tempo", rev = "6f4f5cc" } -tempo-contracts = { git = "https://github.com/tempoxyz/tempo", rev = "6f4f5cc" } +tempo-primitives = { git = "https://github.com/tempoxyz/tempo", rev = "c095527" } +tempo-alloy = { git = "https://github.com/tempoxyz/tempo", rev = "c095527" } +tempo-contracts = { git = "https://github.com/tempoxyz/tempo", rev = "c095527" } # solar solar = { package = "solar-compiler", git = "https://github.com/paradigmxyz/solar", rev = "530f129" } diff --git a/crates/anvil/src/eth/backend/tempo.rs b/crates/anvil/src/eth/backend/tempo.rs index fdff1149ac443..88db5fbcd0dfe 100644 --- a/crates/anvil/src/eth/backend/tempo.rs +++ b/crates/anvil/src/eth/backend/tempo.rs @@ -169,6 +169,14 @@ impl PrecompileStorageProvider for AnvilStorageProvider<'_> { self.gas_used } + fn state_gas_used(&self) -> u64 { + 0 + } + + fn gas_limit(&self) -> u64 { + u64::MAX + } + fn gas_refunded(&self) -> i64 { self.gas_refunded } diff --git a/crates/anvil/src/evm.rs b/crates/anvil/src/evm.rs index b51177d73fd79..c3511f8c728cb 100644 --- a/crates/anvil/src/evm.rs +++ b/crates/anvil/src/evm.rs @@ -60,6 +60,7 @@ mod tests { status: PrecompileStatus::Success, bytes: Bytes::copy_from_slice(input.data), gas_used: 0, + gas_refunded: 0, state_gas_used: 0, reservoir: input.reservoir, }) diff --git a/crates/anvil/tests/it/fork.rs b/crates/anvil/tests/it/fork.rs index 1a81b79a9a3c3..dc272eb320a45 100644 --- a/crates/anvil/tests/it/fork.rs +++ b/crates/anvil/tests/it/fork.rs @@ -1915,6 +1915,7 @@ async fn test_config_with_osaka_hardfork_with_precompile_factory() { Ok(revm::precompile::PrecompileOutput { bytes: Bytes::copy_from_slice(input.data), gas_used: 0, + gas_refunded: 0, status: PrecompileStatus::Success, state_gas_used: 0, reservoir: input.reservoir, diff --git a/crates/cheatcodes/src/fs.rs b/crates/cheatcodes/src/fs.rs index 3f8bd91b0e8d9..ddd1d029de917 100644 --- a/crates/cheatcodes/src/fs.rs +++ b/crates/cheatcodes/src/fs.rs @@ -434,6 +434,7 @@ fn deploy_code( value.unwrap_or(U256::ZERO), bytecode.into(), ccx.gas_limit, + 0, ), ccx, )?; diff --git a/crates/evm/core/src/bytecode.rs b/crates/evm/core/src/bytecode.rs index 4e571e209d2fd..5e8b350eeb266 100644 --- a/crates/evm/core/src/bytecode.rs +++ b/crates/evm/core/src/bytecode.rs @@ -62,6 +62,7 @@ impl<'a> Iterator for InstIter<'a> { #[inline] fn next(&mut self) -> Option { self.iter.next().map(|&opcode| { + // SAFETY: OpCode wraps a u8, unknown opcodes are valid to construct. let opcode = unsafe { OpCode::new_unchecked(opcode) }; let len = imm_len(opcode.get()) as usize; let (immediate, rest) = self.iter.as_slice().split_at_checked(len).unwrap_or_default(); diff --git a/crates/evm/core/src/evm/op.rs b/crates/evm/core/src/evm/op.rs index 1b9db85cf2781..5cdba72d842fc 100644 --- a/crates/evm/core/src/evm/op.rs +++ b/crates/evm/core/src/evm/op.rs @@ -108,6 +108,10 @@ impl<'db, I: FoundryInspectorExt &revm::context::CfgEnv { + &self.inner.ctx_ref().cfg + } + fn chain_id(&self) -> u64 { self.inner.ctx_ref().cfg.chain_id } diff --git a/deny.toml b/deny.toml index 15f839ae72189..f2f7870d40330 100644 --- a/deny.toml +++ b/deny.toml @@ -113,4 +113,7 @@ allow-git = [ "https://github.com/tempoxyz/mpp-rs", # Transitive dependency of Tempo "https://github.com/paradigmxyz/reth", + "https://github.com/paradigmxyz/reth-core", + # TIP-1016: patched op-revm + "https://github.com/foundry-rs/op-revm", ]