Add EVM to Revive bytecode migration (#344)

Author: smiasojed

crates/forge/tests/cli/revive_vm.rs

@@ -1,59 +1,5 @@
 use foundry_compilers::artifacts::EvmVersion;
 
-forgetest!(can_translate_balances_after_switch_to_pvm, |prj, cmd| {
-    prj.insert_ds_test();
-    prj.insert_vm();
-    prj.insert_console();
-    prj.add_source(
-        "BalanceTranslationTest.t.sol",
-        r#"
-import "./test.sol";
-import "./Vm.sol";
-import {console} from "./console.sol";
-
-contract BalanceTranslationTest is DSTest {
-    Vm constant vm = Vm(HEVM_ADDRESS);
-
-    function test_BalanceTranslationRevmPvm() public {
-        uint256 amount = 10 ether;
-        vm.deal(address(this), amount);
-
-        uint256 initialBalance = address(this).balance;
-        assertEq(initialBalance, amount);
-
-        vm.pvm(true);
-
-        uint256 currentBalance = address(this).balance;
-        console.log(initialBalance, currentBalance);
-        assertEq(initialBalance, currentBalance);
-    }
-}
-"#,
-    )
-    .unwrap();
-    prj.update_config(|config| config.evm_version = EvmVersion::Cancun);
-
-    let res = cmd.args(["test", "--resolc", "-vvv"]).assert_success();
-    res.stderr_eq(str![""]).stdout_eq(str![[r#"
-[COMPILING_FILES] with [SOLC_VERSION]
-[SOLC_VERSION] [ELAPSED]
-Compiler run successful!
-[COMPILING_FILES] with [RESOLC_VERSION]
-[RESOLC_VERSION] [ELAPSED]
-Compiler run successful!
-
-Ran 1 test for src/BalanceTranslationTest.t.sol:BalanceTranslationTest
-[PASS] test_BalanceTranslationRevmPvm() ([GAS])
-Logs:
-  10000000000000000000 10000000000000000000
-
-Suite result: ok. 1 passed; 0 failed; 0 skipped; [ELAPSED]
-
-Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
-
-"#]]);
-});
-
 forgetest!(counter_test, |prj, cmd| {
     prj.insert_ds_test();
     prj.insert_vm();
@@ -91,7 +37,6 @@ contract CounterTest is DSTest {
   Counter public counter;
 
   function setUp() public {
-    vm.pvm(true);
     counter = new Counter(); 
     counter.setNumber(5);
     assertEq(counter.number(), 5);
@@ -128,7 +73,7 @@ contract CounterTest is DSTest {
     .unwrap();
     prj.update_config(|config| config.evm_version = EvmVersion::Cancun);
 
-    let res = cmd.args(["test", "--resolc", "-vvv"]).assert();
+    let res = cmd.args(["test", "--resolc", "-vvv", "--resolc-startup"]).assert();
     res.stderr_eq(str![""]).stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
 [SOLC_VERSION] [ELAPSED]
@@ -164,7 +109,6 @@ contract SetNonce is DSTest {
   Vm constant vm = Vm(HEVM_ADDRESS);
 
   function test_SetNonce() public {
-      vm.pvm(true);
       uint64 original = vm.getNonce(address(this));
       vm.setNonce(address(this), 64);
       uint64 newValue = vm.getNonce(address(this));
@@ -177,7 +121,7 @@ contract SetNonce is DSTest {
     .unwrap();
     prj.update_config(|config| config.evm_version = EvmVersion::Cancun);
 
-    let res = cmd.args(["test", "--resolc", "-vvv"]).assert_success();
+    let res = cmd.args(["test", "--resolc", "-vvv", "--resolc-startup"]).assert_success();
     res.stderr_eq(str![""]).stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
 [SOLC_VERSION] [ELAPSED]
@@ -210,7 +154,6 @@ contract Roll is DSTest {
   Vm constant vm = Vm(HEVM_ADDRESS);
 
   function test_Roll() public {
-      vm.pvm(true);
       uint256 original = block.number;
       vm.roll(10);
       uint256 newValue = block.number;
@@ -222,7 +165,7 @@ contract Roll is DSTest {
     )
     .unwrap();
 
-    let res = cmd.args(["test", "--resolc", "-vvv"]).assert_success();
+    let res = cmd.args(["test", "--resolc", "-vvv", "--resolc-startup"]).assert_success();
     res.stderr_eq(str![""]).stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
 [SOLC_VERSION] [ELAPSED]
@@ -255,7 +198,6 @@ contract Warp is DSTest {
   Vm constant vm = Vm(HEVM_ADDRESS);
 
   function test_Warp() public {
-      vm.pvm(true);
       uint256 original = block.timestamp;
       vm.warp(100);
       uint256 newValue = block.timestamp;
@@ -267,7 +209,6 @@ contract Warp is DSTest {
     )
     .unwrap();
 
-    cmd.env("RUST_LOG", "revive_strategy");
     let res = cmd.args(["test", "--resolc", "-vvv", "--resolc-startup"]).assert_success();
     res.stderr_eq(str![""]).stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
@@ -276,12 +217,6 @@ Compiler run successful!
 [COMPILING_FILES] with [RESOLC_VERSION]
 [RESOLC_VERSION] [ELAPSED]
 Compiler run successful!
-[..] INFO revive_strategy::cheatcodes: startup PVM migration initiated
-[..] INFO revive_strategy::cheatcodes: switching to PVM
-[..] INFO revive_strategy::cheatcodes: startup PVM migration completed
-[..] INFO revive_strategy::cheatcodes: cheatcode=pvmCall { enabled: true } using_pvm=true
-[..] INFO revive_strategy::cheatcodes: already in PVM
-[..] INFO revive_strategy::cheatcodes: cheatcode=warpCall { newTimestamp: 100 } using_pvm=true
 
 Ran 1 test for src/Warp.t.sol:Warp
 [PASS] test_Warp() ([GAS])
@@ -319,7 +254,6 @@ function test_Balance() public {
     )
     .unwrap();
 
-    cmd.env("RUST_LOG", "revive_strategy");
     let res = cmd.args(["test", "--resolc", "-vvv", "--resolc-startup"]).assert_success();
     res.stderr_eq(str![""]).stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
@@ -328,13 +262,6 @@ Compiler run successful!
 [COMPILING_FILES] with [RESOLC_VERSION]
 [RESOLC_VERSION] [ELAPSED]
 Compiler run successful!
-[..] INFO revive_strategy::cheatcodes: startup PVM migration initiated
-[..] INFO revive_strategy::cheatcodes: switching to PVM
-[..] INFO revive_strategy::cheatcodes: startup PVM migration completed
-[..] INFO revive_strategy::cheatcodes: cheatcode=dealCall { account: 0x7fa9385be102ac3eac297483dd6233d62b3e1496, newBalance: 64000000000000000000 } using_pvm=true
-[..] INFO revive_strategy::cheatcodes: operation="get_balance" using_pvm=true target=0x7fa9385be102ac3eac297483dd6233d62b3e1496 balance=64000000000000000000
-[..] INFO revive_strategy::cheatcodes: cheatcode=dealCall { account: 0x7fa9385be102ac3eac297483dd6233d62b3e1496, newBalance: 65000000000000000000 } using_pvm=true
-[..] INFO revive_strategy::cheatcodes: operation="get_balance" using_pvm=true target=0x7fa9385be102ac3eac297483dd6233d62b3e1496 balance=65000000000000000000
 
 Ran 1 test for src/Balance.t.sol:Balance
 [PASS] test_Balance() ([GAS])

crates/forge/tests/it/revive/migration.rs

@@ -33,7 +33,17 @@ async fn test_revive_nonce_migration() {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_revive_bytecode_migration() {
     let runner = TEST_DATA_REVIVE.runner_revive();
-    let filter = Filter::new("testBytecodeMigration", "EvmReviveMigrationTest", ".*/revive/.*");
+    let filter =
+        Filter::new("testBytecodeMigrationToEvm", "EvmReviveMigrationTest", ".*/revive/.*");
+
+    TestConfig::with_filter(runner, filter).spec_id(SpecId::SHANGHAI).run().await;
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_evm_bytecode_migration() {
+    let runner = TEST_DATA_REVIVE.runner_revive();
+    let filter =
+        Filter::new("testBytecodeMigrationToRevive", "EvmReviveMigrationTest", ".*/revive/.*");
 
     TestConfig::with_filter(runner, filter).spec_id(SpecId::SHANGHAI).run().await;
 }

crates/revive-env/src/lib.rs

@@ -6,7 +6,9 @@
 //! THIS IS WORK IN PROGRESS. It is not yet complete and may change in the future.
 #![allow(clippy::disallowed_macros)]
 use polkadot_sdk::{
-    frame_system, pallet_balances,
+    frame_support::traits::{OnGenesis, fungible::Mutate},
+    frame_system::{self, Pallet},
+    pallet_balances,
     pallet_revive::{self, AddressMapper},
     polkadot_runtime_common::BuildStorage,
     sp_core::H160,
@@ -53,7 +55,23 @@ impl ExtBuilder {
         pallet_revive::GenesisConfig::<Runtime>::default().assimilate_storage(&mut t).unwrap();
         let mut ext = sp_io::TestExternalities::new(t);
         ext.register_extension(KeystoreExt::new(MemoryKeystore::new()));
-        ext.execute_with(|| System::set_block_number(0));
+        ext.execute_with(|| {
+            Pallet::<Runtime>::on_genesis();
+            System::set_block_number(0);
+
+            // Set a large balance for pallet account to handle storage deposits during contract
+            // migration Using a reasonable large value to avoid overflow when minting
+            let pallet_account = pallet_revive::Pallet::<Runtime>::account_id();
+            let large_balance: Balance = 1_000_000_000_000_000_000_000_000_000_u128;
+            let _ = <Runtime as pallet_revive::Config>::Currency::mint_into(
+                &pallet_account,
+                large_balance,
+            );
+
+            let _ = pallet_revive::Pallet::<Runtime>::map_account(
+                frame_system::RawOrigin::Signed(pallet_account).into(),
+            );
+        });
         ext
     }
 }

crates/revive-env/src/runtime.rs

@@ -63,6 +63,7 @@ parameter_types! {
     pub const DepositPerByte: Balance = 1;
     pub const DepositPerItem: Balance = 2;
     pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(0);
+    pub const NativeToEthRatio: u32 = 1_000_000;
     pub BlockWeights: frame_system::limits::BlockWeights =
         frame_system::limits::BlockWeights::simple_max(
             Weight::from_parts(2u64 * WEIGHT_REF_TIME_PER_SECOND, u64::MAX),
@@ -83,6 +84,7 @@ impl pallet_revive::Config for Runtime {
     type InstantiateOrigin = EnsureSigned<AccountId32>;
     type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
     type ChainId = ConstU64<420_420_420>;
+    type NativeToEthRatio = ConstU32<1_000_000_000>;
     type FindAuthor = Self;
 }