From 642848bd240dee3ad29e00e042b6cd82289a33aa Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Tue, 4 Nov 2025 13:31:46 -0500 Subject: [PATCH] Bump `revm` --- Cargo.lock | 73 ++++++++++++------------ Cargo.toml | 1 - patches/ethereum/libsecp256k1/Cargo.toml | 19 ------ patches/ethereum/libsecp256k1/src/lib.rs | 1 - processor/ethereum/router/Cargo.toml | 2 +- 5 files changed, 36 insertions(+), 60 deletions(-) delete mode 100644 patches/ethereum/libsecp256k1/Cargo.toml delete mode 100644 patches/ethereum/libsecp256k1/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 0d51a75a..661d8c43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4789,10 +4789,6 @@ dependencies = [ "zstd-sys", ] -[[package]] -name = "libsecp256k1" -version = "0.7.99" - [[package]] name = "libz-sys" version = "1.1.22" @@ -6067,29 +6063,30 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ "phf_macros", "phf_shared", + "serde", ] [[package]] name = "phf_generator" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ + "fastrand", "phf_shared", - "rand 0.8.5", ] [[package]] name = "phf_macros" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ "phf_generator", "phf_shared", @@ -6100,9 +6097,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" dependencies = [ "siphasher", ] @@ -6872,9 +6869,9 @@ checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799" [[package]] name = "revm" -version = "29.0.1" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718d90dce5f07e115d0e66450b1b8aa29694c1cf3f89ebddaddccc2ccbd2f13e" +checksum = "f7bba993ce958f0b6eb23d2644ea8360982cb60baffedf961441e36faba6a2ca" dependencies = [ "revm-bytecode", "revm-context", @@ -6891,9 +6888,9 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "6.2.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c52031b73cae95d84cd1b07725808b5fd1500da3e5e24574a3b2dc13d9f16d" +checksum = "3f2b51c414b7e79edd4a0569d06e2c4c029f8b60e5f3ee3e2fa21dc6c3717ee3" dependencies = [ "bitvec", "phf", @@ -6903,9 +6900,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "9.1.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a20c98e7008591a6f012550c2a00aa36cba8c14cc88eb88dec32eb9102554b4" +checksum = "f69efee45130bd9e5b0a7af27552fddc70bc161dafed533c2f818a2d1eb654e6" dependencies = [ "bitvec", "cfg-if", @@ -6920,9 +6917,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "10.2.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b50d241ed1ce647b94caf174fcd0239b7651318b2c4c06b825b59b973dfb8495" +checksum = "5ce2525e93db0ae2a3ec7dcde5443dfdb6fbf321c5090380d775730c67bc6cee" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -6936,9 +6933,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "7.0.5" +version = "9.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a276ed142b4718dcf64bc9624f474373ed82ef20611025045c3fb23edbef9c" +checksum = "c2602625aa11ab1eda8e208e96b652c0bfa989b86c104a36537a62b081228af9" dependencies = [ "alloy-eips", "revm-bytecode", @@ -6950,9 +6947,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "7.0.5" +version = "8.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c523c77e74eeedbac5d6f7c092e3851dbe9c7fec6f418b85992bd79229db361" +checksum = "58a4621143d6515e32f969306d9c85797ae0d3fe0c74784f1fda02ba441e5a08" dependencies = [ "auto_impl", "either", @@ -6963,9 +6960,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "10.0.1" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550331ea85c1d257686e672081576172fe3d5a10526248b663bbf54f1bef226a" +checksum = "e756198d43b6c4c5886548ffbc4594412d1a82b81723525c6e85ed6da0e91c5f" dependencies = [ "auto_impl", "derive-where", @@ -6982,9 +6979,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "10.0.1" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c0a6e9ccc2ae006f5bed8bd80cd6f8d3832cd55c5e861b9402fdd556098512f" +checksum = "c3fdd1e74cc99c6173c8692b6e480291e2ad0c21c716d9dc16e937ab2e0da219" dependencies = [ "auto_impl", "either", @@ -7000,21 +6997,22 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "25.0.3" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06575dc51b1d8f5091daa12a435733a90b4a132dca7ccee0666c7db3851bc30c" +checksum = "44efb7c2f4034a5bfd3d71ebfed076e48ac75e4972f1c117f2a20befac7716cd" dependencies = [ "revm-bytecode", "revm-context-interface", "revm-primitives", + "revm-state", "serde", ] [[package]] name = "revm-precompile" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b57d4bd9e6b5fe469da5452a8a137bc2d030a3cd47c46908efc615bbc699da" +checksum = "585098ede6d84d6fc6096ba804b8e221c44dc77679571d32664a55e665aa236b" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -7026,7 +7024,6 @@ dependencies = [ "c-kzg", "cfg-if", "k256", - "libsecp256k1", "p256", "revm-primitives", "ripemd", @@ -7037,9 +7034,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "20.2.1" +version = "21.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa29d9da06fe03b249b6419b33968ecdf92ad6428e2f012dc57bcd619b5d94e" +checksum = "536f30e24c3c2bf0d3d7d20fa9cf99b93040ed0f021fd9301c78cddb0dacda13" dependencies = [ "alloy-primitives", "num_enum", @@ -7049,9 +7046,9 @@ dependencies = [ [[package]] name = "revm-state" -version = "7.0.5" +version = "8.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f64fbacb86008394aaebd3454f9643b7d5a782bd251135e17c5b33da592d84d" +checksum = "5a0b4873815e31cbc3e5b183b9128b86c09a487c027aaf8cc5cf4b9688878f9b" dependencies = [ "bitflags 2.10.0", "revm-bytecode", diff --git a/Cargo.toml b/Cargo.toml index 97927a2a..37026a61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -164,7 +164,6 @@ overflow-checks = true ark-ff-3 = { package = "ark-ff", path = "patches/ethereum/ark-ff-0.3" } ark-ff-4 = { package = "ark-ff", path = "patches/ethereum/ark-ff-0.4" } c-kzg = { path = "patches/ethereum/c-kzg" } -libsecp256k1 = { path = "patches/ethereum/libsecp256k1" } rug = { path = "patches/ethereum/rug" } secp256k1-30 = { package = "secp256k1", path = "patches/ethereum/secp256k1-30" } secp256k1-31 = { package = "secp256k1", path = "patches/ethereum/secp256k1-31" } diff --git a/patches/ethereum/libsecp256k1/Cargo.toml b/patches/ethereum/libsecp256k1/Cargo.toml deleted file mode 100644 index 1ad7cfa6..00000000 --- a/patches/ethereum/libsecp256k1/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "libsecp256k1" -version = "0.7.99" -description = "Patch to an empty crate" -license = "MIT" -repository = "https://github.com/serai-dex/serai/tree/develop/patches/ethereum/libsecp256k1" -authors = ["Luke Parker "] -keywords = [] -edition = "2021" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[workspace] - -[features] -std = [] -static-context = [] diff --git a/patches/ethereum/libsecp256k1/src/lib.rs b/patches/ethereum/libsecp256k1/src/lib.rs deleted file mode 100644 index 0670b71f..00000000 --- a/patches/ethereum/libsecp256k1/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -const _NEVER_COMPILED: [(); 0 - 1] = [(); 0 - 1]; diff --git a/processor/ethereum/router/Cargo.toml b/processor/ethereum/router/Cargo.toml index 19c5ceff..5ccca030 100644 --- a/processor/ethereum/router/Cargo.toml +++ b/processor/ethereum/router/Cargo.toml @@ -33,7 +33,7 @@ alloy-rpc-types-eth = { version = "1", default-features = false } alloy-transport = { version = "1", default-features = false } alloy-provider = { version = "1", default-features = false } -revm = { version = "29", default-features = false, features = ["std"] } +revm = { version = "31", default-features = false, features = ["std"] } ethereum-schnorr = { package = "ethereum-schnorr-contract", path = "../../../networks/ethereum/schnorr", default-features = false }