Merge tag 'v56' into scroll-evm-executor/feat/v56/euclid-upgrade

scroll-tech · Mar 10, 2025 · ac83ffd · ac83ffd
2 parents f344b65 + bd961b7
commit ac83ffd
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 272 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 Because this is workspace with multi libraries, tags will be simplified, and with this document you can match version of project with git tag.
 
+# v56 tag
+date: 11.02.2025
+
+Optimism fixes and improvements.
+
+* `revm`: 19.4.0 -> 19.5.0
+* `revm-interpreter`: 15.1.0 -> 15.2.0
+* `revm-primitives`: 15.1.0 -> 15.2.0
+* `revm-precompile`: 16.0.0 -> 16.1.0
+* `revme`: 2.4.0 -> 2.5.0
+
 # v55 tag
 
 date: 28.01.2025

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bins/revm-test/CHANGELOG.md b/bins/revm-test/CHANGELOG.md
diff --git a/bins/revm-test/Cargo.toml b/bins/revm-test/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 bytes = "1.7"
 hex = "0.4"
-revm = { path = "../../crates/revm", version = "19.4.0", default-features=false }
+revm = { path = "../../crates/revm", version = "19.5.0", default-features=false }
 microbench = "0.5"
 alloy-sol-macro = "0.8.11"
 alloy-sol-types = "0.8.11"

diff --git a/bins/revme/CHANGELOG.md b/bins/revme/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.5.0](https://github.com/bluealloy/revm/compare/revme-v2.4.0...revme-v2.5.0) - 2025-02-11
+
+### Other
+
+- updated the following local packages: revm
+
 ## [2.4.0](https://github.com/bluealloy/revm/compare/revme-v2.3.0...revme-v2.4.0) - 2025-01-28
 
 ### Other

diff --git a/bins/revme/Cargo.toml b/bins/revme/Cargo.toml
@@ -6,15 +6,15 @@ keywords = ["ethereum", "evm"]
 license = "MIT"
 repository = "https://github.com/bluealloy/revm"
 description = "Rust Ethereum Virtual Machine Executable"
-version = "2.4.0"
+version = "2.5.0"
 
 [dependencies]
 hash-db = "0.15"
 hex = "0.4"
 indicatif = "0.17"
 microbench = "0.5"
 plain_hasher = "0.2"
-revm = { path = "../../crates/revm", version = "19.4.0", default-features = false, features = [
+revm = { path = "../../crates/revm", version = "19.5.0", default-features = false, features = [
     "ethersdb",
     "std",
     "serde-json",

diff --git a/crates/interpreter/CHANGELOG.md b/crates/interpreter/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [15.2.0](https://github.com/bluealloy/revm/compare/revm-interpreter-v15.1.0...revm-interpreter-v15.2.0) - 2025-02-11
+
+### Other
+
+- revm v19.4.0 tag v54
+
 ## [15.1.0](https://github.com/bluealloy/revm/compare/revm-interpreter-v15.0.0...revm-interpreter-v15.1.0) - 2025-01-13
 
 ### Added

diff --git a/crates/interpreter/Cargo.toml b/crates/interpreter/Cargo.toml
@@ -6,7 +6,7 @@ keywords = ["no_std", "ethereum", "evm", "revm", "interpreter"]
 license = "MIT"
 name = "revm-interpreter"
 repository = "https://github.com/bluealloy/revm"
-version = "15.1.0"
+version = "15.2.0"
 readme = "../../README.md"
 
 [package.metadata.docs.rs]
@@ -22,7 +22,7 @@ rust_2018_idioms = "deny"
 all = "warn"
 
 [dependencies]
-revm-primitives = { path = "../primitives", version = "15.1.0", default-features = false }
+revm-primitives = { path = "../primitives", version = "15.2.0", default-features = false }
 
 paste = { version = "1.0", optional = true }
 phf = { version = "0.11", default-features = false, optional = true, features = [

diff --git a/crates/precompile/CHANGELOG.md b/crates/precompile/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [16.1.0](https://github.com/bluealloy/revm/compare/revm-precompile-v16.0.0...revm-precompile-v16.1.0) - 2025-02-11
+
+### Other
+
+- revm v19.4.0 tag v54
+
 ## [16.0.0](https://github.com/bluealloy/revm/compare/revm-precompile-v15.0.0...revm-precompile-v16.0.0) - 2024-12-26
 
 ### Added

diff --git a/crates/precompile/Cargo.toml b/crates/precompile/Cargo.toml
@@ -6,7 +6,7 @@ keywords = ["no_std", "ethereum", "evm", "revm", "precompiles"]
 license = "MIT"
 name = "revm-precompile"
 repository = "https://github.com/bluealloy/revm"
-version = "16.0.0"
+version = "16.1.0"
 readme = "../../README.md"
 
 [package.metadata.docs.rs]
@@ -23,7 +23,7 @@ unexpected_cfgs = "allow"
 all = "warn"
 
 [dependencies]
-revm-primitives = { path = "../primitives", version = "15.1.0", default-features = false }
+revm-primitives = { path = "../primitives", version = "15.2.0", default-features = false }
 once_cell = { version = "1.19", default-features = false, features = ["alloc"] }
 
 # ecRecover

diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
@@ -6,7 +6,7 @@ keywords = ["no_std", "ethereum", "evm", "revm", "types"]
 license = "MIT"
 name = "revm-primitives"
 repository = "https://github.com/bluealloy/revm"
-version = "15.1.0"
+version = "15.2.0"
 readme = "../../README.md"
 
 [package.metadata.docs.rs]

diff --git a/crates/primitives/src/specification.rs b/crates/primitives/src/specification.rs
@@ -68,8 +68,8 @@ pub enum SpecId {
     GRANITE = 23,
     HOLOCENE = 24,
     PRAGUE = 25,
-    OSAKA = 26,
-    ISTHMUS = 27,
+    ISTHMUS = 26,
+    OSAKA = 27,
     #[default]
     LATEST = u8::MAX,
 }

diff --git a/crates/revm/CHANGELOG.md b/crates/revm/CHANGELOG.md
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [19.5.0](https://github.com/bluealloy/revm/compare/revm-v19.4.0...revm-v19.5.0) - 2025-02-11
+
+### Fixed
+
+- *(op-isthmus)* missing granite precompiles and disable eof (#2065)
+- *(op)* add operator fee scalar scaling factor on refund (#2050)
+- fix ethersdb.rs forking ([#2047](https://github.com/bluealloy/revm/pull/2047))
+
 ## [19.4.0](https://github.com/bluealloy/revm/compare/revm-v19.3.0...revm-v19.4.0) - 2025-01-28
 
 ### Added

diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml
@@ -6,7 +6,7 @@ keywords = ["no_std", "ethereum", "evm", "revm"]
 license = "MIT"
 name = "revm"
 repository = "https://github.com/bluealloy/revm"
-version = "19.4.0"
+version = "19.5.0"
 readme = "../../README.md"
 
 [package.metadata.docs.rs]
@@ -23,8 +23,8 @@ all = "warn"
 
 [dependencies]
 # revm
-revm-interpreter = { path = "../interpreter", version = "15.1.0", default-features = false }
-revm-precompile = { path = "../precompile", version = "16.0.0", default-features = false }
+revm-interpreter = { path = "../interpreter", version = "15.2.0", default-features = false }
+revm-precompile = { path = "../precompile", version = "16.1.0", default-features = false }
 
 # misc
 auto_impl = { version = "1.2", default-features = false }

diff --git a/crates/revm/src/optimism/handler_register.rs b/crates/revm/src/optimism/handler_register.rs
@@ -355,25 +355,21 @@ pub fn deduct_caller<SPEC: Spec, EXT, DB: Database>(
             ));
         };
 
-        let tx_l1_cost = context
+        let l1_block = context
             .evm
             .inner
             .l1_block_info
             .as_mut()
-            .expect("L1BlockInfo should be loaded")
-            .calculate_tx_l1_cost(enveloped_tx, SPEC::SPEC_ID);
+            .expect("L1BlockInfo should be loaded");
+
+        let tx_l1_cost = l1_block.calculate_tx_l1_cost(enveloped_tx, SPEC::SPEC_ID);
         caller_account.info.balance = caller_account.info.balance.saturating_sub(tx_l1_cost);
 
         // Deduct the operator fee from the caller's account.
         let gas_limit = U256::from(context.evm.inner.env.tx.gas_limit);
 
-        let operator_fee_charge = context
-            .evm
-            .inner
-            .l1_block_info
-            .as_ref()
-            .expect("L1BlockInfo should be loaded")
-            .operator_fee_charge(enveloped_tx, gas_limit, SPEC::SPEC_ID);
+        let operator_fee_charge =
+            l1_block.operator_fee_charge(enveloped_tx, gas_limit, SPEC::SPEC_ID);
 
         caller_account.info.balance = caller_account
             .info

diff --git a/crates/revm/src/optimism/precompile.rs b/crates/revm/src/optimism/precompile.rs
@@ -38,7 +38,7 @@ pub(crate) fn granite() -> &'static Precompiles {
 pub(crate) fn isthmus() -> &'static Precompiles {
     static INSTANCE: OnceBox<Precompiles> = OnceBox::new();
     INSTANCE.get_or_init(|| {
-        let precompiles = Precompiles::cancun().clone();
+        let precompiles = granite().clone();
 
         // Don't include BLS12-381 precompiles in no_std builds.
         #[cfg(feature = "blst")]