fix e2e

yann300 · yann300 · commit e1374117ceb2 · 2025-04-30T20:03:36.000+02:00
diff --git a/apps/remix-ide-e2e/src/tests/providers.test.ts b/apps/remix-ide-e2e/src/tests/providers.test.ts
@@ -22,7 +22,7 @@ module.exports = {
       .modalFooterOKClick('ganache-provider')
       .waitForElementVisible({
         locateStrategy: 'xpath',
-        selector: "//span[@class='text-danger' and contains(., 'missing response')]"
+        selector: "//span[@class='text-danger' and contains(., 'Failed to fetch')]"
       })
       .waitForElementPresent({ selector: `[data-id="selected-provider-ganache-provider"]`, timeout: 5000 })
       .pause(1000)
diff --git a/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts b/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts
@@ -311,7 +311,7 @@ module.exports = {
       })
   },
 
-  'Should stay connected in the mainnet VM fork and: check the block number is advancing and is not low #group5': function (browser: NightwatchBrowser) {
+  'Should stay connected to mainnet VM fork and: check the block number is advancing and is not low #group5': function (browser: NightwatchBrowser) {
     /*
         Should stay connected in the mainnet VM fork and: 
     - check the block number has been set to the current mainnet block number.
@@ -325,6 +325,7 @@ module.exports = {
     let currentBlockNumber: number
     browser
       .perform(async (done) => {
+        console.log('getting the provider up..')
         const provider = new JsonRpcProvider('https://go.getblock.io/56f8bc5187aa4ac696348f67545acf38')
         currentBlockNumber = (await provider.getBlockNumber()) as number
         console.log('getBlockNumber', currentBlockNumber)
diff --git a/apps/remix-ide-e2e/src/tests/vm_state.test.ts b/apps/remix-ide-e2e/src/tests/vm_state.test.ts
@@ -19,7 +19,8 @@ const tests = {
       .waitForElementVisible('*[data-id="fork-state-icon"]')
       .waitForElementVisible('*[data-id="delete-state-icon"]')
   },
-  'Should show toaster while trying fork and delete VM state without state #group1': function (browser: NightwatchBrowser) {
+  'Should show toaster while trying fork and delete VM state without state #group1': '' + function (browser: NightwatchBrowser) {
+    // removing this test as now the state contains the created addresses and is not empty...
     browser
       .waitForElementVisible('*[data-id="fork-state-icon"]')
       .click('*[data-id="fork-state-icon"]')
diff --git a/apps/remix-ide/src/app/providers/abstract-provider.tsx b/apps/remix-ide/src/app/providers/abstract-provider.tsx
@@ -109,6 +109,7 @@ export abstract class AbstractProvider extends Plugin implements IProvider {
 
   private async switchAway(showError: boolean, msg: string) {
     if (!this.provider) return
+    this.provider.destroy()
     if (showError) {
       this.call('terminal', 'log', { type: 'error', value: 'Error while querying the provider: ' + msg })
     }
@@ -121,7 +122,7 @@ export abstract class AbstractProvider extends Plugin implements IProvider {
         const result = await this.provider.send(data.method, data.params)
         resolve({ jsonrpc: '2.0', result, id: data.id })
       } catch (error) {
-        if (error && error.message && error.message.includes('SERVER_ERROR')) {
+        if (error && error.message && (error.message.includes('SERVER_ERROR') || error.message.includes('Failed to fetch'))) {
           try {
             // replace escaped quotes with normal quotes
             const errorString = String(error.message).replace(/\\"/g, '"');
@@ -131,10 +132,10 @@ export abstract class AbstractProvider extends Plugin implements IProvider {
             if (messages && messages.length > 0) {
               this.switchAway(true, messages[0])
             } else {
-              this.switchAway(true, error.message ? error.message : error.error ? error.error : error)
+              this.switchAway(true, error.message ? `${error.message} ${data.method} ${data.params}` : error.error ? error.error : error)
             }
           } catch (error) {
-            this.switchAway(true, error.message ? error.message : error.error ? error.error : error)
+            this.switchAway(true, error.message ? `${error.message} ${data.method} ${data.params}` : error.error ? error.error : error)
           }
         }
         reject({ jsonrpc: '2.0', error: { message: error.message, code: -32603 }, id: data.id })
diff --git a/apps/remix-ide/src/blockchain/blockchain.tsx b/apps/remix-ide/src/blockchain/blockchain.tsx
@@ -1026,8 +1026,8 @@ export class Blockchain extends Plugin {
       if (isBasicVMState || isForkedVMState || isForkedRpcState) {
         if (!tx.useCall && this.config.get('settings/save-evm-state')) {
           try {
-            let state = await this.executionContext.getStateDetails()
             if (provider.config.statePath) {
+              let state = await this.executionContext.getStateDetails()
               const stateFileExists = await this.call('fileManager', 'exists', provider.config.statePath)
               if (stateFileExists) {
                 let stateDetails = await this.call('fileManager', 'readFile', provider.config.statePath)
@@ -1037,6 +1037,7 @@ export class Blockchain extends Plugin {
               }
               this.call('fileManager', 'writeFile', provider.config.statePath, state)
             } else if (isBasicVMState && !isForkedRpcState && !isForkedRpcState) {
+              let state = await this.executionContext.getStateDetails()
               // in that case, we store the state only if it is a basic VM.
               const provider = this.executionContext.getProvider()
               this.call('fileManager', 'writeFile', `.states/${provider}/state.json`, state)
diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json
@@ -27,7 +27,7 @@
     "@ethereum-waffle/chai": "^3.4.4",
     "@remix-project/remix-simulator": "^0.2.68",
     "chai": "^4.3.7",
-    "ethers": "^5.7.2",
+    "ethers": "npm:ethers@beta-eip-7702",
     "web3": "^4.1.1"
   },
   "types": "./src/index.d.ts",
diff --git a/libs/ghaction-helper/src/methods.ts b/libs/ghaction-helper/src/methods.ts
@@ -1,8 +1,8 @@
 // @ts-ignore
-import { BrowserProvider } from "ethers"
+import { BrowserProvider, Contract, Signer } from "ethers"
+import { InterfaceAbi } from "ethers"
 import { Provider } from '@remix-project/remix-simulator'
 import { getArtifactsByContractName } from './artifacts-helper'
-import { SignerWithAddress } from './signer'
 import { Web3 } from "web3"
 
 const providerConfig = {
@@ -21,7 +21,7 @@ global.web3 = new Web3(global.web3Provider)
 global.web3.eth.setConfig(config)
 
 const isFactoryOptions = (signerOrOptions: any) => {
-  if (!signerOrOptions || signerOrOptions === undefined || signerOrOptions instanceof ethers.Signer) return false
+  if (!signerOrOptions || signerOrOptions === undefined || typeof(signerOrOptions.connect) === 'function') return false
   return true
 }
 
@@ -172,7 +172,7 @@ const resultToArtifact = (result: any) => {
   }
 }
 
-const getContractFactory = async (contractNameOrABI: ethers.ContractInterface, bytecode?: string, signerOrOptions = null) => {
+const getContractFactory = async (contractNameOrABI: InterfaceAbi, bytecode?: string, signerOrOptions = null) => {
   if (bytecode && contractNameOrABI) {
     //@ts-ignore
     return new ethers.ContractFactory(contractNameOrABI, bytecode, signerOrOptions || web3Provider.getSigner())
@@ -181,7 +181,7 @@ const getContractFactory = async (contractNameOrABI: ethers.ContractInterface, b
 
     if (contract) {
       //@ts-ignore
-      return new ethers.ContractFactory(contract.abi, contract.evm.bytecode.object, signerOrOptions || web3Provider.getSigner())
+      return new ContractFactory(contract.abi, contract.evm.bytecode.object, signerOrOptions || web3Provider.getSigner())
     } else {
       throw new Error('Contract artifacts not found')
     }
@@ -190,20 +190,20 @@ const getContractFactory = async (contractNameOrABI: ethers.ContractInterface, b
   }
 }
 
-const getContractAt = async (contractNameOrABI: ethers.ContractInterface, address: string, signer = null) => {
+const getContractAt = async (contractNameOrABI: InterfaceAbi, address: string, signer = null) => {
   //@ts-ignore
   const provider = web3Provider
 
   if (typeof contractNameOrABI === 'string') {
     const result = await getArtifactsByContractName(contractNameOrABI)
 
     if (result) {
-      return new ethers.Contract(address, result.abi, signer || provider.getSigner())
+      return new Contract(address, result.abi, signer || provider.getSigner())
     } else {
       throw new Error('Contract artifacts not found')
     }
   } else {
-    return new ethers.Contract(address, contractNameOrABI, signer || provider.getSigner())
+    return new Contract(address, contractNameOrABI, signer || provider.getSigner())
   }
 }
 
@@ -212,7 +212,7 @@ const getSigner = async (address: string) => {
   const provider = web3Provider
   const signer = provider.getSigner(address)
 
-  return SignerWithAddress.create(signer)
+  return signer
 }
 
 const getSigners = async () => {
diff --git a/libs/ghaction-helper/src/signer.ts b/libs/ghaction-helper/src/signer.ts
diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json
@@ -28,7 +28,7 @@
     "@remix-project/remix-astwalker": "^0.0.98",
     "@remix-project/remix-lib": "^0.5.75",
     "async": "^2.6.2",
-    "ethers": "^5.4.2",
+    "ethers": "npm:ethers@beta-eip-7702",
     "ethjs-util": "^0.1.6",
     "string-similarity": "^4.0.4",
     "web3": "^4.1.1"
diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json
@@ -40,7 +40,7 @@
     "@remix-project/remix-lib": "^0.5.75",
     "@types/tape": "^4.2.33",
     "async": "^2.6.2",
-    "ethers": "^5.4.2",
+    "ethers": "npm:ethers@beta-eip-7702",
     "ethjs-util": "^0.1.6",
     "nyc": "^13.3.0",
     "string-similarity": "^4.0.4",
diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json
@@ -35,7 +35,7 @@
     "color-support": "^1.1.3",
     "commander": "^9.4.1",
     "deep-equal": "^1.0.1",
-    "ethers": "^5.4.2",
+    "ethers": "npm:ethers@beta-eip-7702",
     "ethjs-util": "^0.1.6",
     "express-ws": "^4.0.0",
     "merge": "^2.1.1",
diff --git a/libs/remix-debug/src/code/codeUtils.ts b/libs/remix-debug/src/code/codeUtils.ts
@@ -1,5 +1,5 @@
 'use strict'
-import { bytesToHex } from '@ethereumjs/util'
+import { util } from '@remix-project/remix-lib'
 import { Common, Mainnet } from '@ethereumjs/common'
 import { getOpcodesForHF, paramsEVM } from '@ethereumjs/evm'
 import getOpcodes from './opcodes'
@@ -27,7 +27,7 @@ export function nameOpCodes (raw, hardfork) {
       pushData = raw.slice(pc + 1, pc + jumpNum + 1)
       i += jumpNum
     }  
-    const hexCode = pushData ? bytesToHex((pushData as any)) : ''
+    const hexCode = pushData ? util.bytesToHex((pushData as any)) : ''
     // @ts-ignore
     const data = hexCode !== '' ? ' ' + hexCode : ''
 
@@ -48,7 +48,7 @@ type Opcode = {
  * information about the opcode.
  */
 export function parseCode (raw) {
-  const common = new Common({ chain: Mainnet, hardfork: 'cancun' })
+  const common = new Common({ chain: Mainnet, hardfork: 'cancun', params: paramsEVM })
   const opcodes = getOpcodesForHF(common).opcodes
 
   const code = []
diff --git a/libs/remix-debug/src/code/disassembler.ts b/libs/remix-debug/src/code/disassembler.ts
@@ -2,7 +2,6 @@
 
 import { parseCode } from './codeUtils'
 import { util } from '@remix-project/remix-lib'
-import { bytesToHex } from '@ethereumjs/util'
 
 function createExpressions (instructions) {
   const expressions = []
@@ -37,7 +36,7 @@ function createExpressions (instructions) {
 
 function toString (expr) {
   if (expr.name.slice(0, 4) === 'PUSH') {
-    return bytesToHex(expr.pushData)
+    return util.bytesToHex(expr.pushData)
   } else if (expr.name === 'JUMPDEST') {
     return expr.label + ':'
   } else if (expr.args) {
diff --git a/libs/remix-debug/src/trace/traceAnalyser.ts b/libs/remix-debug/src/trace/traceAnalyser.ts
@@ -1,6 +1,6 @@
 'use strict'
 import { util } from '@remix-project/remix-lib'
-import { bytesToHex } from '@ethereumjs/util'
+// import { bytesToHex } from '@ethereumjs/util'
 const { toHexPaddedString } = util
 import * as traceHelper from './traceHelper'
 
@@ -86,7 +86,7 @@ export class TraceAnalyser {
         offset = 2 * parseInt(toHexPaddedString(stack[stack.length - 4]), 16)
         size = 2 * parseInt(toHexPaddedString(stack[stack.length - 5]), 16)
       }
-      calldata = bytesToHex(memory).replace('0x', '').substring(offset, offset + size)
+      calldata = util.bytesToHex(memory).replace('0x', '').substring(offset, offset + size)
       this.traceCache.pushCallDataChanges(index + 1, calldata)
     }
   }
diff --git a/libs/remix-debug/test/decoder/stateTests/revert-state-sub-call.ts b/libs/remix-debug/test/decoder/stateTests/revert-state-sub-call.ts
@@ -10,7 +10,6 @@ import { InternalCallTree } from '../../../src/solidity-decoder/internalCallTree
 import * as vmCall from '../../vmCall'
 import { StorageResolver } from '../../../src/storage/storageResolver'
 import { StorageViewer } from '../../../src/storage/storageViewer'
-import { Address, bytesToHex } from '@ethereumjs/util'
 
 module.exports = async function testMappingStorage (st, cb) {
   const revertStateContract = require('../contracts/revert-state-sub-call.ts')
diff --git a/libs/remix-debug/test/vmCall.ts b/libs/remix-debug/test/vmCall.ts
@@ -1,6 +1,6 @@
 'use strict'
 import { extendWeb3 } from '../src/init'
-import { Address } from '@ethereumjs/util'
+import { createAddressFromPrivateKey } from '@ethereumjs/util'
 import { Web3 } from 'web3';
 const { Provider } = require('@remix-project/remix-simulator')
 
@@ -17,7 +17,7 @@ async function sendTx (web3, from, to, value, data, cb) {
   try {
     cb = cb || (() => {})
     const receipt = await web3.eth.sendTransaction({
-      from: Address.fromPrivateKey(from.privateKey).toString(),
+      from: createAddressFromPrivateKey(from.privateKey).toString(),
       to,
       value,
       data,
diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
@@ -20,7 +20,7 @@
     "@ethereumjs/util": "^10.0.0-rc.1",
     "async": "^2.1.2",
     "create-hash": "^1.2.0",
-    "ethers": "^5.7.2",
+    "ethers": "npm:ethers@beta-eip-7702",
     "ethjs-util": "^0.1.6",
     "events": "^3.0.0",
     "from-exponential": "1.1.1",
diff --git a/libs/remix-lib/src/execution/txExecution.ts b/libs/remix-lib/src/execution/txExecution.ts
@@ -117,7 +117,7 @@ export function checkError (execResult, compiledContracts) {
                 // "contract" represents the compilation result containing the NATSPEC documentation
                 let fnFragments = fn.fragments.filter(f => f.type === "function") as Array<FunctionFragment> 
                 if (contract && fnFragments && fnFragments.length) {
-                  const functionSignature = fnFragments[0].selector
+                  const functionSignature = fnFragments[0].format()
                   // we check in the 'devdoc' if there's a developer documentation for this error
                   try {
                     devdoc = (contract.devdoc.errors && contract.devdoc.errors[functionSignature][0]) || {}
diff --git a/libs/remix-lib/src/util.ts b/libs/remix-lib/src/util.ts
@@ -1,6 +1,6 @@
 'use strict'
 import { hash } from '@remix-project/remix-lib'
-import { bytesToHex, setLengthLeft, toBytes, addHexPrefix } from '@ethereumjs/util'
+import { setLengthLeft, toBytes, addHexPrefix } from '@ethereumjs/util'
 import stringSimilarity from 'string-similarity'
 import { BN } from 'bn.js'
 import { isBigInt } from 'web3-validator'
@@ -56,6 +56,27 @@ export function toHexPaddedString(v: bigint | string): string {
     return '0x' + '0'.padStart(64, '0')
 }
 
+const hexByByte = Array.from({ length: 256 }, (v, i) => i.toString(16).padStart(2, '0'))
+export function bytesToHex (bytes: Uint8Array): any {
+  let hex = `0x`
+  if (bytes === undefined || bytes.length === 0) return hex
+  for (const byte of bytes) {
+    hex = `${hex}${hexByByte[byte]}`
+  }
+  return hex
+}
+
+export function padHexToEven(hex: string): string {
+  hex = hex.replace('0x', '')
+  // Check if the length of the hex string is odd
+  if (hex.length % 2 !== 0) {
+      // Add a leading zero
+      hex = '0' + hex;
+  }
+  return '0x' + hex;
+}
+
+
 /*
   ints: ints: IntArray
 */
diff --git a/libs/remix-lib/test/txFormat.ts b/libs/remix-lib/test/txFormat.ts
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
diff --git a/libs/remix-simulator/src/VmProxy.ts b/libs/remix-simulator/src/VmProxy.ts
diff --git a/libs/remix-simulator/src/vm-context.ts b/libs/remix-simulator/src/vm-context.ts
diff --git a/libs/remix-simulator/test/transactions.ts b/libs/remix-simulator/test/transactions.ts
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json
