Update tests

Author: am1r021

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

@@ -2,6 +2,7 @@ import { Common, Mainnet } from '@ethereumjs/common'
 import { assert, describe, it } from 'vitest'
 
 import { type PrefixedHexString, createAddressFromString, hexToBytes } from '@ethereumjs/util'
+import { bigIntToBytes } from '@ethereumjs/util'
 import { LOADX_BASE_COST, SETMODX_BASE_COST, STOREX_BASE_COST } from '../../src/evmmax/index.ts'
 import { createEVM } from '../../src/index.ts'
 
@@ -31,7 +32,7 @@ function ret(index: number, size: number) {
   return size + index + RETURN
 }
 
-function setupx(id: number, mod_size: number, mod_offset: number, alloc_count: number) {
+function setupx(id: number, mod_offset: number, mod_size: number, alloc_count: number) {
   return (
     PUSH1 +
     numToOpcode(alloc_count) +
@@ -120,8 +121,66 @@ function mulmodx(
   )
 }
 
-describe('EVM -> getActiveOpcodes()', () => {
-  it('should not expose opcodes from a follow-up HF (istanbul -> petersburg)', async () => {
+describe('should be able to perform modular arithmetic with evmmax opcodes', () => {
+  // it('1-byte modulus test', async () => {
+  //   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 })
+  //   evm.events.on('step', (e) => {
+  //     console.log(e.opcode.name)
+  //   })
+
+  //   const modulus = 8n
+  //   const modBytes = bigIntToBytes(modulus)
+
+  //   console.log('dbg100')
+  //   console.log(addmodx(0, 1, 1, 1, 2, 1, 1))
+  //   console.log(modBytes)
+  //   // create bytecode
+  //   const bytecode =
+  //     '0x' +
+  //     mstore8(0, 8) + // store value 0x08 at index 0 in memory
+  //     setupx(0, 1, 0, 3) +
+  //     mstore8(1, 3) +
+  //     mstore8(2, 6) +
+  //     storex(1, 1, 1) +
+  //     storex(2, 2, 1) +
+  //     addmodx(0, 1, 1, 1, 2, 1, 1) +
+  //     mulmodx(0, 1, 1, 1, 2, 1, 1) +
+  //     submodx(0, 1, 1, 1, 2, 1, 1) +
+  //     loadx(0, 0, 1)
+  //   // + ret(96, 32)
+
+  //   const ADDR_TO_CALL = createAddressFromString('0x' + '20'.repeat(20))
+
+  //   await evm.stateManager.putCode(ADDR_TO_CALL, hexToBytes(bytecode as PrefixedHexString))
+
+  //   const result = await evm.runCall({
+  //     to: ADDR_TO_CALL,
+  //     gasLimit: BigInt(0xffffff),
+  //   })
+
+  //   // const result1 = await evm.runCall({
+  //   //   data: hexToBytes(bytecode as PrefixedHexString),
+  //   //   gasLimit: BigInt(0xffffff),
+  //   // })
+
+  //   console.log(result)
+  // })
+
+  it('2-byte modulus test', async () => {
     const common = new Common({
       chain: Mainnet,
       eips: [6690],
@@ -137,19 +196,24 @@ describe('EVM -> getActiveOpcodes()', () => {
       },
     })
     const evm = await createEVM({ common })
-    evm.events.on('step', (e) => {
-      console.log(e.opcode.name)
-    })
+    const modulus = 500n
+    const modBytes = bigIntToBytes(modulus)
+
+    // const elemByteLen = Number(fieldCtx.elemSize)
+    // const xBytes = padBigIntBytes(xInt, elemByteLen * 8)
+    // const yBytes = padBigIntBytes(yInt, elemByteLen * 8)
+    // const outBytes = new Uint8Array(elemByteLen * 8)
 
     console.log('dbg100')
-    console.log(addmodx(0, 1, 1, 1, 2, 1, 1))
+    console.log(modBytes)
     // create bytecode
     const bytecode =
       '0x' +
-      mstore8(0, 8) + // store value 0x08 at index 0 in memory
-      setupx(0, 1, 0, 3) +
-      mstore8(1, 3) +
-      mstore8(2, 6) +
+      mstore8(0, modBytes[1]) +
+      mstore8(1, modBytes[0]) +
+      setupx(0, 0, 2, 3) +
+      mstore8(2, 220) +
+      mstore8(4, 230) +
       storex(1, 1, 1) +
       storex(2, 2, 1) +
       addmodx(0, 1, 1, 1, 2, 1, 1) +