wip5

oasisprotocol · Jan 13, 2025 · 019461f · 019461f
1 parent 9670053
commit 019461f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 54 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime-sdk/modules/evm-new/Cargo.toml b/runtime-sdk/modules/evm-new/Cargo.toml
@@ -23,7 +23,7 @@ once_cell = "1.8.0"
 # Ethereum.
 ethabi = { version = "18.0.0", default-features = false, features = ["std"] }
 ethereum = "0.15"
-revm = { git = "https://github.com/bluealloy/revm", tag = "v42" }
+revm = { git = "https://github.com/bluealloy/revm", tag = "v52", default-features = false, features = ["std", "serde", "optional_eip3607"] }
 fixed-hash = "0.8.0"
 primitive-types = { version = "0.12", default-features = false, features = ["rlp", "num-traits"] }
 rlp = "0.5.2"

diff --git a/runtime-sdk/modules/evm-new/src/db.rs b/runtime-sdk/modules/evm-new/src/db.rs
@@ -128,7 +128,8 @@ impl<'ctx, C: Context, Cfg: Config> DatabaseCommit for OasisDB<'ctx, C, Cfg> {
                 &token::BaseUnits::new(account.info.balance.to::<u128>(), Cfg::TOKEN_DENOMINATION),
             );
 
-            <C::Runtime as Runtime>::Accounts::set_nonce(sdk_address, account.info.nonce);
+            // Hmm...
+            //<C::Runtime as Runtime>::Accounts::set_nonce(sdk_address, account.info.nonce);
 
             if account.info.code.is_some() {
                 let code = account.info.code.unwrap().bytecode().to_vec();

diff --git a/runtime-sdk/modules/evm-new/src/lib.rs b/runtime-sdk/modules/evm-new/src/lib.rs
@@ -383,6 +383,9 @@ impl<Cfg: Config> Module<Cfg> {
         let db = db::OasisDB::<'_, C, Cfg>::new(ctx);
         let mut evm = Evm::builder()
             .with_spec_id(SpecId::SHANGHAI)
+            .modify_cfg_env(|cfg| {
+                cfg.disable_eip3607 = true;
+            })
             .with_db(db)
             .modify_tx_env(f)
             .build();

diff --git a/runtime-sdk/modules/evm-new/src/test.rs b/runtime-sdk/modules/evm-new/src/test.rs
@@ -980,7 +980,7 @@ fn test_fee_refunds() {
         message,
     } = dispatch_result.result
     {
-        assert_eq!(module, "evm");
+        assert_eq!(module, "evm-new");
         assert_eq!(code, 8);
         assert_eq!(
             decode_reverted(&message).unwrap(),
@@ -1174,7 +1174,7 @@ fn test_return_value_limits() {
         message,
     } = dispatch_result.result
     {
-        assert_eq!(module, "evm");
+        assert_eq!(module, "evm-new");
         assert_eq!(code, 8);
         let message = decode_reverted_raw(&message).unwrap();
         // Actual payload is ABI-encoded so the raw result starts at offset 68.