From e802dbfdd16b06b8ba9222039b476848cb4372a1 Mon Sep 17 00:00:00 2001 From: Gregory Edison Date: Thu, 18 Sep 2025 12:03:32 +0200 Subject: [PATCH 1/2] fix: bump revm-scroll Signed-off-by: Gregory Edison --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9811c1b0271..b38dce6baf4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11413,7 +11413,7 @@ dependencies = [ [[package]] name = "revm-scroll" version = "0.1.0" -source = "git+https://github.com/scroll-tech/scroll-revm#e424e5400e4bb225cbb48b22bd8d7f342832c039" +source = "git+https://github.com/scroll-tech/scroll-revm?branch=fix%2Finstructions-gas-used#eff2403dad3a9a9649f1a468eec2f60bb7802d8b" dependencies = [ "auto_impl", "enumn", diff --git a/Cargo.toml b/Cargo.toml index 361df928605..ee69e63fde4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -490,7 +490,7 @@ revm-context = { git = "https://github.com/scroll-tech/revm", default-features = revm-context-interface = { git = "https://github.com/scroll-tech/revm", default-features = false } revm-database-interface = { git = "https://github.com/scroll-tech/revm", default-features = false } op-revm = { git = "https://github.com/scroll-tech/revm", default-features = false } -revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", default-features = false } +revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", default-features = false, branch = "fix/instructions-gas-used" } revm-inspectors = "0.29.0" # eth From ac0fa52e4d5e6075af17a3a35290b4252bf7c6f6 Mon Sep 17 00:00:00 2001 From: Gregory Edison Date: Fri, 19 Sep 2025 09:28:50 +0200 Subject: [PATCH 2/2] fix: repoint to revm-scroll main Signed-off-by: Gregory Edison --- Cargo.lock | 49 +++++++++---------------------------------------- Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b38dce6baf4..d6547217208 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2968,7 +2968,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.61.0", + "windows-sys 0.59.0", ] [[package]] @@ -3265,7 +3265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.0", + "windows-sys 0.52.0", ] [[package]] @@ -4572,7 +4572,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.0", + "windows-core 0.57.0", ] [[package]] @@ -5384,7 +5384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.53.3", + "windows-targets 0.48.5", ] [[package]] @@ -6983,7 +6983,7 @@ dependencies = [ "once_cell", "socket2 0.6.0", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.52.0", ] [[package]] @@ -11413,7 +11413,7 @@ dependencies = [ [[package]] name = "revm-scroll" version = "0.1.0" -source = "git+https://github.com/scroll-tech/scroll-revm?branch=fix%2Finstructions-gas-used#eff2403dad3a9a9649f1a468eec2f60bb7802d8b" +source = "git+https://github.com/scroll-tech/scroll-revm#727c40fe86ac165f53505a6efe01bad9b1c502f7" dependencies = [ "auto_impl", "enumn", @@ -11684,7 +11684,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.61.0", + "windows-sys 0.52.0", ] [[package]] @@ -12734,7 +12734,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix 1.1.2", - "windows-sys 0.61.0", + "windows-sys 0.52.0", ] [[package]] @@ -13946,7 +13946,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.0", + "windows-sys 0.48.0", ] [[package]] @@ -14035,19 +14035,6 @@ dependencies = [ "windows-strings 0.4.2", ] -[[package]] -name = "windows-core" -version = "0.62.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c" -dependencies = [ - "windows-implement 0.60.0", - "windows-interface 0.59.1", - "windows-link 0.2.0", - "windows-result 0.4.0", - "windows-strings 0.5.0", -] - [[package]] name = "windows-future" version = "0.2.1" @@ -14185,15 +14172,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-result" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" -dependencies = [ - "windows-link 0.2.0", -] - [[package]] name = "windows-strings" version = "0.1.0" @@ -14213,15 +14191,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-strings" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" -dependencies = [ - "windows-link 0.2.0", -] - [[package]] name = "windows-sys" version = "0.45.0" diff --git a/Cargo.toml b/Cargo.toml index ee69e63fde4..361df928605 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -490,7 +490,7 @@ revm-context = { git = "https://github.com/scroll-tech/revm", default-features = revm-context-interface = { git = "https://github.com/scroll-tech/revm", default-features = false } revm-database-interface = { git = "https://github.com/scroll-tech/revm", default-features = false } op-revm = { git = "https://github.com/scroll-tech/revm", default-features = false } -revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", default-features = false, branch = "fix/instructions-gas-used" } +revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", default-features = false } revm-inspectors = "0.29.0" # eth