Add charges for selfdestruct ETH recipient address reads

ethereumjs · Sep 28, 2020 · c234a7b · c234a7b
1 parent 62eb4b8
commit c234a7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/vm/lib/evm/opcodes/functions.ts b/packages/vm/lib/evm/opcodes/functions.ts
@@ -1193,6 +1193,7 @@ export const handlers: Map<number, OpHandler> = new Map([
         runState.eei.useGas(new BN(runState._common.param('gasPrices', 'callNewAccount')))
       }
 
+      accessAddressEIP2929(runState, selfdestructToAddress, 0)
       return runState.eei.selfDestruct(selfdestructToAddressBuf)
     },
   ],

diff --git a/packages/vm/lib/evm/opcodes/util.ts b/packages/vm/lib/evm/opcodes/util.ts
@@ -33,13 +33,14 @@ function accessAddressEIP2929(runState: RunState, address: BN | Buffer, baseFee?
     runState.accessedAddresses.add(addressStr)
 
     // CREATE, CREATE2 opcodes have the address warmed for free.
-    if (baseFee) {
+    // selfdestruct beneficiary address reads are charged an *additional* cold access
+    if (baseFee !== undefined) {
       runState.eei.useGas(
         new BN(runState._common.param('gasPrices', 'coldaccountaccess') - baseFee),
       )
     }
-    // Warm
-  } else if (baseFee) {
+    // Warm: (selfdestruct beneficiary address reads are not charged when warm)
+  } else if (baseFee !== undefined && baseFee > 0) {
     runState.eei.useGas(new BN(runState._common.param('gasPrices', 'warmstorageread') - baseFee))
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1193,6 +1193,7 @@ export const handlers: Map<number, OpHandler> = new Map([ @@
             runState.eei.useGas(new BN(runState._common.param('gasPrices', 'callNewAccount')))
           }
+          accessAddressEIP2929(runState, selfdestructToAddress, 0)
           return runState.eei.selfDestruct(selfdestructToAddressBuf)
         },
       ],
@@ Expand Down @@