Merge remote-tracking branch 'origin/master' into eip_7702

yann300 · yann300 · commit d97c1d80a35c · 2025-05-03T09:03:46.000+02:00
diff --git a/apps/remix-ide-e2e/src/tests/eip7702.test.ts b/apps/remix-ide-e2e/src/tests/eip7702.test.ts
@@ -11,25 +11,27 @@ module.exports = {
   'Should activate delegation and make a transaction to the authority address #group1': function (browser: NightwatchBrowser) {
     let addressDelegate
     browser
-      .pinGrid('vm-pectra', true)
       .clickLaunchIcon('udapp')
+      .pinGrid('vm-pectra', true)
       .switchEnvironment('vm-pectra')
       .addFile('delegate.sol', { content: delegate })
       .clickLaunchIcon('solidity')
-      .setSolidityCompilerVersion('soljson-v0.8.24+commit.e11b9ed9.js')
+      .setSolidityCompilerVersion('soljson-v0.8.28+commit.7893614a.js')
       .clickLaunchIcon('solidity')
       .verifyContracts(['TestDelegate'])
       .clickLaunchIcon('udapp')
       .selectContract('Simple7702Account')
       .createContract('')
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
-          addressDelegate = delegate
+          addressDelegate = address
+          done()
         })
       })
       .click('*[data-id="create-delegation-authorization"]')
+      .waitForElementVisible('`*[data-id="udappNotify-modal-footer-ok-react"]`')
       .setValue('*[data-id="create-delegation-authorization-input"]', addressDelegate)
-      .modalFooterOKClick('udapp')
+      .modalFooterOKClick('udappNotify')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'This account will be running the code located at')
       .clickInstance(1)
       .clickFunction('entryPoint - call (not payable)')
diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts
@@ -4,6 +4,7 @@ import type { Transaction as InternalTransaction } from './txRunner'
 import { Web3 } from 'web3'
 import { BrowserProvider } 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"
@@ -110,7 +111,7 @@ export class TxRunnerWeb3 {
     } else {
       try {
         if (tx.fromSmartAccount) {
-          const { txHash, contractAddress } = await this.sendUserOp(tx)
+          const { txHash, contractAddress } = await this.sendUserOp(tx, network.id)
           cb(null, txHash, isCreation, true, contractAddress)
         } else {
           const res = await this.getWeb3().eth.sendTransaction(tx, null, { checkRevertBeforeSending: false, ignoreGasPricing: true })
@@ -201,8 +202,11 @@ export class TxRunnerWeb3 {
             callback(new Error('Gas estimation failed because of an unknown internal error. This may indicated that the transaction will fail.'))
             return
           }
-          if (tx.fromSmartAccount && tx.value === "0" && err && err.error && err.error.indexOf('insufficient funds for transfer') !== -1) {
-            // Do not show dialog for insufficient funds as smart account may be using paymaster
+          if (tx.fromSmartAccount && tx.value === "0" &&
+            err && err.message && err.message.includes('missing revert data')
+          ) {
+            // Do not show dialog for 'missing revert data'
+            // tx fees can be managed by paymaster in case of smart account tx
             // @todo If paymaster is used, check if balance/credits are available
             err = null
           }
@@ -225,16 +229,13 @@ export class TxRunnerWeb3 {
     })
   }
 
-  async sendUserOp (tx) {
-    const localStorageKey = 'smartAccounts'
-    const PUBLIC_NODE_URL = "https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9"
-    const determiniticProxyAddress = "0x4e59b44847b379578588920cA78FbF26c0B4956C"
-    const network = 'sepolia'
-    const chain = chains[network]
-    const BUNDLER_URL = `https://pimlico.remixproject.org/api/proxy/${chain.id}`
+  async sendUserOp (tx, chainId) {
+    const chain = chains[aaSupportedNetworks[chainId].name]
+    const PUBLIC_NODE_URL = aaSupportedNetworks[chainId].publicNodeUrl
+    const BUNDLER_URL = getPimlicoBundlerURL(chainId)
 
     // Check that saOwner is there in MM addresses
-    let smartAccountsObj = localStorage.getItem(localStorageKey)
+    let smartAccountsObj = localStorage.getItem(aaLocalStorageKey)
     smartAccountsObj = JSON.parse(smartAccountsObj)
     const saDetails = smartAccountsObj[chain.id][tx.from]
     const saOwner = saDetails['ownerEOA']
@@ -248,7 +249,7 @@ export class TxRunnerWeb3 {
 
     const publicClient = createPublicClient({
       chain,
-      transport: http(PUBLIC_NODE_URL) // choose any provider here
+      transport: http(PUBLIC_NODE_URL)
     })
 
     const safeAccount = await toSafeSmartAccount({
@@ -284,15 +285,15 @@ export class TxRunnerWeb3 {
 
     const expectedDeploymentAddress = getContractAddress({
       bytecode,
-      from: determiniticProxyAddress,
+      from: aaDeterminiticProxyAddress,
       opcode: 'CREATE2',
       salt
     })
     let txHash, contractAddress
     if (!tx.to) {
       // contract deployment transaction
       txHash = await saClient.sendTransaction({
-        to:  determiniticProxyAddress,
+        to:  aaDeterminiticProxyAddress,
         data: encodePacked(["bytes32", "bytes"], [salt, bytecode])
       })
       // check if code is deployed to expectedDeployment Address
@@ -303,7 +304,7 @@ export class TxRunnerWeb3 {
         contractAddress = expectedDeploymentAddress
       } else {
         contractAddress = undefined
-        console.error('Error in contract deployment')
+        console.error('Error in contract deployment using smart account')
       }
     } else {
       // contract interaction transaction
diff --git a/libs/remix-lib/src/helpers/aaConstants.ts b/libs/remix-lib/src/helpers/aaConstants.ts
@@ -0,0 +1,26 @@
+import { ZeroAddress } from 'ethers'
+
+// AA02: Add network name and public URL to support contract transactions using smart account
+export const aaSupportedNetworks = {
+  "11155111": {
+    name: "sepolia",
+    publicNodeUrl: "https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9"
+  },
+  // "10200": {
+  //   name: "gnosisChiado",
+  //   publicNodeUrl: "https://rpc.chiadochain.net/"
+  // }
+}
+
+export const getPimlicoBundlerURL = (chainId) => {
+  return `https://pimlico.remixproject.org/api/proxy/${chainId}`
+}
+
+export const aaLocalStorageKey = 'smartAccounts'
+
+// AA03: Check if this address is valid for newly added network
+// This determiniticProxyAddress is used for replay protection during contract deployment
+// See: https://github.com/safe-global/safe-smart-account?tab=readme-ov-file#replay-protection-eip-155
+export const aaDeterminiticProxyAddress = "0x4e59b44847b379578588920cA78FbF26c0B4956C"
+
+export const toAddress = ZeroAddress // A dummy zero value tx is made to this zero address to create existence of smart account
diff --git a/libs/remix-lib/src/index.ts b/libs/remix-lib/src/index.ts
@@ -17,6 +17,7 @@ import { TxRunnerVM } from './execution/txRunnerVM'
 import { TxRunnerWeb3 } from './execution/txRunnerWeb3'
 import * as txResultHelper from './helpers/txResultHelper'
 export { ConsoleLogs } from './helpers/hhconsoleSigs'
+export { aaSupportedNetworks, aaLocalStorageKey, getPimlicoBundlerURL, aaDeterminiticProxyAddress, toAddress } from './helpers/aaConstants'
 export { ICompilerApi, ConfigurationSettings, iSolJsonBinData, iSolJsonBinDataBuild } from './types/ICompilerApi'
 export { QueryParams } from './query-params'
 export { VMexecutionResult } from './execution/txRunnerVM'
diff --git a/libs/remix-simulator/src/methods/blocks.ts b/libs/remix-simulator/src/methods/blocks.ts
@@ -70,7 +70,7 @@ export class Blocks {
         }
       })
     }
-    
+
     const b = {
       baseFeePerGas: '0x01',
       number: bigIntToHex(block.header.number),
@@ -132,7 +132,7 @@ export class Blocks {
         }
       })
     }
-   
+
     const b = {
       baseFeePerGas: '0x01',
       number: bigIntToHex(block.header.number),
diff --git a/libs/remix-ui/run-tab/src/lib/actions/account.ts b/libs/remix-ui/run-tab/src/lib/actions/account.ts
@@ -3,6 +3,7 @@ import { RunTab } from "../types/run-tab"
 import { clearInstances, setAccount, setExecEnv } from "./actions"
 import { displayNotification, fetchAccountsListFailed, fetchAccountsListRequest, fetchAccountsListSuccess, setMatchPassphrase, setPassphrase } from "./payload"
 import { toChecksumAddress, bytesToHex } from '@ethereumjs/util'
+import { aaSupportedNetworks, aaLocalStorageKey, getPimlicoBundlerURL, toAddress } from '@remix-project/remix-lib'
 import { SmartAccount } from "../types"
 import { BrowserProvider, BaseWallet, SigningKey } from "ethers" 
 import "viem/window"
@@ -171,14 +172,13 @@ export const delegationAuthorization = async (contractAddress: string, plugin: R
 }
 
 export const createSmartAccount = async (plugin: RunTab, dispatch: React.Dispatch<any>) => {
-  const localStorageKey = 'smartAccounts'
-  const PUBLIC_NODE_URL = "https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9"
-  const toAddress = "0xAFdAC33F6F134D46bAbE74d9125F3bf8e8AB3a44" // A dummy zero value tx is made to this address to create existence of smart account
-  const safeAddresses: string[] = Object.keys(plugin.REACT_API.smartAccounts)
-  const network = 'sepolia'
-  const chain = chains[network]
-  const BUNDLER_URL = `https://pimlico.remixproject.org/api/proxy/${chain.id}`
 
+  const { chainId } = plugin.REACT_API
+  const chain = chains[aaSupportedNetworks[chainId].name]
+  const PUBLIC_NODE_URL = aaSupportedNetworks[chainId].publicNodeUrl
+  const BUNDLER_URL = getPimlicoBundlerURL(chainId)
+
+  const safeAddresses: string[] = Object.keys(plugin.REACT_API.smartAccounts)
   let salt
 
   // @ts-ignore
@@ -230,6 +230,7 @@ export const createSmartAccount = async (plugin: RunTab, dispatch: React.Dispatc
         estimateFeesPerGas: async () => (await paymasterClient.getUserOperationGasPrice()).fast,
       }
     })
+
     // Make a dummy tx to force smart account deployment
     const useropHash = await saClient.sendUserOperation({
       calls: [{
@@ -239,9 +240,8 @@ export const createSmartAccount = async (plugin: RunTab, dispatch: React.Dispatc
     })
     await saClient.waitForUserOperationReceipt({ hash: useropHash })
 
-    // TO verify creation, check if there is a contract code at this address
+    // To verify creation, check if there is a contract code at this address
     const safeAddress = safeAccount.address
-
     const sAccount: SmartAccount = {
       address : safeAccount.address,
       salt,
@@ -250,10 +250,10 @@ export const createSmartAccount = async (plugin: RunTab, dispatch: React.Dispatc
     }
     plugin.REACT_API.smartAccounts[safeAddress] = sAccount
     // Save smart accounts in local storage
-    const smartAccountsStr = localStorage.getItem(localStorageKey)
+    const smartAccountsStr = localStorage.getItem(aaLocalStorageKey)
     const smartAccountsObj = JSON.parse(smartAccountsStr)
-    smartAccountsObj[plugin.REACT_API.chainId] = plugin.REACT_API.smartAccounts
-    localStorage.setItem(localStorageKey, JSON.stringify(smartAccountsObj))
+    smartAccountsObj[chainId] = plugin.REACT_API.smartAccounts
+    localStorage.setItem(aaLocalStorageKey, JSON.stringify(smartAccountsObj))
 
     return plugin.call('notification', 'toast', `Safe account ${safeAccount.address} created for owner ${account}`)
   } catch (error) {
@@ -264,21 +264,19 @@ export const createSmartAccount = async (plugin: RunTab, dispatch: React.Dispatc
 
 export const loadSmartAccounts = async (plugin) => {
   const { chainId } = plugin.REACT_API
-  const localStorageKey = 'smartAccounts'
-
-  const smartAccountsStr = localStorage.getItem(localStorageKey)
+  const smartAccountsStr = localStorage.getItem(aaLocalStorageKey)
   if (smartAccountsStr) {
     const smartAccountsObj = JSON.parse(smartAccountsStr)
     if (smartAccountsObj[chainId]) {
       plugin.REACT_API.smartAccounts = smartAccountsObj[chainId]
     } else {
       smartAccountsObj[chainId] = {}
-      localStorage.setItem(localStorageKey, JSON.stringify(smartAccountsObj))
+      localStorage.setItem(aaLocalStorageKey, JSON.stringify(smartAccountsObj))
     }
   } else {
     const objToStore = {}
     objToStore[chainId] = {}
-    localStorage.setItem(localStorageKey, JSON.stringify(objToStore))
+    localStorage.setItem(aaLocalStorageKey, JSON.stringify(objToStore))
   }
 }
 
diff --git a/libs/remix-ui/run-tab/src/lib/components/account.tsx b/libs/remix-ui/run-tab/src/lib/components/account.tsx
@@ -25,32 +25,33 @@ export function AccountUI(props: AccountProps) {
   const ownerEOA = useRef(null)
 
   const intl = useIntl()
-  const smartAccounts: string[] = networkName.includes('Sepolia') ? Object.keys(props.runTabPlugin.REACT_API.smartAccounts) : []
+  const aaSupportedChainIds = ["11155111"] // AA01: Add chain id here to show 'Create Smart Account' button in Udapp
+  const smartAccounts: string[] = aaSupportedChainIds.some(e => networkName.includes(e)) ? Object.keys(props.runTabPlugin.REACT_API.smartAccounts) : []
 
   useEffect(() => {
     if (accounts.length > 0 && !accounts.includes(selectedAccount)) {
       props.setAccount(accounts[0])
     }
   }, [accounts, selectedAccount])
 
-  // Uncomment this when we want to show 'Create Smart Account' button
-  // useEffect(() => {
-  //   if (networkName.includes('Sepolia')) {
-  //     if (smartAccounts.length > 0 && smartAccounts.includes(selectedAccount)) {
-  //       setSmartAccountSelected(true)
-  //       setEnableCSM(false)
-  //       ownerEOA.current = props.runTabPlugin.REACT_API.smartAccounts[selectedAccount].ownerEOA
-  //     }
-  //     else {
-  //       setSmartAccountSelected(false)
-  //       setEnableCSM(true)
-  //       ownerEOA.current = null
-  //     }
-  //   } else {
-  //     setEnableCSM(false)
-  //     setSmartAccountSelected(false)
-  //   }
-  // }, [selectedAccount])
+  // Comment this when not to show 'Create Smart Account' button
+  useEffect(() => {
+    if (aaSupportedChainIds.some(e => networkName.includes(e))) {
+      if (smartAccounts.length > 0 && smartAccounts.includes(selectedAccount)) {
+        setSmartAccountSelected(true)
+        setEnableCSM(false)
+        ownerEOA.current = props.runTabPlugin.REACT_API.smartAccounts[selectedAccount].ownerEOA
+      }
+      else {
+        setSmartAccountSelected(false)
+        setEnableCSM(true)
+        ownerEOA.current = null
+      }
+    } else {
+      setEnableCSM(false)
+      setSmartAccountSelected(false)
+    }
+  }, [selectedAccount])
 
   useEffect(() => {
     const run = async () => {
diff --git a/libs/remixd/package.json b/libs/remixd/package.json
@@ -32,7 +32,7 @@
     "@remixproject/plugin-api": "0.3.33",
     "@remixproject/plugin-utils": "0.3.33",
     "@remixproject/plugin-ws": "0.3.33",
-    "axios": "1.6.0",
+    "axios": "1.8.2",
     "chokidar": "^2.1.8",
     "commander": "^9.4.1",
     "fs-extra": "^3.0.1",

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export class Blocks {`
`70`	`70`	`}`
`71`	`71`	`})`
`72`	`72`	`}`
`73`		`-`
	`73`	`+`
`74`	`74`	`const b = {`
`75`	`75`	`baseFeePerGas: '0x01',`
`76`	`76`	`number: bigIntToHex(block.header.number),`
`@@ -132,7 +132,7 @@ export class Blocks {`
`132`	`132`	`}`
`133`	`133`	`})`
`134`	`134`	`}`
`135`		`-`
	`135`	`+`
`136`	`136`	`const b = {`
`137`	`137`	`baseFeePerGas: '0x01',`
`138`	`138`	`number: bigIntToHex(block.header.number),`