EIP 6690: EVMMAX implementation

packages/common/src/chains.ts

@@ -121,6 +121,10 @@ export const Mainnet: ChainConfig = {
       name: 'osaka',
       block: null,
     },
+    {
+      name: 'evmmax',
+      block: null,
+    },
   ],
   bootstrapNodes: [
     {

packages/common/src/enums.ts

@@ -73,6 +73,7 @@ export enum Hardfork {
   Prague = 'prague',
   Osaka = 'osaka',
   Verkle = 'verkle',
+  EVMMax = 'evmmax',
 }
 
 export enum ConsensusType {

packages/common/src/hardforks.ts

@@ -171,4 +171,7 @@ export const hardforksDict: HardforksDict = {
   verkle: {
     eips: [4762, 6800],
   },
+  evmmax: {
+    eips: [6690],
+  },
 }

packages/common/src/utils.ts

@@ -149,6 +149,7 @@ function parseGethParams(json: any) {
     [Hardfork.Cancun]: { name: 'cancunTime', postMerge: true, isTimestamp: true },
     [Hardfork.Prague]: { name: 'pragueTime', postMerge: true, isTimestamp: true },
     [Hardfork.Verkle]: { name: 'verkleTime', postMerge: true, isTimestamp: true },
+    [Hardfork.EVMMax]: { name: 'evmmaxTime', postMerge: true, isTimestamp: true },
   }
 
   // forkMapRev is the map from config field name to Hardfork

packages/evm/src/opcodes/codes.ts

@@ -210,6 +210,14 @@
   0xa3: dynamicGasOp('LOG'),
   0xa4: dynamicGasOp('LOG'),
 
+  // '0xf0' range - extended range/width modular arithmetic
+  0xc0: asyncAndDynamicGasOp('SETMODX'),
+  0xc1: asyncAndDynamicGasOp('LOADX'),
+  0xc2: asyncAndDynamicGasOp('STOREX'),
+  0xc3: asyncAndDynamicGasOp('ADDMODX'),
+  0xc4: asyncAndDynamicGasOp('SUBMODX'),
+  0xc5: asyncAndDynamicGasOp('MULMODX'),
+
   // '0xf0' range - closures
   0xf0: asyncAndDynamicGasOp('CREATE'),
   0xf1: asyncAndDynamicGasOp('CALL'),
@@ -372,6 +380,19 @@
       0xee: asyncAndDynamicGasOp('RETURNCONTRACT'),
     },
   },
+  {
+    eip: 6690,
+    opcodes: {
+      // control & i/o
+      0xc0: asyncAndDynamicGasOp('SETMODX'),
+      0xc1: asyncAndDynamicGasOp('LOADX'),
+      0xc2: asyncAndDynamicGasOp('STOREX'),
+      // arithmetic
+      0xc3: asyncAndDynamicGasOp('ADDMODX'),
+      0xc4: asyncAndDynamicGasOp('SUBMODX'),
+      0xc5: asyncAndDynamicGasOp('MULMODX'),
+    },
+  },
 ]
 
 /**
@@ -436,7 +457,7 @@
   }
 
   for (const key in opcodeBuilder) {
     const baseFee = Number(common.param(`${opcodeBuilder[key].name.toLowerCase()}Gas`))
     // explicitly verify that we have defined a base fee
     if (baseFee === undefined) {
       throw new Error(`base fee not defined for: ${opcodeBuilder[key].name}`)

packages/evm/src/opcodes/functions.ts

@@ -1016,6 +1016,48 @@ export const handlers: Map<number, OpHandler> = new Map([
       runState.interpreter.log(mem, topicsCount, topicsBuf)
     },
   ],
+  // 0xc0: SETMODX
+  [
+    0xc0,
+    function (runState, _common) {
+      return
+    },
+  ],
+  // 0xc1: STOREX
+  [
+    0xc1,
+    function (runState, _common) {
+      return
+    },
+  ],
+  // 0xc2: LOADX
+  [
+    0xc2,
+    function (runState, _common) {
+      return
+    },
+  ],
+  // 0xc3: ADDMODX
+  [
+    0xc3,
+    function (runState, _common) {
+      return
+    },
+  ],
+  // 0xc4: SUBMODX
+  [
+    0xc4,
+    function (runState, _common) {
+      return
+    },
+  ],
+  // 0xc5: MULMODX
+  [
+    0xc5,
+    function (runState, _common) {
+      return
+    },
+  ],
   // 0xd0: DATALOAD
   [
     0xd0,