Add EVM backend support

.github/workflows/test.yml

@@ -82,7 +82,7 @@ jobs:
 
   clippy:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@clippy

crates/cast/src/rlp_converter.rs

@@ -11,7 +11,7 @@ use std::fmt;
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Item {
     Data(Vec<u8>),
-    Array(Vec<Item>),
+    Array(Vec<Self>),
 }
 
 impl Encodable for Item {

crates/chisel/src/executor.rs

@@ -542,22 +542,22 @@ enum Type {
     Builtin(DynSolType),
 
     /// (type)
-    Array(Box<Type>),
+    Array(Box<Self>),
 
     /// (type, length)
-    FixedArray(Box<Type>, usize),
+    FixedArray(Box<Self>, usize),
 
     /// (type, index)
-    ArrayIndex(Box<Type>, Option<usize>),
+    ArrayIndex(Box<Self>, Option<usize>),
 
     /// (types)
-    Tuple(Vec<Option<Type>>),
+    Tuple(Vec<Option<Self>>),
 
     /// (name, params, returns)
-    Function(Box<Type>, Vec<Option<Type>>, Vec<Option<Type>>),
+    Function(Box<Self>, Vec<Option<Self>>, Vec<Option<Self>>),
 
     /// (lhs, rhs)
-    Access(Box<Type>, String),
+    Access(Box<Self>, String),
 
     /// (types)
     Custom(Vec<String>),

crates/cli/src/opts/build/revive.rs

@@ -15,14 +15,14 @@ pub struct ResolcOpts {
     )]
     pub resolc_compile: Option<bool>,
 
-    /// Enable PVM mode at startup (independent of compilation)
+    /// Use pallet-revive runtime backend
     #[arg(
-        long = "resolc-startup",
-        help = "Enable PVM mode at startup",
-        value_name = "RESOLC_STARTUP",
+        long = "polkadot",
+        help = "Use pallet-revive runtime backend",
+        value_name = "POLKADOT",
         action = clap::ArgAction::SetTrue
     )]
-    pub resolc_startup: Option<bool>,
+    pub polkadot: Option<bool>,
 
     /// Specify the resolc version, or a path to a local resolc, to build with.
     ///
@@ -88,8 +88,8 @@ impl ResolcOpts {
             resolc.resolc_compile
         );
         set_if_some!(
-            self.resolc_startup.and_then(|v| if v { Some(true) } else { None }),
-            resolc.resolc_startup
+            self.polkadot.and_then(|v| if v { Some(true) } else { None }),
+            resolc.polkadot
         );
         set_if_some!(
             self.use_resolc.as_ref().map(|v| SolcReq::from(v.trim_start_matches("resolc:"))),

crates/cli/src/utils/mod.rs

@@ -133,13 +133,32 @@ pub fn get_provider_builder(config: &Config) -> Result<ProviderBuilder> {
 
 /// Return an [ExecutorStrategy] via the config.
 pub fn get_executor_strategy(config: &Config) -> ExecutorStrategy {
-    // TODO: using resolc compiler: `[FAIL: EvmError: StackUnderflow] constructor() (gas: 0)`
-    if config.resolc.resolc_compile {
-        info!("using revive strategy");
-        use revive_strategy::ReviveExecutorStrategyBuilder;
-        ExecutorStrategy::new_revive(config.resolc.resolc_startup)
-    } else {
-        ExecutorStrategy::new_evm()
+    use revive_strategy::{ReviveExecutorStrategyBuilder, ReviveRuntimeMode};
+
+    let polkadot = config.resolc.polkadot;
+    let resolc = config.resolc.resolc_compile;
+
+    match (resolc, polkadot) {
+        // (default) - Standard Foundry EVM test
+        (false, false) => {
+            info!("using standard EVM strategy");
+            ExecutorStrategy::new_evm()
+        }
+        // --resolc - Run PolkaVM backend on pallet-revive (PVM)
+        (true, false) => {
+            info!("using revive strategy with PVM backend");
+            ExecutorStrategy::new_revive(ReviveRuntimeMode::Pvm)
+        }
+        // --resolc --polkadot - Run PolkaVM backend on pallet-revive (PVM)
+        (true, true) => {
+            info!("using revive strategy with PVM backend (polkadot mode)");
+            ExecutorStrategy::new_revive(ReviveRuntimeMode::Pvm)
+        }
+        // --polkadot (without resolc) - Run EVM backend on pallet-revive
+        (false, true) => {
+            info!("using revive strategy with EVM backend on pallet-revive");
+            ExecutorStrategy::new_revive(ReviveRuntimeMode::Evm)
+        }
     }
 }
 

crates/config/src/revive.rs

@@ -20,8 +20,8 @@ pub struct ResolcConfig {
     /// Enable compilation using resolc
     pub resolc_compile: bool,
 
-    /// Enable PVM mode at startup (independent of compilation)
-    pub resolc_startup: bool,
+    /// Use pallet-revive runtime backend
+    pub polkadot: bool,
 
     /// The resolc compiler
     pub resolc: Option<SolcReq>,

crates/forge/Cargo.toml

@@ -113,6 +113,7 @@ serial_test.workspace = true
 mockall = "0.13"
 globset = "0.4"
 paste = "1.0"
+rstest = "0.24"
 similar-asserts.workspace = true
 svm = { package = "svm-rs", version = "0.5", default-features = false, features = [
     "rustls",

crates/forge/tests/cli/config.rs

@@ -1065,7 +1065,7 @@ path = "out"
 
 [profile.default.resolc]
 resolc_compile = false
-resolc_startup = false
+polkadot = false
 
 [fmt]
 line_length = 120
@@ -1345,7 +1345,7 @@ exclude = []
   "script_execution_protection": true,
   "resolc": {
     "resolc_compile": false,
-    "resolc_startup": false,
+    "polkadot": false,
     "resolc": null,
     "optimizer_mode": null,
     "heap_size": null,

crates/forge/tests/cli/revive_vm.rs

@@ -73,7 +73,7 @@ contract CounterTest is DSTest {
     .unwrap();
     prj.update_config(|config| config.evm_version = EvmVersion::Cancun);
 
-    let res = cmd.args(["test", "--resolc", "-vvv", "--resolc-startup"]).assert();
+    let res = cmd.args(["test", "--resolc", "-vvv", "--polkadot"]).assert();
     res.stderr_eq(str![""]).stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
 [SOLC_VERSION] [ELAPSED]
@@ -121,7 +121,7 @@ contract SetNonce is DSTest {
     .unwrap();
     prj.update_config(|config| config.evm_version = EvmVersion::Cancun);
 
-    let res = cmd.args(["test", "--resolc", "-vvv", "--resolc-startup"]).assert_success();
+    let res = cmd.args(["test", "--resolc", "-vvv", "--polkadot"]).assert_success();
     res.stderr_eq(str![""]).stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
 [SOLC_VERSION] [ELAPSED]
@@ -165,7 +165,7 @@ contract Roll is DSTest {
     )
     .unwrap();
 
-    let res = cmd.args(["test", "--resolc", "-vvv", "--resolc-startup"]).assert_success();
+    let res = cmd.args(["test", "--resolc", "-vvv", "--polkadot"]).assert_success();
     res.stderr_eq(str![""]).stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
 [SOLC_VERSION] [ELAPSED]
@@ -209,7 +209,7 @@ contract Warp is DSTest {
     )
     .unwrap();
 
-    let res = cmd.args(["test", "--resolc", "-vvv", "--resolc-startup"]).assert_success();
+    let res = cmd.args(["test", "--resolc", "-vvv", "--polkadot"]).assert_success();
     res.stderr_eq(str![""]).stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
 [SOLC_VERSION] [ELAPSED]
@@ -254,7 +254,7 @@ function test_Balance() public {
     )
     .unwrap();
 
-    let res = cmd.args(["test", "--resolc", "-vvv", "--resolc-startup"]).assert_success();
+    let res = cmd.args(["test", "--resolc", "-vvv", "--polkadot"]).assert_success();
     res.stderr_eq(str![""]).stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
 [SOLC_VERSION] [ELAPSED]
@@ -331,3 +331,59 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
 
 "#]]);
 });
+
+// Test --polkadot flag: EVM execution on pallet-revive backend
+forgetest!(polkadot_evm_backend, |prj, cmd| {
+    prj.insert_ds_test();
+    prj.insert_vm();
+    prj.add_source(
+        "Counter.sol",
+        r#"
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+contract Counter {
+    uint256 public number;
+
+    constructor(uint256 _initial) {
+        number = _initial;
+    }
+
+    function increment() public {
+        number = number + 1;
+    }
+
+    function getNumber() public view returns (uint256) {
+        return number;
+    }
+}
+"#,
+    )
+    .unwrap();
+
+    prj.add_source(
+        "CounterTest.t.sol",
+        r#"
+import "./test.sol";
+import {Counter} from "./Counter.sol";
+
+contract CounterTest is DSTest {
+    function test_PolkadotEVMBackend() public {
+        // This test runs EVM bytecode on pallet-revive EVM backend
+        Counter counter = new Counter(42);
+        assertEq(counter.getNumber(), 42);
+
+        counter.increment();
+        assertEq(counter.getNumber(), 43);
+
+        counter.increment();
+        assertEq(counter.getNumber(), 44);
+    }
+}
+"#,
+    )
+    .unwrap();
+
+    // Test with --polkadot flag (EVM backend on pallet-revive)
+    cmd.args(["test", "--polkadot", "-vvv"]).assert_success();
+});