feat(spec-specs): SELFDESTRUCT same-tx refunds state gas at end of tx

spencer-tb · spencer-tb · commit 0e1c131b3eda · 2026-04-19T14:55:42.000+02:00
diff --git a/src/ethereum/forks/amsterdam/fork.py b/src/ethereum/forks/amsterdam/fork.py
@@ -98,10 +98,13 @@
 from .vm.gas import (
     BLOB_SCHEDULE_MAX,
     GAS_PER_BLOB,
+    STATE_BYTES_PER_NEW_ACCOUNT,
+    STATE_BYTES_PER_STORAGE_SET,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
     calculate_total_blob_gas,
+    state_gas_per_byte,
 )
 from .vm.interpreter import MessageCallOutput, process_message_call
 
@@ -1053,6 +1056,34 @@ def process_transaction(
     if tx_output.error is not None:
         tx_output.state_gas_left += tx_output.state_gas_used
         tx_output.state_gas_used = Uint(0)
+    else:
+        # Refund state gas for accounts created and destroyed in the
+        # same tx (EIP-6780). Covers account, storage, and code.
+        cost_per_state_byte = state_gas_per_byte(block_env.block_gas_limit)
+        for address in tx_output.accounts_to_delete:
+            if address in tx_state.created_accounts:
+                selfdestruct_refund = (
+                    STATE_BYTES_PER_NEW_ACCOUNT * cost_per_state_byte
+                )
+                storage = tx_state.storage_writes.get(address, {})
+                created_slots = sum(1 for v in storage.values() if v != 0)
+                selfdestruct_refund += (
+                    Uint(created_slots)
+                    * STATE_BYTES_PER_STORAGE_SET
+                    * cost_per_state_byte
+                )
+                # EIP-6780 defers account/storage/code removal to
+                # tx-end, so `account.code_hash` still points at the
+                # deployed code here and `get_code` returns it
+                # pre-deletion.
+                account = get_account(tx_state, address)
+                code = get_code(tx_state, account.code_hash)
+                selfdestruct_refund += Uint(len(code)) * cost_per_state_byte
+                selfdestruct_refund = min(
+                    selfdestruct_refund, tx_output.state_gas_used
+                )
+                tx_output.state_gas_left += selfdestruct_refund
+                tx_output.state_gas_used -= selfdestruct_refund
 
     tx_gas_used_before_refund = (
         tx.gas - tx_output.gas_left - tx_output.state_gas_left
