no web3-utils in remix-simulator

Author: Aniket-Engg

libs/remix-simulator/package.json

@@ -40,8 +40,7 @@
     "string-similarity": "^4.0.4",
     "time-stamp": "^2.0.0",
     "tslib": "^2.3.0",
-    "web3": "^4.1.1",
-    "web3-utils": "^4.0.5"
+    "web3": "^4.1.1"
   },
   "devDependencies": {
     "@babel/core": "^7.4.5",

libs/remix-simulator/src/VmProxy.ts

@@ -3,9 +3,7 @@ import { ConsoleLogs, hash, util, helpers } from '@remix-project/remix-lib'
 const { toHexPaddedString, formatMemory, padHexToEven } = util
 const { normalizeHexAddress } = helpers.ui
 import { toChecksumAddress, bytesToHex, toBytes, createAddressFromString, PrefixedHexString } from '@ethereumjs/util'
-import utils, { toBigInt } from 'web3-utils'
-import { isBigInt } from 'web3-validator'
-import { Interface, zeroPadValue } from 'ethers'
+import { Interface, zeroPadValue, keccak256, hexlify, toUtf8String, toUtf8Bytes, formatEther, parseEther, isAddress } from 'ethers'
 import { VMContext } from './vm-context'
 import type { StateManagerInterface } from '@ethereumjs/common'
 import type { InterpreterStep } from '@ethereumjs/evm'
@@ -39,7 +37,6 @@ export class VmProxy {
   toWei
   toBigNumber
   isAddress
-  utils
   txsMapBlock
   blocks
   stateCopy: StateManagerInterface
@@ -77,16 +74,14 @@ export class VmProxy {
     this.storageCache = {}
     this.sha3Preimages = {}
     // util
-    this.sha3 = (...args) => utils.sha3.apply(this, args)
-    this.toHex = (...args) => utils.toHex.apply(this, args)
-    this.toAscii = (...args) => utils.toAscii.apply(this, args)
-    this.fromAscii = (...args) => utils.fromAscii.apply(this, args)
-    this.fromDecimal = (...args) => utils.fromDecimal.apply(this, args)
-    this.fromWei = (...args) => utils.fromWei.apply(this, args)
-    this.toWei = (...args) => utils.toWei.apply(this, args)
-    this.toBigNumber = (...args) => toBigInt.apply(this, args)
-    this.isAddress = (...args) => utils.isAddress.apply(this, args)
-    this.utils = utils
+    this.sha3 = (...args) => keccak256.apply(this, args)
+    this.toHex = (...args) => hexlify.apply(this, args)
+    this.toAscii = (...args) => toUtf8String.apply(this, args)
+    this.fromAscii = (...args) => toUtf8Bytes.apply(this, args)
+    this.fromWei = (...args) => formatEther.apply(this, args)
+    this.toWei = (...args) => parseEther.apply(this, args)
+    this.toBigNumber = (...args) => BigInt.apply(this, args)
+    this.isAddress = (...args) => isAddress.apply(this, args)
     this.txsMapBlock = {}
     this.blocks = {}
     this.lastMemoryUpdate = []
@@ -285,7 +280,7 @@ export class VmProxy {
         const consoleArgs = iface.decodeFunctionData(functionDesc, payload)
         const consoleArgsMapped = consoleArgs.map((value) => {
           // Copied from: https://github.com/web3/web3.js/blob/e68194bdc590d811d4bf66dde12f99659861a110/packages/web3-utils/src/utils.js#L48C10-L48C10
-          if (value && ((value.constructor && value.constructor.name === 'BigNumber') || isBigInt(value))) {
+          if (value && ((value.constructor && value.constructor.name === 'BigNumber') || typeof value === 'bigint')) {
             return value.toString()
           }
           return value
@@ -432,9 +427,9 @@ export class VmProxy {
   getSha3Input (stack, memory) {
     const memoryStart = toHexPaddedString(stack[stack.length - 1])
     const memoryLength = toHexPaddedString(stack[stack.length - 2])
-    const memStartDec = toBigInt(memoryStart).toString(10)
+    const memStartDec = BigInt(memoryStart).toString(10)
     const memoryStartInt = parseInt(memStartDec) * 2
-    const memLengthDec = toBigInt(memoryLength).toString(10)
+    const memLengthDec = BigInt(memoryLength).toString(10)
     const memoryLengthInt = parseInt(memLengthDec.toString()) * 2
 
     let i = Math.floor(memoryStartInt / 32)

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

@@ -1,7 +1,7 @@
 import { signTypedData, SignTypedDataVersion, TypedMessage, MessageTypes } from '@metamask/eth-sig-util'
 import { privateToAddress, toChecksumAddress, isValidPrivate, createAddressFromString, toBytes, bytesToHex, Account, intToHex } from '@ethereumjs/util'
 import type { PrefixedHexString } from '@ethereumjs/util'
-import { privateKeyToAccount } from 'web3-eth-accounts'
+import { ethers } from 'ethers'
 import * as crypto from 'crypto'
 
 type AccountType = {
@@ -121,11 +121,11 @@ export class Web3Accounts {
     if (!privateKey) {
       return cb(new Error('unknown account'))
     }
-    const account = privateKeyToAccount(privateKey as string)
+    const account = new ethers.Wallet(privateKey as string)
 
-    const data = account.sign(message)
-
-    cb(null, data.signature)
+    account.signMessage(message).then((signature) => {
+      cb(null, signature)
+    })
   }
 
   eth_chainId (_payload, cb) {