Feat/7702 support (#367)

* initial commit * add authorization to estimations * create helper function to find authorization state overrides * support 7702 estimations * remove console.log * cleanup * fix * fix build * keep existing interaction * undo lockfile changes * undo lockfile changes * fix incorrect tx type * update endpoint name * fix build * always extend 7702Actions * change order * cleanup logic * fix build * use const --------- Co-authored-by: mouseless <[email protected]>
pimlicolabs · Dec 19, 2024 · f7ef6a1 · f7ef6a1
1 parent e0a6456
commit f7ef6a1
Show file tree

Hide file tree

Showing 18 changed files with 842 additions and 419 deletions.
diff --git a/src/cli/config/bundler.ts b/src/cli/config/bundler.ts
@@ -119,7 +119,8 @@ export const bundlerArgsSchema = z.object({
         ),
     "refilling-wallets": z.boolean().default(true),
     "aa95-gas-multiplier": z.string().transform((val) => BigInt(val)),
-    "enable-instant-bundling-endpoint": z.boolean()
+    "enable-instant-bundling-endpoint": z.boolean(),
+    "enable-experimental-7702-endpoints": z.boolean()
 })
 
 export const compatibilityArgsSchema = z.object({

diff --git a/src/cli/config/options.ts b/src/cli/config/options.ts
@@ -192,6 +192,12 @@ export const bundlerOptions: CliCommandOptions<IBundlerArgsInput> = {
             "Should the bundler enable the pimlico_sendUserOperationNow endpoint",
         type: "boolean",
         default: false
+    },
+    "enable-experimental-7702-endpoints": {
+        description:
+            "Should the bundler enable the pimlico_experimental_sendUserOperation7702 and pimlico_experimental_estimateUserOperationGas7702 endpoint",
+        type: "boolean",
+        default: false
     }
 }
 

diff --git a/src/cli/handler.ts b/src/cli/handler.ts
@@ -22,6 +22,7 @@ import { setupServer } from "./setupServer"
 import { type AltoConfig, createConfig } from "../createConfig"
 import { parseArgs } from "./parseArgs"
 import { deploySimulationsContract } from "./deploySimulationsContract"
+import { eip7702Actions } from "viem/experimental"
 
 const preFlightChecks = async (config: AltoConfig): Promise<void> => {
     for (const entrypoint of config.entrypoints) {
@@ -137,7 +138,7 @@ export async function bundlerHandler(args_: IOptionsInput): Promise<void> {
               )
             : createWalletTransport(args.rpcUrl),
         chain
-    })
+    }).extend(eip7702Actions())
 
     // if flag is set, use utility wallet to deploy the simulations contract
     if (args.deploySimulationsContract) {

diff --git a/src/cli/parseArgs.ts b/src/cli/parseArgs.ts
@@ -13,7 +13,7 @@ export type CamelCasedProperties<T> = {
 }
 
 function toCamelCase(str: string): string {
-    return str.replace(/([-_][a-z])/g, (group) =>
+    return str.replace(/([-_][a-z0-9])/g, (group) =>
         group.toUpperCase().replace("-", "").replace("_", "")
     )
 }

diff --git a/src/executor/executor.ts b/src/executor/executor.ts
@@ -54,10 +54,12 @@ import {
     filterOpsAndEstimateGas,
     flushStuckTransaction,
     simulatedOpsToResults,
-    isTransactionUnderpricedError
+    isTransactionUnderpricedError,
+    getAuthorizationList
 } from "./utils"
 import type { SendTransactionErrorType } from "viem"
 import type { AltoConfig } from "../createConfig"
+import { SendTransactionOptions } from "./types"
 
 export interface GasEstimateResult {
     preverificationGas: bigint
@@ -712,7 +714,7 @@ export class Executor {
             return {
                 mempoolUserOperation: op,
                 userOperationHash: getUserOperationHash(
-                    op,
+                    deriveUserOperation(op),
                     entryPoint,
                     this.config.walletClient.chain.id
                 )
@@ -796,7 +798,12 @@ export class Executor {
             this.config.legacyTransactions,
             this.config.fixedGasLimitForEstimation,
             this.reputationManager,
-            childLogger
+            childLogger,
+            getAuthorizationList(
+                opsWithHashes.map(
+                    ({ mempoolUserOperation }) => mempoolUserOperation
+                )
+            )
         )
 
         if (simulatedOps.length === 0) {
@@ -870,39 +877,67 @@ export class Executor {
         try {
             const isLegacyTransaction = this.config.legacyTransactions
 
-            const gasOptions = isLegacyTransaction
-                ? { gasPrice: gasPriceParameters.maxFeePerGas }
-                : {
-                      maxFeePerGas: gasPriceParameters.maxFeePerGas,
-                      maxPriorityFeePerGas:
-                          gasPriceParameters.maxPriorityFeePerGas
-                  }
-
             if (this.config.noProfitBundling) {
                 const gasPrice = totalBeneficiaryFees / gasLimit
                 if (isLegacyTransaction) {
-                    gasOptions.gasPrice = gasPrice
+                    gasPriceParameters.maxFeePerGas = gasPrice
+                    gasPriceParameters.maxPriorityFeePerGas = gasPrice
                 } else {
-                    gasOptions.maxFeePerGas = maxBigInt(
+                    gasPriceParameters.maxFeePerGas = maxBigInt(
                         gasPrice,
-                        gasOptions.maxFeePerGas || 0n
+                        gasPriceParameters.maxFeePerGas || 0n
                     )
                 }
             }
 
-            const opts = {
-                account: wallet,
-                gas: gasLimit,
-                nonce: nonce,
-                ...gasOptions
+            const authorizationList = getAuthorizationList(
+                opsWithHashToBundle.map(
+                    ({ mempoolUserOperation }) => mempoolUserOperation
+                )
+            )
+
+            let opts: SendTransactionOptions
+            if (isLegacyTransaction) {
+                opts = {
+                    type: "legacy",
+                    gasPrice: gasPriceParameters.maxFeePerGas,
+                    account: wallet,
+                    gas: gasLimit,
+                    nonce
+                }
+            } else if (authorizationList) {
+                opts = {
+                    type: "eip7702",
+                    maxFeePerGas: gasPriceParameters.maxFeePerGas,
+                    maxPriorityFeePerGas:
+                        gasPriceParameters.maxPriorityFeePerGas,
+                    account: wallet,
+                    gas: gasLimit,
+                    nonce,
+                    authorizationList
+                }
+            } else {
+                opts = {
+                    type: "eip1559",
+                    maxFeePerGas: gasPriceParameters.maxFeePerGas,
+                    maxPriorityFeePerGas:
+                        gasPriceParameters.maxPriorityFeePerGas,
+                    account: wallet,
+                    gas: gasLimit,
+                    nonce
+                }
             }
 
-            const userOps = opsWithHashToBundle.map((owh) =>
-                isUserOpVersion06
-                    ? owh.mempoolUserOperation
-                    : toPackedUserOperation(
-                          owh.mempoolUserOperation as UserOperationV07
-                      )
+            const userOps = opsWithHashToBundle.map(
+                ({ mempoolUserOperation }) => {
+                    const op = deriveUserOperation(mempoolUserOperation)
+
+                    if (isUserOpVersion06) {
+                        return op
+                    }
+
+                    return toPackedUserOperation(op as UserOperationV07)
+                }
             ) as PackedUserOperation[]
 
             transactionHash = await this.sendHandleOpsTransaction({

diff --git a/src/executor/types.ts b/src/executor/types.ts
@@ -0,0 +1,28 @@
+import { Account } from "viem"
+import { SignedAuthorizationList } from "viem/experimental"
+
+export type SendTransactionOptions =
+    | {
+          type: "legacy"
+          gasPrice: bigint
+          account: Account
+          gas: bigint
+          nonce: number
+      }
+    | {
+          type: "eip1559"
+          maxFeePerGas: bigint
+          maxPriorityFeePerGas: bigint
+          account: Account
+          gas: bigint
+          nonce: number
+      }
+    | {
+          type: "eip7702"
+          maxFeePerGas: bigint
+          maxPriorityFeePerGas: bigint
+          account: Account
+          gas: bigint
+          nonce: number
+          authorizationList: SignedAuthorizationList
+      }
diff --git a/src/executor/utils.ts b/src/executor/utils.ts
@@ -12,7 +12,9 @@ import {
     type UserOperationWithHash,
     deriveUserOperation,
     failedOpErrorSchema,
-    failedOpWithRevertErrorSchema
+    failedOpWithRevertErrorSchema,
+    MempoolUserOperation,
+    is7702Type
 } from "@alto/types"
 import type { Logger } from "@alto/utils"
 import {
@@ -42,13 +44,30 @@ import {
     numberToHex,
     BaseError
 } from "viem"
+import { SignedAuthorizationList } from "viem/experimental"
 
 export const isTransactionUnderpricedError = (e: BaseError) => {
     return e?.details
         ?.toLowerCase()
         .includes("replacement transaction underpriced")
 }
 
+export const getAuthorizationList = (
+    mempoolUserOperations: MempoolUserOperation[]
+): SignedAuthorizationList | undefined => {
+    const authorizationList = mempoolUserOperations
+        .map((op) => {
+            if (is7702Type(op)) {
+                return op.authorization
+            }
+
+            return undefined
+        })
+        .filter((auth) => auth !== undefined) as SignedAuthorizationList
+
+    return authorizationList.length > 0 ? authorizationList : undefined
+}
+
 export function simulatedOpsToResults(
     simulatedOps: {
         owh: UserOperationWithHash
@@ -139,7 +158,8 @@ export async function filterOpsAndEstimateGas(
     onlyPre1559: boolean,
     fixedGasLimitForEstimation: bigint | undefined,
     reputationManager: InterfaceReputationManager,
-    logger: Logger
+    logger: Logger,
+    authorizationList?: SignedAuthorizationList
 ) {
     const simulatedOps: {
         owh: UserOperationWithHash
@@ -169,13 +189,11 @@ export async function filterOpsAndEstimateGas(
 
                 const opsToSend = simulatedOps
                     .filter((op) => op.reason === undefined)
-                    .map((op) => {
+                    .map(({ owh }) => {
+                        const op = deriveUserOperation(owh.mempoolUserOperation)
                         return isUserOpV06
-                            ? op.owh.mempoolUserOperation
-                            : toPackedUserOperation(
-                                  op.owh
-                                      .mempoolUserOperation as UserOperationV07
-                              )
+                            ? op
+                            : toPackedUserOperation(op as UserOperationV07)
                     })
 
                 gasLimit = await ep.estimateGas.handleOps(
@@ -188,6 +206,9 @@ export async function filterOpsAndEstimateGas(
                         ...(fixedEstimationGasLimit !== undefined && {
                             gas: fixedEstimationGasLimit
                         }),
+                        ...(authorizationList !== undefined && {
+                            authorizationList
+                        }),
                         ...gasOptions
                     }
                 )
@@ -391,6 +412,7 @@ export async function filterOpsAndEstimateGas(
     }
     return { simulatedOps, gasLimit: 0n }
 }
+
 export async function flushStuckTransaction(
     publicClient: PublicClient,
     walletClient: WalletClient<Transport, Chain, Account | undefined>,

diff --git a/src/mempool/mempool.ts b/src/mempool/mempool.ts
@@ -566,13 +566,13 @@ export class MemoryMempool {
                 )
             }
 
-            validationResult = await this.validator.validateUserOperation(
-                false,
-                op,
+            validationResult = await this.validator.validateUserOperation({
+                shouldCheckPrefund: false,
+                userOperation: op,
                 queuedUserOperations,
-                opInfo.entryPoint,
-                opInfo.referencedContracts
-            )
+                entryPoint: opInfo.entryPoint,
+                referencedContracts: opInfo.referencedContracts
+            })
         } catch (e) {
             this.logger.error(
                 {

diff --git a/src/rpc/estimation/gasEstimationHandler.ts b/src/rpc/estimation/gasEstimationHandler.ts
@@ -7,6 +7,7 @@ import { GasEstimatorV06 } from "./gasEstimationsV06"
 import { GasEstimatorV07 } from "./gasEstimationsV07"
 import type { SimulateHandleOpResult } from "./types"
 import type { AltoConfig } from "../../createConfig"
+import { SignedAuthorizationList } from "viem/experimental"
 
 function getStateOverrides({
     addSenderBalanceOverride,
@@ -47,6 +48,7 @@ export class GasEstimationHandler {
         entryPoint,
         targetAddress,
         targetCallData,
+        authorizationList,
         stateOverrides = {}
     }: {
         userOperation: UserOperation
@@ -56,6 +58,7 @@ export class GasEstimationHandler {
         entryPoint: Address
         targetAddress: Address
         targetCallData: Hex
+        authorizationList?: SignedAuthorizationList
         stateOverrides?: StateOverrides
     }): Promise<SimulateHandleOpResult> {
         let finalStateOverride = undefined
@@ -75,6 +78,7 @@ export class GasEstimationHandler {
                 entryPoint,
                 targetAddress,
                 targetCallData,
+                authorizationList,
                 stateOverrides: finalStateOverride
             })
         }
@@ -83,6 +87,7 @@ export class GasEstimationHandler {
             userOperation: userOperation as UserOperationV07,
             queuedUserOperations: queuedUserOperations as UserOperationV07[],
             entryPoint,
+            authorizationList,
             stateOverrides
         })
     }

diff --git a/src/rpc/estimation/gasEstimationsV06.ts b/src/rpc/estimation/gasEstimationsV06.ts
@@ -21,6 +21,8 @@ import type { SimulateHandleOpResult } from "./types"
 import type { AltoConfig } from "../../createConfig"
 import { deepHexlify } from "../../utils/userop"
 import { parseFailedOpWithRevert } from "./gasEstimationsV07"
+import { SignedAuthorizationList } from "viem/experimental"
+import { addAuthorizationStateOverrides } from "@alto/utils"
 
 export class GasEstimatorV06 {
     private config: AltoConfig
@@ -114,12 +116,14 @@ export class GasEstimatorV06 {
         targetCallData,
         entryPoint,
         useCodeOverride = true,
+        authorizationList,
         stateOverrides = undefined
     }: {
         userOperation: UserOperationV06
         targetAddress: Address
         targetCallData: Hex
         entryPoint: Address
+        authorizationList?: SignedAuthorizationList
         useCodeOverride?: boolean
         stateOverrides?: StateOverrides | undefined
     }): Promise<SimulateHandleOpResult> {
@@ -142,6 +146,14 @@ export class GasEstimatorV06 {
             }
         }
 
+        if (authorizationList) {
+            stateOverrides = await addAuthorizationStateOverrides({
+                stateOverrides,
+                authorizationList,
+                publicClient
+            })
+        }
+
         // Remove state override if not supported by network.
         if (!this.config.balanceOverride) {
             stateOverrides = undefined