no exception, just reset return data for insufficient funds

This is what the ethereum state tests are expecting. Though there are insufficient funds, we burn only the appropriate gas here. Rather than raising an InsufficientFunds exception (`burns_gas = True` - would burn all the gas), we just reset the return data and log the error. Same scenario when a stack depth limit has been reached.

Author: fselmo

eth/vm/logic/system.py

@@ -7,9 +7,7 @@
 from eth import constants
 from eth.exceptions import (
     Halt,
-    InsufficientFunds,
     Revert,
-    StackDepthLimit,
     WriteProtection,
 )
 
@@ -163,12 +161,13 @@ def __call__(self, computation: ComputationAPI) -> None:
 
         if insufficient_funds or stack_too_deep:
             computation.stack_push_int(0)
+            computation.return_data = b''
             if insufficient_funds:
-                raise InsufficientFunds(
-                    f"Insufficient funds: {storage_address_balance} < {stack_data.endowment}"
-                )
+                err_msg = f"Insufficient Funds: {storage_address_balance} < {stack_data.endowment}"
             elif stack_too_deep:
-                raise StackDepthLimit("Stack depth limit reached")
+                err_msg = "Stack limit reached"
+            self.logger.debug2("%s failure: %s", self.mnemonic, err_msg,)
+            return
 
         call_data = computation.memory_read_bytes(
             stack_data.memory_start, stack_data.memory_length

newsfragments/2023.bugfix.rst

@@ -1 +1 @@
-Erase return data for exceptions with `erases_return_data` flag set to True
+Erase return data for exceptions with `erases_return_data` flag set to True and for CREATE / CREATE2 computations with insufficient funds

tests/core/vm/test_computation.py

@@ -10,7 +10,6 @@
 from eth import constants
 from eth.consensus import NoProofConsensus
 from eth.exceptions import (
-    InsufficientFunds,
     InvalidInstruction,
 )
 
@@ -76,20 +75,20 @@ def test_CREATE_and_CREATE2_resets_return_data_if_account_has_insufficient_funds
         value=0,
         code=code,
         data=code,
-        gas=400000,
+        gas=40000,
         gas_price=1,
     )
 
-    assert computation.is_error
-
-    if isinstance(computation.error, InvalidInstruction):
+    if computation.is_error:
+        assert isinstance(computation.error, InvalidInstruction)
         # only test CREATE case for byzantium as the CREATE2 opcode (0xf5) was not yet introduced
         assert vm.fork == "byzantium"
         assert "0xf5" in repr(computation.error).lower()
 
     else:
-        assert isinstance(computation.error, InsufficientFunds)
-
-        assert computation.get_gas_used() == 400000
-        assert computation.get_gas_refund() == 0
+        # We provide 40000 gas and a simple create uses 32000 gas. This test doesn't particularly
+        # care (and isn't testing for) the exact gas, we just want to make sure not all the gas
+        # is burned since if, say, a VMError were to be raised it would burn all the gas
+        # (burns_gas = True).
+        assert 34000 < computation.get_gas_used() < 39000
         assert computation.return_data == b''