remix-sim web3-utils removal

Author: Aniket-Engg

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

@@ -1,8 +1,7 @@
 import { signTypedData, SignTypedDataVersion, TypedMessage, MessageTypes } from '@metamask/eth-sig-util'
-import { privateToAddress, toChecksumAddress, isValidPrivate, createAddressFromString, toBytes, bytesToHex, Account } from '@ethereumjs/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 { toBigInt, toHex } from 'web3-utils'
 import * as crypto from 'crypto'
 
 type AccountType = {
@@ -56,10 +55,10 @@ export class Web3Accounts {
       const stateManager = this.vmContext.vm().stateManager
       const account = await stateManager.getAccount(createAddressFromString(addressStr))
       if (!account) {
-        const account = new Account(BigInt(0), toBigInt(balance || '0xf00000000000000001'))
+        const account = new Account(BigInt(0), BigInt(balance || '0xf00000000000000001'))
         await stateManager.putAccount(createAddressFromString(addressStr), account)
       } else {
-        account.balance = toBigInt(balance || '0xf00000000000000001')
+        account.balance = BigInt(balance || '0xf00000000000000001')
         await stateManager.putAccount(createAddressFromString(addressStr), account)
       }
     } catch (e) {
@@ -106,9 +105,9 @@ export class Web3Accounts {
   eth_getBalance (payload, cb) {
     const address = payload.params[0]
     this.vmContext.vm().stateManager.getAccount(createAddressFromString(address)).then((account) => {
-      if (!account) return cb(null, toBigInt(0).toString(10))
-      if (!account.balance) return cb(null, toBigInt(0).toString(10))
-      cb(null, toBigInt(account.balance).toString(10))
+      if (!account) return cb(null, BigInt(0).toString(10))
+      if (!account.balance) return cb(null, BigInt(0).toString(10))
+      cb(null, BigInt(account.balance).toString(10))
     }).catch((error) => {
       cb(error)
     })
@@ -131,7 +130,7 @@ export class Web3Accounts {
 
   eth_chainId (_payload, cb) {
     if (!this.options.chainId) return cb(null, '0x539') // 0x539 is hex of 1337
-    const id = (typeof this.options.chainId === 'number') ? toHex(this.options.chainId) : this.options.chainId
+    const id = (typeof this.options.chainId === 'number') ? intToHex(this.options.chainId) : this.options.chainId
     return cb(null, id)
   }
 

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

@@ -1,4 +1,4 @@
-import { toHex } from 'web3-utils'
+import { hexlify } from 'ethers'
 import { VMContext } from '../vm-context'
 import { bigIntToHex, bytesToHex } from '@ethereumjs/util'
 
@@ -116,7 +116,7 @@ export class Blocks {
             blockHash: bytesToHex(block.hash()),
             blockNumber: bigIntToHex(block.header.number),
             from: receipt.from,
-            gas: toHex(receipt.gas),
+            gas: hexlify(receipt.gas),
             chainId: '0xd05',
             gasPrice: '0x4a817c800', // 20000000000
             hash: receipt.transactionHash,

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

@@ -1,4 +1,4 @@
-import { sha3 } from 'web3-utils'
+import { keccak256 } from 'ethers'
 const version = require('../../package.json').version
 
 export function methods () {
@@ -39,7 +39,7 @@ export function eth_hashrate (payload, cb) {
 
 export function web3_sha3 (payload, cb) {
   const str: string = payload.params[0]
-  cb(null, sha3(str))
+  cb(null, keccak256(str))
 }
 
 export function eth_getCompilers (payload, cb) {

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

@@ -1,8 +1,7 @@
-import { toHex, toNumber, toBigInt } from 'web3-utils'
 import { toChecksumAddress, bigIntToHex, bytesToHex, createAddressFromString } from '@ethereumjs/util'
 import { processTx } from './txProcess'
 import { execution } from '@remix-project/remix-lib'
-import { AbiCoder } from 'ethers'
+import { AbiCoder, toNumber } from 'ethers'
 import { VMexecutionResult } from '@remix-project/remix-lib'
 import { VMContext } from '../vm-context'
 import { Log, EVMError } from '@ethereumjs/evm'
@@ -297,7 +296,7 @@ export class Transactions {
     const address = payload.params[0]
 
     this.vmContext.vm().stateManager.getAccount(createAddressFromString(address)).then((account) => {
-      const nonce = toBigInt(account.nonce).toString(10)
+      const nonce = BigInt(account.nonce).toString(10)
       cb(null, nonce)
     }).catch((error) => {
       cb(error)
@@ -319,7 +318,7 @@ export class Transactions {
         blockHash: bytesToHex(txBlock.hash()),
         blockNumber: bigIntToHex(txBlock.header.number),
         from: receipt.from,
-        gas: toHex(BigInt(receipt.gas)),
+        gas: bigIntToHex(BigInt(receipt.gas)),
         chainId: '0xd05',
         // 'gasPrice': '2000000000000', // 0x123
         gasPrice: '0x4a817c800', // 20000000000
@@ -367,7 +366,7 @@ export class Transactions {
         blockHash: bytesToHex(txBlock.hash()),
         blockNumber: bigIntToHex(txBlock.header.number),
         from: receipt.from,
-        gas: toHex(BigInt(receipt.gas)),
+        gas: bigIntToHex(BigInt(receipt.gas)),
         chainId: '0xd05',
         // 'gasPrice': '2000000000000', // 0x123
         gasPrice: '0x4a817c800', // 20000000000
@@ -412,7 +411,7 @@ export class Transactions {
         blockHash: bytesToHex(txBlock.hash()),
         blockNumber: bigIntToHex(txBlock.header.number),
         from: receipt.from,
-        gas: toHex(BigInt(receipt.gas)),
+        gas: bigIntToHex(BigInt(receipt.gas)),
         // 'gasPrice': '2000000000000', // 0x123
         chainId: '0xd05',
         gasPrice: '0x4a817c800', // 20000000000