move the floorcost update and add debug log

ethereumjs · Dec 16, 2024 · f55010d · f55010d
1 parent 7e8562e
commit f55010d
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/packages/vm/src/runTx.ts b/packages/vm/src/runTx.ts
@@ -627,6 +627,14 @@ async function _runTx(vm: VM, opts: RunTxOpts): Promise<RunTxResult> {
   if (vm.DEBUG) {
     debugGas(`tx add baseFee ${intrinsicGas} to totalGasSpent (-> ${results.totalGasSpent})`)
   }
+  if (vm.common.isActivatedEIP(7623)) {
+    if (results.totalGasSpent < floorCost) {
+      results.totalGasSpent = floorCost
+      if (vm.DEBUG) {
+        debugGas(`tx apply floorCost ${floorCost} to totalGasSpent (-> ${results.totalGasSpent})`)
+      }
+    }
+  }
 
   // Add blob gas used to result
   if (isBlob4844Tx(tx)) {
@@ -650,11 +658,6 @@ async function _runTx(vm: VM, opts: RunTxOpts): Promise<RunTxResult> {
     }
   }
 
-  if (vm.common.isActivatedEIP(7623)) {
-    if (results.totalGasSpent < floorCost) {
-      results.totalGasSpent = floorCost
-    }
-  }
 
   results.amountSpent = results.totalGasSpent * gasPrice