tx: add missing forks

ethereumjs · Jan 13, 2025 · 8535e2c · 8535e2c
1 parent 5abc991
commit 8535e2c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/packages/tx/test/transactionRunner.spec.ts b/packages/tx/test/transactionRunner.spec.ts
@@ -15,6 +15,9 @@ const file: string | undefined = argv.file
 
 const forkNames: ForkName[] = [
   'Prague',
+  'Cancun',
+  'Shanghai',
+  'Paris',
   'London+3860',
   'London',
   'Berlin',
@@ -31,6 +34,9 @@ const forkNames: ForkName[] = [
 const forkNameMap: ForkNamesMap = {
   Prague: 'prague',
   'London+3860': 'london',
+  Cancun: 'cancun',
+  Shanghai: 'shanghai',
+  Paris: 'paris',
   London: 'london',
   Berlin: 'berlin',
   Istanbul: 'istanbul',

diff --git a/packages/tx/test/types.ts b/packages/tx/test/types.ts
@@ -1,5 +1,8 @@
 export type ForkName =
   | 'Prague'
+  | 'Cancun'
+  | 'Shanghai'
+  | 'Paris'
   | 'London+3860'
   | 'London'
   | 'Berlin'

diff --git a/packages/vm/src/runTx.ts b/packages/vm/src/runTx.ts
@@ -652,11 +652,13 @@ async function _runTx(vm: VM, opts: RunTxOpts): Promise<RunTxResult> {
 
   if (vm.common.isActivatedEIP(7623)) {
     if (results.totalGasSpent < floorCost) {
-      // TODO: likely set `results.gasRefund = BIGINT_0`
-      results.totalGasSpent = floorCost
       if (vm.DEBUG) {
-        debugGas(`tx apply floorCost ${floorCost} to totalGasSpent (-> ${results.totalGasSpent})`)
+        debugGas(
+          `tx floorCost ${floorCost} is higher than to total execution gas spent (-> ${results.totalGasSpent}), setting floor as gas paid`,
+        )
       }
+      results.gasRefund = BIGINT_0
+      results.totalGasSpent = floorCost
     }
   }