feat: mutually exclusive features scroll and optimism

scroll-tech · Dec 4, 2024 · a740f3d · a740f3d
1 parent 5e4ad1d
commit a740f3d
Show file tree

Hide file tree

Showing 16 changed files with 224 additions and 156 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bins/revm-test/Cargo.toml b/bins/revm-test/Cargo.toml
@@ -9,8 +9,8 @@ bytes = "1.7"
 hex = "0.4"
 revm = { path = "../../crates/revm", version = "18.0.0", default-features=false }
 microbench = "0.5"
-alloy-sol-macro = "0.8.11"
-alloy-sol-types = "0.8.11"
+alloy-sol-macro = "0.8.10"
+alloy-sol-types = "0.8.10"
 regex = "1.10.6"
 eyre = "0.6.12"
 

diff --git a/crates/interpreter/src/instructions/host.rs b/crates/interpreter/src/instructions/host.rs
@@ -134,7 +134,7 @@ pub fn extcodecopy<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter,
         .set_data(memory_offset, code_offset, len, &code);
 }
 
-#[cfg(not(feature = "scroll"))]
+#[cfg(any(not(feature = "scroll"), feature = "optimism"))]
 pub fn blockhash<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut H) {
     gas!(interpreter, gas::BLOCKHASH);
     pop_top!(interpreter, number);
@@ -147,7 +147,7 @@ pub fn blockhash<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, ho
     *number = U256::from_be_bytes(hash.0);
 }
 
-#[cfg(feature = "scroll")]
+#[cfg(all(feature = "scroll", not(feature = "optimism")))]
 pub fn blockhash<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut H) {
     use revm_primitives::BLOCK_HASH_HISTORY;
 
@@ -228,7 +228,8 @@ pub fn sstore<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host:
 /// Store value to transient storage
 pub fn tstore<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut H) {
     cfg_if::cfg_if! {
-        if #[cfg(feature = "scroll")] {
+        if #[cfg(all(feature = "scroll", not(feature = "optimism")))]
+        {
             check!(interpreter, CURIE);
         } else {
             check!(interpreter, CANCUN);
@@ -247,7 +248,8 @@ pub fn tstore<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host:
 /// Load value from transient storage
 pub fn tload<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut H) {
     cfg_if::cfg_if! {
-        if #[cfg(feature = "scroll")] {
+        if #[cfg(all(feature = "scroll", not(feature = "optimism")))]
+        {
             check!(interpreter, CURIE);
         } else {
             check!(interpreter, CANCUN);
@@ -298,7 +300,7 @@ pub fn selfdestruct<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter,
     require_non_staticcall!(interpreter);
     pop_address!(interpreter, target);
 
-    #[cfg(feature = "scroll")]
+    #[cfg(all(feature = "scroll", not(feature = "optimism")))]
     if SPEC::enabled(PRE_BERNOULLI) {
         interpreter.instruction_result = InstructionResult::NotActivated;
         return;

diff --git a/crates/interpreter/src/instructions/host_env.rs b/crates/interpreter/src/instructions/host_env.rs
@@ -47,7 +47,7 @@ pub fn gasprice<H: Host + ?Sized>(interpreter: &mut Interpreter, host: &mut H) {
 
 /// EIP-3198: BASEFEE opcode
 pub fn basefee<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut H) {
-    #[cfg(feature = "scroll")]
+    #[cfg(all(feature = "scroll", not(feature = "optimism")))]
     if !SPEC::enabled(CURIE) {
         interpreter.instruction_result = crate::InstructionResult::NotActivated;
         return;

diff --git a/crates/interpreter/src/instructions/memory.rs b/crates/interpreter/src/instructions/memory.rs
@@ -37,7 +37,8 @@ pub fn msize<H: Host + ?Sized>(interpreter: &mut Interpreter, _host: &mut H) {
 // EIP-5656: MCOPY - Memory copying instruction
 pub fn mcopy<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, _host: &mut H) {
     cfg_if::cfg_if! {
-        if #[cfg(feature = "scroll")] {
+        if #[cfg(all(feature = "scroll", not(feature = "optimism")))]
+        {
             check!(interpreter, CURIE);
         } else {
             check!(interpreter, CANCUN);

diff --git a/crates/precompile/src/lib.rs b/crates/precompile/src/lib.rs
@@ -355,15 +355,15 @@ impl PrecompileSpecId {
             CANCUN => Self::CANCUN,
             PRAGUE | OSAKA => Self::PRAGUE,
             LATEST => Self::LATEST,
-            #[cfg(feature = "optimism")]
+            #[cfg(all(feature = "optimism", not(feature = "scroll")))]
             BEDROCK | REGOLITH | CANYON => Self::BERLIN,
-            #[cfg(feature = "optimism")]
+            #[cfg(all(feature = "optimism", not(feature = "scroll")))]
             ECOTONE | FJORD | GRANITE | HOLOCENE => Self::CANCUN,
-            #[cfg(feature = "scroll")]
+            #[cfg(all(feature = "scroll", not(feature = "optimism")))]
             PRE_BERNOULLI => Self::PRE_BERNOULLI,
-            #[cfg(feature = "scroll")]
+            #[cfg(all(feature = "scroll", not(feature = "optimism")))]
             BERNOULLI | CURIE => Self::BERNOULLI,
-            #[cfg(feature = "scroll")]
+            #[cfg(all(feature = "scroll", not(feature = "optimism")))]
             EUCLID => Self::EUCLID,
         }
     }

diff --git a/crates/primitives/src/env/handler_cfg.rs b/crates/primitives/src/env/handler_cfg.rs
@@ -52,7 +52,7 @@ impl HandlerCfg {
     }
 
     /// Creates new `HandlerCfg` instance with the optimism feature.
-    #[cfg(feature = "optimism")]
+    #[cfg(all(feature = "optimism", not(feature = "scroll")))]
     pub fn new_with_optimism(spec_id: SpecId, is_optimism: bool) -> Self {
         Self {
             spec_id,
@@ -61,7 +61,7 @@ impl HandlerCfg {
     }
 
     /// Creates new `HandlerCfg` instance with the scroll feature.
-    #[cfg(feature = "scroll")]
+    #[cfg(all(feature = "scroll", not(feature = "optimism")))]
     pub fn new_with_scroll(spec_id: SpecId, is_scroll: bool) -> Self {
         Self { spec_id, is_scroll }
     }