Fixes

Author: am1r021

packages/common/src/eips.ts

@@ -348,7 +348,7 @@ export const eipsDict: EIPsDict = {
    * URL         : https://eips.ethereum.org/EIPS/eip-6690
    * Status      : Draft
    */
-  6990: {
+  6690: {
     minimumHardfork: Hardfork.Prague,
   },
   /**

packages/evm/src/evm.ts

@@ -250,7 +250,7 @@ export class EVM implements EVMInterface {
     const supportedEIPs = [
       663, 1153, 1559, 2537, 2565, 2718, 2929, 2930, 2935, 3198, 3529, 3540, 3541, 3607, 3651, 3670,
       3855, 3860, 4200, 4399, 4750, 4788, 4844, 4895, 5133, 5450, 5656, 6110, 6206, 6780, 6800,
-      6990, 7002, 7069, 7251, 7480, 7516, 7620, 7685, 7691, 7692, 7698, 7702, 7709,
+      6690, 7002, 7069, 7251, 7480, 7516, 7620, 7685, 7691, 7692, 7698, 7702, 7709,
     ]
 
     for (const eip of this.common.eips()) {

packages/evm/src/evmmax/constants.ts

@@ -1,3 +1,4 @@
+export const SETMODX_BASE_COST = 1
 export const STOREX_BASE_COST = 1
 export const LOADX_BASE_COST = 1
 export const MAX_ALLOC_SIZE = 96 * 256

packages/evm/src/opcodes/gas.ts

@@ -870,7 +870,7 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
       async function (runState, gas, common): Promise<bigint> {
         const [dst, src, count] = runState.stack.peek(3)
 
-        if (!isUint64(src) || src >= runState.memoryWordCount) {
+        if (!isUint64(src) || src >= runState.memory._store.length) {
           trap('src index out of bounds')
         }
         if (!isUint64(dst) || dst >= runState.evmmaxState.getActive().getNumElems()) {
@@ -880,7 +880,7 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
           trap('count must be less than number of field elements in the active space')
         }
         const storeSize = count * runState.evmmaxState.getActive().getNumElems()
-        if (src + storeSize > runState.memoryWordCount) {
+        if (src + storeSize > runState.memory._store.length) {
           trap('source of copy out of bounds of EVM memory')
         }
 
@@ -890,7 +890,11 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
           return (
             gas +
             count *
-              BigInt(MULMODX_COST[Number(runState.evmmaxState.getActive().getElemSize() / 8) - 1])
+              BigInt(
+                MULMODX_COST[
+                  Number(Math.ceil(runState.evmmaxState.getActive().getElemSize() / 8)) - 1
+                ],
+              )
           )
         }
       },

packages/evm/test/eips/eip-6990.spec.ts

@@ -2,12 +2,12 @@ import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
 import { assert, describe, it } from 'vitest'
 import { createEVM } from '../../src/index.ts'
 
-describe('EIP 6990 tests', async () => {
+describe('EIP 6690 tests', async () => {
   it(`evmmax instantiation`, async () => {
     const evm = await createEVM({
       common: new Common({
         hardfork: Hardfork.Prague,
-        eips: [6990],
+        eips: [6690],
         chain: Mainnet,
       }),
     })

packages/evm/test/evmmax/opcodes.spec.ts

@@ -2,10 +2,12 @@ import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
 import { assert, describe, it } from 'vitest'
 
 import { type PrefixedHexString, hexToBytes } from '@ethereumjs/util'
+import { LOADX_BASE_COST, SETMODX_BASE_COST, STOREX_BASE_COST } from '../../src/evmmax/index.ts'
 import { createEVM } from '../../src/index.ts'
 
 const MSTORE8 = '53'
 const RETURN = 'f3'
+const PUSH1 = '60'
 
 const SETMODX = 'c0'
 const LOADX = 'c1'
@@ -20,19 +22,32 @@ function numToOpcode(num: number) {
 }
 
 function mstore8(index: number, value: number) {
-  return numToOpcode(value) + numToOpcode(index) + MSTORE8
+  // return numToOpcode(value) + numToOpcode(index) + MSTORE8
+  return PUSH1 + numToOpcode(value) + PUSH1 + numToOpcode(index) + MSTORE8
 }
 
 function ret(index: number, size: number) {
   return size + index + RETURN
 }
 
-function setupx(num_val_slots: number, mod_size: number, mod_offset: number) {
-  return numToOpcode(num_val_slots) + numToOpcode(mod_size) + numToOpcode(mod_offset) + SETMODX
+function setupx(id: number, mod_size: number, mod_offset: number, alloc_count: number) {
+  return (
+    PUSH1 +
+    numToOpcode(alloc_count) +
+    PUSH1 +
+    numToOpcode(mod_size) +
+    PUSH1 +
+    numToOpcode(mod_offset) +
+    PUSH1 +
+    numToOpcode(id) +
+    SETMODX
+  )
 }
 
-function storex(num_vals: number, val_offset: number, val_slot: number) {
-  return numToOpcode(num_vals) + numToOpcode(val_offset) + numToOpcode(val_slot) + STOREX
+function storex(dst: number, source: number, count: number) {
+  return (
+    PUSH1 + numToOpcode(dst) + PUSH1 + numToOpcode(source) + PUSH1 + numToOpcode(count) + STOREX
+  )
 }
 
 function loadx(num_vals: number, val_idx: number, mem_offset: number) {
@@ -53,22 +68,35 @@ function mulmodx(result_slot_idx: number, x_slot_idx: number, y_slot_idx: number
 
 describe('EVM -> getActiveOpcodes()', () => {
   it('should not expose opcodes from a follow-up HF (istanbul -> petersburg)', async () => {
-    const common = new Common({ chain: Mainnet, eips: [6990] })
+    const common = new Common({
+      chain: Mainnet,
+      eips: [6690],
+      params: {
+        6690: {
+          setmodxGas: SETMODX_BASE_COST,
+          loadxGas: LOADX_BASE_COST,
+          storexGas: STOREX_BASE_COST,
+          addmodxGas: 0,
+          submodxGas: 0,
+          mulmodxGas: 0,
+        },
+      },
+    })
     const evm = await createEVM({ common })
 
     // create bytecode
     const bytecode =
       '0x' +
       mstore8(0, 7) + // store value 0x07 at index 0 in memory
-      setupx(3, 32, 0) +
-      mstore8(32, 3) +
-      mstore8(64, 6) +
-      storex(2, 32, 0) +
-      addmodx(2, 1, 0) +
-      mulmodx(2, 2, 1) +
-      submodx(2, 2, 1) +
-      loadx(1, 2, 96) +
-      ret(96, 32)
+      setupx(0, 1, 0, 3) +
+      mstore8(1, 3) +
+      mstore8(2, 6) +
+      storex(2, 0, 0) +
+      addmodx(2, 1, 0)
+    // + mulmodx(2, 2, 1)
+    // + submodx(2, 2, 1)
+    // + loadx(1, 2, 96)
+    // + ret(96, 32)
 
     console.log(bytecode)