optimize benchmark by not using multisend when not needed

examples/4337-gas-metering/package.json

@@ -52,13 +52,14 @@
     "@alchemy/aa-accounts": "2.4.0",
     "@alchemy/aa-alchemy": "2.4.0",
     "@alchemy/aa-core": "2.3.1",
+    "@gelatonetwork/relay-sdk": "^5.5.6",
     "alchemy-sdk": "3.1.2",
     "dotenv": "16.4.5",
+    "ethers": "^6.12.1",
     "permissionless": "0.1.29",
     "viem": "2.10.8"
   },
   "devDependencies": {
-    "@gelatonetwork/relay-sdk": "^5.5.6",
     "@types/node": "20.12.12",
     "tsx": "4.10.3",
     "typescript": "^5.4.5"

examples/4337-gas-metering/pimlico/pimlico.ts

@@ -3,7 +3,7 @@ import { ethers } from 'ethers'
 import { getAccountNonce, bundlerActions, ENTRYPOINT_ADDRESS_V07, getRequiredPrefund } from 'permissionless'
 import { pimlicoBundlerActions, pimlicoPaymasterActions } from 'permissionless/actions/pimlico'
 import { setTimeout } from 'timers/promises'
-import { Client, Hash, createClient, createPublicClient, http, parseEther } from 'viem'
+import { Client, Hash, createClient, createPublicClient, http, parseEther, zeroAddress } from 'viem'
 import { privateKeyToAccount } from 'viem/accounts'
 import { baseSepolia, sepolia } from 'viem/chains'
 import { getAccountAddress, getAccountInitCode } from '../utils/safe'
@@ -44,15 +44,14 @@ const erc721TokenAddress = process.env.PIMLICO_ERC721_TOKEN_CONTRACT as `0x${str
 
 // Detecting Paymaster based transaction or not.
 const argv = process.argv.slice(2)
-let usePaymaster!: boolean
+let usePaymaster = false
 if (argv.length < 1 || argv.length > 2) {
   throw new Error('TX Type Argument not passed.')
 } else if (argv.length == 2 && argv[1] == 'paymaster=true') {
   if (policyID) {
     usePaymaster = true
   } else {
-    // throw new Error('Paymaster requires policyID to be set.')
-    usePaymaster = true
+    throw new Error('Paymaster requires policyID to be set.')
   }
 }
 
@@ -114,8 +113,8 @@ const initCode = await getAccountInitCode({
   safeSingletonAddress: chainAddresses.SAFE_SINGLETON_ADDRESS,
   saltNonce: saltNonce,
   multiSendAddress: multiSendAddress,
-  erc20TokenAddress: usdcTokenAddress,
-  paymasterAddress: erc20PaymasterAddress,
+  erc20TokenAddress: usePaymaster ? usdcTokenAddress : zeroAddress,
+  paymasterAddress: usePaymaster ? erc20PaymasterAddress : zeroAddress,
 })
 console.log('\nInit Code Created.')
 
@@ -129,8 +128,8 @@ const senderAddress = await getAccountAddress({
   safeSingletonAddress: chainAddresses.SAFE_SINGLETON_ADDRESS,
   saltNonce: saltNonce,
   multiSendAddress: multiSendAddress,
-  erc20TokenAddress: usdcTokenAddress,
-  paymasterAddress: erc20PaymasterAddress,
+  erc20TokenAddress: usePaymaster ? usdcTokenAddress : zeroAddress,
+  paymasterAddress: usePaymaster ? erc20PaymasterAddress : zeroAddress,
 })
 console.log('\nCounterfactual Sender Address Created:', senderAddress)
 if (chain == 'base-sepolia') {
@@ -234,11 +233,11 @@ if (usePaymaster) {
 
   // Check Sender ETH Balance.
   let senderETHBalance = await publicClient.getBalance({ address: senderAddress })
-  console.log('\nSender ETH Balance:', ethers.utils.formatEther(senderETHBalance))
+  console.log('\nSender ETH Balance:', ethers.formatEther(senderETHBalance))
 
   // Checking required preFund.
   const requiredPrefund = getRequiredPrefund({ userOperation: userOp, entryPoint: ENTRYPOINT_ADDRESS_V07 })
-  console.log('\nRequired Prefund:', ethers.utils.formatEther(requiredPrefund))
+  console.log('\nRequired Prefund:', ethers.formatEther(requiredPrefund))
 
   const requiredBalance = requiredPrefund + (txType == 'native-transfer' ? parseEther('0.000001') : 0n)
 

examples/4337-gas-metering/utils/safe.ts

@@ -164,12 +164,13 @@ const getInitializerCode = async ({
     })
   }
 
-  const multiSendCallData = encodeMultiSend(setupTxs)
+  const recipient = setupTxs.length > 1 ? multiSendAddress : safeModuleSetupAddress
+  const calldata = setupTxs.length > 1 ? encodeMultiSend(setupTxs) : setupTxs[0].data
 
   return encodeFunctionData({
     abi: SAFE_SETUP_ABI,
     functionName: 'setup',
-    args: [[owner], 1n, multiSendAddress, multiSendCallData, safe4337ModuleAddress, zeroAddress, 0n, zeroAddress],
+    args: [[owner], 1n, recipient, calldata, safe4337ModuleAddress, zeroAddress, 0n, zeroAddress],
   })
 }
 

examples/4337-gas-metering/utils/userOps.ts

@@ -412,6 +412,7 @@ export const createCallData = async (
       value: weiToSend,
     })
   }
+
   console.log('\nAppropriate calldata created.')
   return txCallData
 }