Fix contract call reversion (#709)

* Add checkpointing for contract reversion * Comment
0xPolygonZero · Oct 8, 2024 · 4c8035e · 4c8035e
1 parent 5c703ce
commit 4c8035e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/evm_arithmetization/src/cpu/kernel/asm/core/call.asm b/evm_arithmetization/src/cpu/kernel/asm/core/call.asm
@@ -91,7 +91,7 @@ global sys_callcode:
           (new_ctx, args_offset, args_size, new_ctx, kexit_info, callgas, address, value, args_offset, args_size, ret_offset, ret_size)
     %copy_mem_to_calldata
     // stack: new_ctx, kexit_info, callgas, address, value, args_offset, args_size, ret_offset, ret_size
-    DUP5 %address %address %transfer_eth %jumpi(call_insufficient_balance)
+    DUP5 %address DUP1 %transfer_eth %jumpi(call_insufficient_balance)
     // stack: new_ctx, kexit_info, callgas, address, value, args_offset, args_size, ret_offset, ret_size
     DUP3 %set_new_ctx_gas_limit
     // stack: new_ctx, kexit_info, callgas, address, value, args_offset, args_size, ret_offset, ret_size

diff --git a/evm_arithmetization/src/cpu/kernel/asm/core/process_txn.asm b/evm_arithmetization/src/cpu/kernel/asm/core/process_txn.asm
@@ -246,6 +246,8 @@ global process_message_txn:
     // stack: code_empty, retdest
     %jumpi(process_message_txn_return)
 
+    %checkpoint
+
     // Otherwise, load to's code and execute it in a new context.
     // stack: retdest
     %create_context
@@ -321,7 +323,10 @@ process_message_txn_after_call_contd:
 
 process_message_txn_fail:
     // stack: leftover_gas, new_ctx, retdest, success, leftover_gas
-    // Transfer value back to the caller.
+
+    // Revert txn execution, then transfer value back to the caller.
+    %revert_checkpoint
+
     %mload_txn_field(@TXN_FIELD_VALUE) ISZERO %jumpi(process_message_txn_after_call_contd)
     %mload_txn_field(@TXN_FIELD_VALUE)
     %mload_txn_field(@TXN_FIELD_ORIGIN)