Merge pull request #565 from OffchainLabs/create-to-funded-account

Preserve account balance across create/create2
OffchainLabs · Jul 26, 2021 · 968fcf1 · 968fcf1
2 parents 435e1f5 + a1d61bb
commit 968fcf1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/arb_os/arbos-upgrade.mexe b/arb_os/arbos-upgrade.mexe
diff --git a/arb_os/arbos.mexe b/arb_os/arbos.mexe
diff --git a/arb_os/evmOps.mini b/arb_os/evmOps.mini
@@ -1043,24 +1043,25 @@ public impure func evmOp_create2(value: uint, offset: uint, length: uint, salt:
 
 #[noinline, ] public impure func doCreationOpcode(value: uint, constructorCode: ByteArray, newAddress: address) -> address {
     // make sure there isn't already an account at the given address
-    if let Some(acct) = evmCallStack_getAccount(newAddress) {
+    let originalAcct = xif let Some(acct) = evmCallStack_getAccount(newAddress) {
         if (account_hasContract(acct)) {
             // there is already a contract at that address; return failure
             return address(0);
         }
+        acct
     } else {
         // somehow there isn't an EVM callframe
         evm_runtimePanic(32);
-        panic;
-    }
+        panic
+    };
 
     let (startPoint, evmJumpTable, _) = translateEvmCodeSegment(bytestream_new(constructorCode), false);
 
     // Create a new account to run the constructor code.
     if (evmCallStack_setAccount(
             newAddress,
             account_setContractInfo(
-                pristineAccount(newAddress),
+                originalAcct,
                 constructorCode,
                 evmJumpTable,
                 getDummyAcceptContractCode(),

diff --git a/arb_os/upgrade.json b/arb_os/upgrade.json
diff --git a/replayTests/evm_test_arbsys_direct.aoslog b/replayTests/evm_test_arbsys_direct.aoslog
diff --git a/replayTests/evm_test_create.aoslog b/replayTests/evm_test_create.aoslog