fix issues with eip 7702 impl

yann300 · yann300 · commit 5a44407e34e0 · 2025-05-02T19:16:50.000+02:00
diff --git a/apps/remix-ide-e2e/package.json b/apps/remix-ide-e2e/package.json
@@ -6,7 +6,7 @@
     "npm": "^6.14.15"
   },
   "dependencies": {
-    "ethers": "^6.13.7",
+    "ethers": "beta-eip-7702",
     "@openzeppelin/contracts": "^5.0.2",
     "@openzeppelin/contracts-upgradeable": "^5.0.2",
     "@openzeppelin/upgrades-core": "^1.30.0",
diff --git a/apps/remix-ide-e2e/src/tests/eip7702.test.ts b/apps/remix-ide-e2e/src/tests/eip7702.test.ts
@@ -0,0 +1,39 @@
+'use strict'
+
+import { NightwatchBrowser } from 'nightwatch'
+import init from '../helpers/init'
+
+module.exports = {
+  '@disabled': true,
+  before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    init(browser, done)
+  },
+  'Should activate delegation and make a transaction to the authority address #group1': function (browser: NightwatchBrowser) {
+    let addressDelegate
+    browser
+      .clickLaunchIcon('udapp')
+      .switchEnvironment('vm-pectra')
+      .addFile('delegate.sol', { content: delegate })
+      .clickLaunchIcon('solidity')
+      .setSolidityCompilerVersion('soljson-v0.8.24+commit.e11b9ed9.js')
+      .clickLaunchIcon('solidity')
+      .verifyContracts(['TestDelegate'])
+      .clickLaunchIcon('udapp')
+      .selectContract('Simple7702Account')
+      .createContract('')
+      .perform((done) => {
+        browser.getAddressAtPosition(0, (address) => {
+          addressDelegate = delegate
+        })
+      })
+      .click('*[data-id="create-delegation-authorization"]')
+      .setValue('*[data-id="create-delegation-authorization-input"]', addressDelegate)
+      .modalFooterOKClick('udapp')
+      .waitForElementContainsText('*[data-id="terminalJournal"]', 'This account will be running the code located at')
+      .clickInstance(1)
+      .clickFunction('entryPoint - call (not payable)')
+      .verifyCallReturnValue('0x5B38Da6a701c568545dCfcB03FcB875f56beddC4', ['0:address: 0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108'])
+  } 
+}
+
+const delegate = `import "https://github.com/eth-infinitism/account-abstraction/blob/v0.8.0/contracts/accounts/Simple7702Account.sol";`
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": "^6.13.7",
+    "ethers": "beta-eip-7702",
     "web3": "^4.1.1"
   },
   "types": "./src/index.d.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": "^6.13.7",
+    "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": "^6.13.7",
+    "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": "^6.13.7",
+    "ethers": "beta-eip-7702",
     "ethjs-util": "^0.1.6",
     "express-ws": "^4.0.0",
     "merge": "^2.1.1",
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": "^6.13.7",
+    "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/txRunner.ts b/libs/remix-lib/src/execution/txRunner.ts
@@ -1,6 +1,6 @@
 'use strict'
 import { EventManager } from '../eventManager'
-import { AuthorizationList } from '@ethereumjs/common'
+import { EOACode7702AuthorizationList } from '@ethereumjs/util'
 /*
  * A type that represents a `0x`-prefixed hex string.
  */
@@ -17,7 +17,7 @@ export type Transaction = {
   useCall?: boolean,
   timestamp?: number,
   signed?: boolean,
-  authorizationList?: AuthorizationList
+  authorizationList?: EOACode7702AuthorizationList
   type?: '0x1' | '0x2' | '0x4'
 }
 
diff --git a/libs/remix-lib/src/execution/txRunnerVM.ts b/libs/remix-lib/src/execution/txRunnerVM.ts
@@ -136,7 +136,7 @@ export class TxRunnerVM {
             data: hexToBytes(data as PrefixedHexString),
             authorizationList: authorizationList
           }, { common: this.commonContext }).sign(account.privateKey)
-        } if (!EIP1559) {
+        } else if (!EIP1559) {
           tx = createLegacyTx({
             nonce: useCall ? this.nextNonceForCall : res.nonce,
             gasPrice: '0x1',
diff --git a/libs/remix-lib/src/helpers/eip-7702.ts b/libs/remix-lib/src/helpers/eip-7702.ts
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
@@ -31,7 +31,7 @@
     "color-support": "^1.1.3",
     "commander": "^9.4.1",
     "cors": "^2.8.5",
-    "ethers": "^6.13.7",
+    "ethers": "beta-eip-7702",
     "ethjs-util": "^0.1.6",
     "express": "^4.16.3",
     "express-ws": "^4.0.0",
diff --git a/libs/remix-simulator/src/methods/accounts.ts b/libs/remix-simulator/src/methods/accounts.ts
@@ -85,14 +85,20 @@ export class Web3Accounts {
       eth_sign: this.eth_sign.bind(this),
       eth_chainId: this.eth_chainId.bind(this),
       eth_signTypedData: this.eth_signTypedData_v4.bind(this), // default call is using V4
-      eth_signTypedData_v4: this.eth_signTypedData_v4.bind(this)
+      eth_signTypedData_v4: this.eth_signTypedData_v4.bind(this),
+      eth_getPKey: this.eth_getPKey.bind(this),
     }
   }
 
   eth_requestAccounts (_payload, cb) {
     return cb(null, Object.keys(this.accounts))
   }
 
+  eth_getPKey (payload, cb) {
+    const address = toChecksumAddress(payload.params[0])
+    cb(null, this.accounts[address].privateKey)
+  }
+
   eth_accounts (_payload, cb) {
     return cb(null, Object.keys(this.accounts))
   }
diff --git a/libs/remix-simulator/src/methods/blocks.ts b/libs/remix-simulator/src/methods/blocks.ts
@@ -29,6 +29,7 @@ export class Blocks {
 
   eth_getBlockByNumber (payload, cb) {
     let blockIndex = payload.params[0]
+    const includeTransactions = payload.params[1]
     if (blockIndex === 'latest') {
       blockIndex = this.vmContext.latestBlockNumber
     }
@@ -42,30 +43,34 @@ export class Blocks {
       return cb(new Error('block not found'))
     }
 
-    const transactions = block.transactions.map((t) => {
-      const hash = bytesToHex(t.hash())
-      const tx = this.vmContext.txByHash[hash]
-      const receipt = this.vmContext.currentVm.web3vm.txsReceipt[hash]
-      if (receipt) {
-        return {
-          blockHash: bytesToHex(block.hash()),
-          blockNumber: bigIntToHex(block.header.number),
-          from: receipt.from,
-          gas: bigIntToHex(receipt.gas),
-          chainId: '0xd05',
-          gasPrice: '0x4a817c800', // 20000000000
-          hash: receipt.transactionHash,
-          input: receipt.input,
-          nonce: bigIntToHex(tx.nonce),
-          transactionIndex: this.TX_INDEX,
-          value: bigIntToHex(tx.value),
-          to: receipt.to ? receipt.to : null,
-          v: bigIntToHex(tx.v),
-          r: bigIntToHex(tx.r),
-          s: bigIntToHex(tx.s)
+    let transactions = []
+    if (includeTransactions) {
+      transactions = block.transactions.map((t) => {
+        const hash = bytesToHex(t.hash())
+        const tx = this.vmContext.txByHash[hash]
+        const receipt = this.vmContext.currentVm.web3vm.txsReceipt[hash]
+        if (receipt) {
+          return {
+            blockHash: bytesToHex(block.hash()),
+            blockNumber: bigIntToHex(block.header.number),
+            from: receipt.from,
+            gas: bigIntToHex(receipt.gas),
+            chainId: '0xd05',
+            gasPrice: '0x4a817c800', // 20000000000
+            hash: receipt.transactionHash,
+            input: receipt.input,
+            nonce: bigIntToHex(tx.nonce),
+            transactionIndex: this.TX_INDEX,
+            value: bigIntToHex(tx.value),
+            to: receipt.to ? receipt.to : null,
+            v: bigIntToHex(tx.v),
+            r: bigIntToHex(tx.r),
+            s: bigIntToHex(tx.s)
+          }
         }
-      }
-    })
+      })
+    }
+    
     const b = {
       baseFeePerGas: '0x01',
       number: bigIntToHex(block.header.number),
@@ -99,28 +104,35 @@ export class Blocks {
 
   eth_getBlockByHash (payload, cb) {
     const block = this.vmContext.blocks[payload.params[0]]
-
-    const transactions = block.transactions.map((t) => {
-      const hash = bytesToHex(t.hash())
-      const tx = this.vmContext.txByHash[hash]
-      const receipt = this.vmContext.currentVm.web3vm.txsReceipt[hash]
-      if (receipt) {
-        return {
-          blockHash: bytesToHex(block.hash()),
-          blockNumber: bigIntToHex(block.header.number),
-          from: receipt.from,
-          gas: toHex(receipt.gas),
-          chainId: '0xd05',
-          gasPrice: '0x4a817c800', // 20000000000
-          hash: receipt.transactionHash,
-          input: receipt.input,
-          nonce: bigIntToHex(tx.nonce),
-          transactionIndex: this.TX_INDEX,
-          value: bigIntToHex(tx.value),
-          to: receipt.to ? receipt.to : null
+    const includeTransactions = payload.params[1]
+    let transactions = []
+    if (includeTransactions) {
+      transactions = block.transactions.map((t) => {
+        const hash = bytesToHex(t.hash())
+        const tx = this.vmContext.txByHash[hash]
+        const receipt = this.vmContext.currentVm.web3vm.txsReceipt[hash]
+        if (receipt) {
+          return {
+            blockHash: bytesToHex(block.hash()),
+            blockNumber: bigIntToHex(block.header.number),
+            from: receipt.from,
+            gas: toHex(receipt.gas),
+            chainId: '0xd05',
+            gasPrice: '0x4a817c800', // 20000000000
+            hash: receipt.transactionHash,
+            input: receipt.input,
+            nonce: bigIntToHex(tx.nonce),
+            transactionIndex: this.TX_INDEX,
+            value: bigIntToHex(tx.value),
+            to: receipt.to ? receipt.to : null,
+            v: bigIntToHex(tx.v),
+            r: bigIntToHex(tx.r),
+            s: bigIntToHex(tx.s)
+          }
         }
-      }
-    })
+      })
+    }
+   
     const b = {
       baseFeePerGas: '0x01',
       number: bigIntToHex(block.header.number),
diff --git a/libs/remix-simulator/src/vm-context.ts b/libs/remix-simulator/src/vm-context.ts
@@ -8,7 +8,7 @@ import { execution } from '@remix-project/remix-lib'
 const { LogsManager } = execution
 import { VmProxy } from './VmProxy'
 import { createVM, VM } from '@ethereumjs/vm'
-import { Common, ConsensusType, Mainnet } from '@ethereumjs/common'
+import { Common, ConsensusType, Mainnet, CommonOpts } from '@ethereumjs/common'
 import { MerklePatriciaTrie, createMPT, verifyMerkleProof } from '@ethereumjs/mpt'
 import { MerkleStateManager, MerkleStateManagerOpts } from '@ethereumjs/statemanager'
 import { StateManagerInterface, StorageDump } from '@ethereumjs/common'
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
@@ -22,7 +22,7 @@
     "@remix-project/remix-lib": "^0.5.75",
     "async": "^2.6.2",
     "eslint-scope": "^5.0.0",
-    "ethers": "^6.13.7",
+    "ethers": "beta-eip-7702",
     "ethjs-util": "^0.1.6",
     "minixhr": "^3.2.2",
     "semver": "^6.3.0",
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
@@ -53,7 +53,7 @@
     "colors": "1.4.0",
     "commander": "^9.4.1",
     "deep-equal": "^1.0.1",
-    "ethers": "^6.13.7",
+    "ethers": "beta-eip-7702",
     "ethjs-util": "^0.1.6",
     "express-ws": "^4.0.0",
     "merge": "^1.2.0",
diff --git a/libs/remix-ui/run-tab/src/lib/actions/account.ts b/libs/remix-ui/run-tab/src/lib/actions/account.ts
diff --git a/libs/remix-ui/run-tab/src/lib/components/account.tsx b/libs/remix-ui/run-tab/src/lib/components/account.tsx
diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
