fix using ethereumjs 10 api

Author: yann300

libs/remix-debug/src/code/codeUtils.ts

@@ -1,7 +1,6 @@
 'use strict'
 import { bytesToHex } from '@ethereumjs/util'
 import { Common, Mainnet } from '@ethereumjs/common'
-// TODO fix the import when getOpcodesForHF is exported
 import { getOpcodesForHF, paramsEVM } from '@ethereumjs/evm'
 import getOpcodes from './opcodes'
 
@@ -27,9 +26,8 @@ export function nameOpCodes (raw, hardfork) {
       const jumpNum = raw[pc] - 0x5f
       pushData = raw.slice(pc + 1, pc + jumpNum + 1)
       i += jumpNum
-    }
-
-    const hexCode = bytesToHex((pushData as any))
+    }  
+    const hexCode = pushData ? bytesToHex((pushData as any)) : ''
     // @ts-ignore
     const data = hexCode !== '' ? ' ' + hexCode : ''
 

libs/remix-lib/src/execution/txRunnerVM.ts

@@ -5,7 +5,7 @@ import { ConsensusType } from '@ethereumjs/common'
 import { LegacyTx, createLegacyTx, createFeeMarket1559Tx, createEOACode7702Tx, createLegacyTxFromRLP, createFeeMarket1559TxFromRLP } from '@ethereumjs/tx'
 import { Block, createBlock, createBlockFromRLP } from '@ethereumjs/block'
 import { bytesToHex, hexToBytes, createAddressFromString } from '@ethereumjs/util'
-import type { AddressLike, BigIntLike } from '@ethereumjs/util'
+import type { AddressLike, BigIntLike, PrefixedHexString } from '@ethereumjs/util'
 import { EventManager } from '../eventManager'
 import { LogsManager } from './logsManager'
 import type { Transaction as InternalTransaction } from './txRunner'
@@ -114,9 +114,9 @@ export class TxRunnerVM {
       let tx
       if (signed) {
         if (!EIP1559) {
-          tx = createLegacyTxFromRLP(hexToBytes(data), { common: this.commonContext })
+          tx = createLegacyTxFromRLP(hexToBytes(data as PrefixedHexString), { common: this.commonContext })
         } else {
-          tx = createFeeMarket1559TxFromRLP(hexToBytes(data), { common: this.commonContext })
+          tx = createFeeMarket1559TxFromRLP(hexToBytes(data as PrefixedHexString), { common: this.commonContext })
         }
       }
       else {
@@ -137,7 +137,7 @@ export class TxRunnerVM {
             gasLimit: gasLimit,
             to: (to as AddressLike),
             value: (value as BigIntLike),
-            data: hexToBytes(data)
+            data: hexToBytes(data as PrefixedHexString)
           }, { common: this.commonContext }).sign(account.privateKey)
         } else {
           tx = createFeeMarket1559Tx({
@@ -147,7 +147,7 @@ export class TxRunnerVM {
             gasLimit: gasLimit,
             to: (to as AddressLike),
             value: (value as BigIntLike),
-            data: hexToBytes(data)
+            data: hexToBytes(data as PrefixedHexString)
           }).sign(account.privateKey)
         }
       }

libs/remix-simulator/src/VmProxy.ts

@@ -9,7 +9,7 @@ import { isBigInt } from 'web3-validator'
 import { Interface, zeroPadValue } from 'ethers'
 import { VMContext } from './vm-context'
 import type { StateManagerInterface } from '@ethereumjs/common'
-import type { EVMResult, InterpreterStep, Message } from '@ethereumjs/evm'
+import type { InterpreterStep } from '@ethereumjs/evm'
 import type { AfterTxEvent, VM } from '@ethereumjs/vm'
 import type { TypedTransaction } from '@ethereumjs/tx'
 

libs/remix-simulator/src/methods/transactions.ts

@@ -5,12 +5,12 @@ import { execution } from '@remix-project/remix-lib'
 import { AbiCoder } from 'ethers'
 import { VMexecutionResult } from '@remix-project/remix-lib'
 import { VMContext } from '../vm-context'
-import { Log, EvmError } from '@ethereumjs/evm'
+import { Log, EVMError } from '@ethereumjs/evm'
 const TxRunnerVM = execution.TxRunnerVM
 const TxRunner = execution.TxRunner
 
 export type VMExecResult = {
-  exceptionError: EvmError
+  exceptionError: EVMError
   executionGasUsed: bigint
   gas: bigint
   gasRefund: bigint

libs/remix-simulator/src/vm-context.ts

@@ -12,7 +12,7 @@ import { Common, ConsensusType, CommonOpts, Mainnet } from '@ethereumjs/common'
 import { MerklePatriciaTrie, createMPT, verifyMerkleProof } from '@ethereumjs/mpt'
 import { MerkleStateManager, MerkleStateManagerOpts } from '@ethereumjs/statemanager'
 import { StateManagerInterface, StorageDump } from '@ethereumjs/common'
-import { createEVM, EVM } from '@ethereumjs/evm'
+import { createEVM } from '@ethereumjs/evm'
 import { Blockchain, DBSaveLookups, createBlockchain } from '@ethereumjs/blockchain'
 import { Block, BlockHeader, createBlock, createBlockFromRLP } from '@ethereumjs/block'
 import { TypedTransaction } from '@ethereumjs/tx'