web-validator and web-utils removed frmo remix-lib

Author: Aniket-Engg

libs/remix-lib/package.json

@@ -30,8 +30,7 @@
     "solc": "0.8.26",
     "string-similarity": "^4.0.4",
     "viem": "2.22.3",
-    "web3": "^4.1.1",
-    "web3-validator": "^2.0.0"
+    "web3": "^4.1.1"
   },
   "devDependencies": {
     "@babel/core": "^7.4.5",

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

@@ -2,13 +2,12 @@
 import { EventManager } from '../eventManager'
 import type { Transaction as InternalTransaction } from './txRunner'
 import { Web3 } from 'web3'
-import { BrowserProvider } from 'ethers'
+import { BrowserProvider, getAddress } from 'ethers'
 import { normalizeHexAddress } from '../helpers/uiHelper'
 import { aaSupportedNetworks, aaLocalStorageKey, getPimlicoBundlerURL, aaDeterminiticProxyAddress } from '../helpers/aaConstants'
-import { toBigInt, toHex, toChecksumAddress } from 'web3-utils'
 import { randomBytes } from 'crypto'
 import "viem/window"
-import { custom, http, createWalletClient, createPublicClient, encodePacked, getContractAddress } from "viem"
+import { custom, http, createWalletClient, createPublicClient, encodePacked, getContractAddress, toHex } from "viem"
 import * as chains from "viem/chains"
 import { entryPoint07Address } from "viem/account-abstraction"
 const { createSmartAccountClient } = require("permissionless")
@@ -70,7 +69,7 @@ export class TxRunnerWeb3 {
             if (receipt.logs && receipt.logs.length) {
               receipt.logs.map((log) => {
                 if (log.topics[0] === '0xa1fb700aaee2ae4a2ff6f91ce7eba292f89c2f5488b8ec4c5c5c8150692595c3') {
-                  (receipt as any).contractAddress = toChecksumAddress(normalizeHexAddress(toHex(log.topics[2])))
+                  (receipt as any).contractAddress = getAddress(normalizeHexAddress(toHex(log.topics[2])))
                 }
               })
             }
@@ -165,7 +164,7 @@ export class TxRunnerWeb3 {
           // the sending stack (web3.js / metamask need to have the type defined)
           // this is to avoid the following issue: https://github.com/MetaMask/metamask-extension/issues/11824
           txCopy.type = '0x2'
-          txCopy.maxFeePerGas = Math.ceil(Number((toBigInt(network.lastBlock.baseFeePerGas) + toBigInt(network.lastBlock.baseFeePerGas) / BigInt(3)).toString()))
+          txCopy.maxFeePerGas = Math.ceil(Number((BigInt(network.lastBlock.baseFeePerGas) + BigInt(network.lastBlock.baseFeePerGas) / BigInt(3)).toString()))
         } else {
           txCopy.type = '0x1'
           txCopy.gasPrice = undefined

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

@@ -1,12 +1,11 @@
 'use strict'
 import { BN } from 'bn.js'
 import { bytesToHex } from '@ethereumjs/util'
-import { isBigInt } from 'web3-validator'
 
 export function toInt (h) {
   if (h.indexOf && h.indexOf('0x') === 0) {
     return (new BN(h.replace('0x', ''), 16)).toString(10)
-  } else if ((h.constructor && h.constructor.name === 'BigNumber') || BN.isBN(h) || isBigInt(h)) {
+  } else if ((h.constructor && h.constructor.name === 'BigNumber') || BN.isBN(h) || (typeof h === 'bigint')) {
     return h.toString(10)
   }
   return h
@@ -22,7 +21,7 @@ function convertToString (v) {
         ret.push(convertToString(v[k]))
       }
       return ret
-    } else if (BN.isBN(v) || (v.constructor && v.constructor.name === 'BigNumber') || isBigInt(v)) {
+    } else if (BN.isBN(v) || (v.constructor && v.constructor.name === 'BigNumber') || (typeof v === 'bigint')) {
       return v.toString(10)
     } else if (v._isBigNumber) {
       return toInt(v._hex)

libs/remix-lib/src/helpers/txResultHelper.ts

@@ -2,15 +2,14 @@
 import { bytesToHex } from '@ethereumjs/util'
 import { isHexString } from 'ethjs-util'
 import { BN } from 'bn.js'
-import { isBigInt } from 'web3-validator'
 
 function convertToPrefixedHex (input) {
   if (input === undefined || input === null || isHexString(input)) {
     return input
   }
   if ((input.constructor && input.constructor.name === 'BigNumber')
       || BN.isBN(input)
-      || isBigInt(input)
+      || (typeof input === 'bigint')
       || typeof input === 'number') {
     return '0x' + input.toString(16)
   }

libs/remix-lib/src/init.ts

@@ -1,6 +1,6 @@
 'use strict'
 import { Web3, Web3PluginBase } from 'web3'
-import { toNumber } from 'web3-utils'
+import { toNumber } from 'ethers'
 
 export function extendWeb3 (web3) {
   if (!web3.debug){

libs/remix-lib/src/util.ts

@@ -3,7 +3,6 @@ import { hash } from '@remix-project/remix-lib'
 import { setLengthLeft, toBytes, addHexPrefix } from '@ethereumjs/util'
 import stringSimilarity from 'string-similarity'
 import { BN } from 'bn.js'
-import { isBigInt } from 'web3-validator'
 
 /*
  contains misc util: @TODO should be split
@@ -174,7 +173,7 @@ export function buildCallPath (index, rootCall) {
   */
 // eslint-disable-next-line camelcase
 export function sha3_256 (value) {
-  if ((value.constructor && value.constructor.name === 'BigNumber') || BN.isBN(value) || isBigInt(value)) {
+  if ((value.constructor && value.constructor.name === 'BigNumber') || BN.isBN(value) || (typeof value === 'bigint')) {
     value = value.toString(16)
   }
   if (typeof value === 'number') {