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

Author: yann300

apps/remix-ide-e2e/src/tests/debugger.test.ts

@@ -282,7 +282,7 @@ module.exports = {
       .clickFunction('callA - transact (not payable)')
       .debugTransaction(1)
       .pause(4000)
-      .goToVMTraceStep(79)
+      .goToVMTraceStep(80)
       .waitForElementVisible('*[data-id="debugGoToRevert"]', 60000)
       .click('*[data-id="debugGoToRevert"]')
       .waitForElementContainsText('*[data-id="asmitems"] div[selected="selected"]', '114 REVERT')

apps/remix-ide/src/blockchain/blockchain.tsx

@@ -97,7 +97,7 @@ export class Blockchain extends Plugin {
     this.txRunner = new TxRunner(web3Runner, {})
     this.networkcallid = 0
     this.registeredPluginEvents = []
-    this.defaultPinnedProviders = ['vm-pectra', 'vm-mainnet-fork', 'walletconnect', 'injected-MetaMask', 'basic-http-provider', 'hardhat-provider', 'foundry-provider']
+    this.defaultPinnedProviders = ['vm-pectra', 'vm-cancun', 'vm-mainnet-fork', 'walletconnect', 'injected-MetaMask', 'basic-http-provider', 'hardhat-provider', 'foundry-provider']
     this.networkStatus = { network: { name: this.defaultPinnedProviders[0], id: ' - ' } }
     this.pinnedProviders = []
     this.setupEvents()

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

@@ -103,6 +103,8 @@ export class TxListener {
         addExecutionCosts(txResult, tx, execResult)
         tx.envMode = this.executionContext.getProvider()
         tx.status = txResult.receipt.status
+        tx.isUserOp = txResult.tx.isUserOp
+        tx.originTo = txResult.tx.originTo
         this._resolve([tx])
       }).catch(error=>console.log(error))
     })

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

@@ -61,6 +61,7 @@ export class TxRunnerWeb3 {
         // eslint-disable-next-line no-async-promise-executor
         return new Promise(async (resolve, reject) => {
           const receipt = await tryTillReceiptAvailable(resp, this.getWeb3())
+          const originTo = tx.to
           tx = await tryTillTxAvailable(resp, this.getWeb3())
           if (isCreation && !receipt.contractAddress) {
             // if it is a isCreation, contractAddress should be defined.
@@ -75,7 +76,11 @@ export class TxRunnerWeb3 {
             }
           }
           currentDateTime = new Date();
-          if (isUserOp && contractAddress && !receipt.contractAddress) (receipt as any).contractAddress = contractAddress
+          if (isUserOp) {
+            tx.isUserOp = isUserOp
+            tx.originTo = originTo
+            if (contractAddress && !receipt.contractAddress) (receipt as any).contractAddress = contractAddress
+          }
           resolve({
             receipt,
             tx,

libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts

@@ -28,7 +28,7 @@ export class CompileTabLogic {
     this.contentImport = contentImport
     this.event = new EventEmitter()
     this.compiler = new Compiler((url, cb) => api.resolveContentAndSave(url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
-    this.evmVersions = ['default', 'cancun', 'shanghai', 'paris', 'london', 'berlin', 'istanbul', 'petersburg', 'constantinople', 'byzantium', 'spuriousDragon', 'tangerineWhistle', 'homestead']
+    this.evmVersions = ['default', 'prague', 'cancun', 'shanghai', 'paris', 'london', 'berlin', 'istanbul', 'petersburg', 'constantinople', 'byzantium', 'spuriousDragon', 'tangerineWhistle', 'homestead']
   }
 
   init () {

libs/remix-ui/terminal/src/lib/components/RenderKnownTransactions.tsx

@@ -25,8 +25,29 @@ const RenderKnownTransactions = ({ tx, receipt, resolvedData, logs, index, plugi
     }
   }
 
-  const from = tx.from
-  const to = resolvedData.contractName + '.' + resolvedData.fn
+  let from = tx.from
+  let to = resolvedData.contractName + '.' + resolvedData.fn
+  if (tx.isUserOp) {
+    // Track event with signature: ExecutionFromModuleSuccess (index_topic_1 address module)
+    // to get sender smart account address
+    const fromAddrLog = receipt.logs.find(e => e.topics[0] === "0x6895c13664aa4f67288b25d7a21d7aaa34916e355fb9b6fae0a139a9085becb8")
+    // Track event with signature: UserOperationSponsored (index_topic_1 bytes32 userOpHash, index_topic_2 address user, uint8 paymasterMode, address token, uint256 tokenAmountPaid, uint256 exchangeRate)
+    // to get paymaster address
+    const paymasterAddrLog = receipt.logs.find(e => e.topics[0] === "0x7a270f29ae17e8e2304ff1245deb50c3b6206bca82928d904f3e284d35c5ffd2")
+    if (fromAddrLog) {
+      from = fromAddrLog.address
+      tx.bundler = tx.from
+    }
+    if (paymasterAddrLog) tx.paymaster = paymasterAddrLog.address
+    if (tx.to) {
+      tx.entrypoint = tx.to
+      to = null // for deployment transaction
+    }
+    if (tx.originTo) {
+      to = tx.originTo
+    }
+
+  }
   const txType = 'knownTx'
   const options = { from, to, tx, logs }
   return (
@@ -49,6 +70,10 @@ const RenderKnownTransactions = ({ tx, receipt, resolvedData, logs, index, plugi
       {showTableHash.includes(tx.hash)
         ? showTable(
           {
+            'isUserOp': tx.isUserOp,
+            'bundler': tx.bundler,
+            'paymaster': tx.paymaster,
+            'entrypoint': tx.entrypoint,
             'hash': tx.hash,
             'status': receipt !== null ? receipt.status : null,
             'isCall': tx.isCall,

libs/remix-ui/terminal/src/lib/components/RenderUnknownTransactions.tsx

@@ -5,6 +5,7 @@ import Context from './Context' // eslint-disable-line
 import showTable from './Table'
 
 const RenderUnKnownTransactions = ({ tx, receipt, index, plugin, showTableHash, txDetails, modal, provider }) => {
+
   const intl = useIntl()
   const debug = (event, tx) => {
     event.stopPropagation()
@@ -22,9 +23,30 @@ const RenderUnKnownTransactions = ({ tx, receipt, index, plugin, showTableHash,
       plugin.event.trigger('debuggingRequested', [tx.hash])
     }
   }
+  let from = tx.from
+  let to = tx.to
+
+  if (tx.isUserOp) {
+    // Track event with signature: ExecutionFromModuleSuccess (index_topic_1 address module)
+    // to get sender smart account address
+    const fromAddrLog = receipt.logs.find(e => e.topics[0] === "0x6895c13664aa4f67288b25d7a21d7aaa34916e355fb9b6fae0a139a9085becb8")
+    // Track event with signature: UserOperationSponsored (index_topic_1 bytes32 userOpHash, index_topic_2 address user, uint8 paymasterMode, address token, uint256 tokenAmountPaid, uint256 exchangeRate)
+    // to get paymaster address
+    const paymasterAddrLog = receipt.logs.find(e => e.topics[0] === "0x7a270f29ae17e8e2304ff1245deb50c3b6206bca82928d904f3e284d35c5ffd2")
+    if (fromAddrLog) {
+      from = fromAddrLog.address
+      tx.bundler = tx.from
+    }
+    if (paymasterAddrLog) tx.paymaster = paymasterAddrLog.address
+    if (tx.to) {
+      tx.entrypoint = tx.to
+      to = null // for deployment transaction
+    }
+    if (tx.originTo) {
+      to = tx.originTo
+    }
 
-  const from = tx.from
-  const to = tx.to
+  }
   const txType = 'unknown' + (tx.isCall ? 'Call' : 'Tx')
   const options = {
     from,
@@ -54,6 +76,10 @@ const RenderUnKnownTransactions = ({ tx, receipt, index, plugin, showTableHash,
       {showTableHash.includes(tx.hash)
         ? showTable(
           {
+            'isUserOp': tx.isUserOp,
+            'bundler': tx.bundler,
+            'paymaster': tx.paymaster,
+            'entrypoint': tx.entrypoint,
             'hash': tx.hash,
             'status': receipt ? receipt.status : null,
             'isCall': tx.isCall,

libs/remix-ui/terminal/src/lib/components/Table.tsx

@@ -4,13 +4,14 @@ import {CopyToClipboard} from '@remix-ui/clipboard' // eslint-disable-line
 import { shortenHexData } from '@remix-ui/helper'
 import { execution } from '@remix-project/remix-lib'
 const typeConversion = execution.typeConversion
+import { toChecksumAddress } from '@ethereumjs/util'
 
 const showTable = (opts, showTableHash) => {
   const intl = useIntl()
   let msg = ''
   let toHash
   const data = opts.data // opts.data = data.tx
-  if (data.to && opts.to !== data.to) {
+  if (!opts.isUserOp && data.to && opts.to !== data.to) {
     toHash = opts.to + ' ' + data.to
   } else {
     toHash = opts.to
@@ -98,19 +99,27 @@ const showTable = (opts, showTableHash) => {
               from
             </td>
             <td className="remix_ui_terminal_td" data-id={`txLoggerTableFrom${opts.hash}`} data-shared={`pair_${opts.hash}`}>
-              {opts.from}
+              {toChecksumAddress(opts.from)}
               <CopyToClipboard content={opts.from} />
+              { opts.isUserOp && opts.bundler ? (<>
+                  (BUNDLER: {toChecksumAddress(opts.bundler)}) <CopyToClipboard content={opts.bundler} />
+              </>
+              ) : null }
             </td>
           </tr>
         ) : null}
-        {opts.to ? (
+        {opts.to || (opts.isUserOp && opts.entrypoint)? (
           <tr className="remix_ui_terminal_tr">
             <td className="remix_ui_terminal_td" data-shared={`key_${opts.hash}`}>
               to
             </td>
             <td className="remix_ui_terminal_td" data-id={`txLoggerTableTo${opts.hash}`} data-shared={`pair_${opts.hash}`}>
               {toHash}
-              <CopyToClipboard content={data.to ? data.to : toHash} />
+              { opts.to ? <CopyToClipboard content={data.to ? data.to : toHash} /> : null }
+              { opts.isUserOp && opts.entrypoint ? (<>
+                  (ENTRYPOINT: {toChecksumAddress(opts.entrypoint)}) <CopyToClipboard content={opts.entrypoint} />
+              </>
+              ) : null }
             </td>
           </tr>
         ) : null}
@@ -133,6 +142,10 @@ const showTable = (opts, showTableHash) => {
             <td className="remix_ui_terminal_td" data-id={`txLoggerTableTransactionCost${opts.hash}`} data-shared={`pair_${opts.hash}`}>
               {opts.transactionCost} gas {callWarning}
               <CopyToClipboard content={opts.transactionCost} />
+              { opts.isUserOp && opts.paymaster ? (<>
+                  (PAYMASTER: {toChecksumAddress(opts.paymaster)}) <CopyToClipboard content={opts.paymaster} />
+              </>
+              ) : null }
             </td>
           </tr>
         ) : null}

package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "description": "Ethereum Remix Monorepo",
   "main": "index.js",
-  "defaultVersion": "soljson-v0.8.26+commit.8a97fa7a.js",
+  "defaultVersion": "soljson-v0.8.30+commit.73712a01.js",
   "keywords": [
     "ethereum",
     "solidity",