@zerodev/sdk 4.0.34 → 4.1.1

package/src/kernel-zerodev/paymaster/base.ts

@@ -36,45 +36,51 @@ export abstract class Paymaster {
     paymasterProvider?: PaymasterAndBundlerProviders;
     shouldOverrideFee?: boolean;
   }): Promise<any> {
-    try {
-      const hexifiedUserOp = deepHexlify(await resolveProperties(userOp));
-      let resolvedERC20UserOp;
-      let hexifiedERC20UserOp: any;
-      if (erc20UserOp) {
-        resolvedERC20UserOp = await resolveProperties(erc20UserOp);
+    const hexifiedUserOp = deepHexlify(await resolveProperties(userOp));
+    let resolvedERC20UserOp;
+    let hexifiedERC20UserOp: any;
+    if (erc20UserOp) {
+      resolvedERC20UserOp = await resolveProperties(erc20UserOp);
 
-        hexifiedERC20UserOp = hexifyUserOp(resolvedERC20UserOp);
-      }
-      const chainId = await getChainId(this.provider.getProjectId());
-      if (!chainId) throw new Error("ChainId not found");
-      let requestBodyParams = Object.fromEntries(
-        Object.entries({
-          projectId: this.provider.getProjectId(),
-          chainId,
-          userOp: hexifiedUserOp,
-          entryPointAddress: ENTRYPOINT_ADDRESS,
-          callData: callData instanceof Promise ? await callData : callData,
-          tokenAddress: gasTokenAddress,
-          erc20UserOp: hexifiedERC20UserOp,
-          erc20CallData:
-            erc20CallData instanceof Promise
-              ? await erc20CallData
-              : erc20CallData,
-          paymasterProvider,
-          shouldOverrideFee,
-        }).filter(([_, value]) => value !== undefined)
-      );
-      const { data: paymasterResp } = await axios.post(
-        `${PAYMASTER_URL}/sign`,
-        {
-          ...requestBodyParams,
-        },
-        { headers: { "Content-Type": "application/json" } }
-      );
-      return paymasterResp;
-    } catch (error) {
-      console.log(error);
-      return undefined;
+      hexifiedERC20UserOp = hexifyUserOp(resolvedERC20UserOp);
     }
+    const chainId = await getChainId(this.provider.getProjectId());
+    if (!chainId) throw new Error("ChainId not found");
+    let requestBodyParams = Object.fromEntries(
+      Object.entries({
+        projectId: this.provider.getProjectId(),
+        chainId,
+        userOp: hexifiedUserOp,
+        entryPointAddress: ENTRYPOINT_ADDRESS,
+        callData: callData instanceof Promise ? await callData : callData,
+        gasTokenData:
+          gasTokenAddress && hexifiedERC20UserOp && erc20CallData
+            ? {
+                tokenAddress: gasTokenAddress,
+                erc20UserOp: hexifiedERC20UserOp,
+                erc20CallData:
+                  erc20CallData instanceof Promise
+                    ? await erc20CallData
+                    : erc20CallData,
+              }
+            : undefined,
+        tokenAddress: gasTokenAddress,
+        erc20UserOp: hexifiedERC20UserOp,
+        erc20CallData:
+          erc20CallData instanceof Promise
+            ? await erc20CallData
+            : erc20CallData,
+        paymasterProvider,
+        shouldOverrideFee,
+      }).filter(([_, value]) => value !== undefined)
+    );
+    const { data: paymasterResp } = await axios.post(
+      `${PAYMASTER_URL}/getPaymasterAndData`,
+      {
+        ...requestBodyParams,
+      },
+      { headers: { "Content-Type": "application/json" } }
+    );
+    return paymasterResp;
   }
 }

package/src/kernel-zerodev/paymaster/token-paymaster.ts

@@ -3,6 +3,7 @@ import {
   type BytesLike,
   type UserOperationCallData,
   type UserOperationStruct,
+  type BatchUserOperationCallData,
 } from "@alchemy/aa-core";
 import axios from "axios";
 import {
@@ -14,12 +15,11 @@ import {
 } from "viem";
 import { ERC20Abi } from "../abis/ERC20Abi.js";
 import { KernelAccountAbi } from "../abis/KernelAccountAbi.js";
-import { MultiSendAbi } from "../abis/MultiSendAbi.js";
 import {
   PAYMASTER_URL,
   ENTRYPOINT_ADDRESS,
-  MULTISEND_ADDR,
   ERC20_APPROVAL_AMOUNT,
+  MULTISEND_ADDR,
 } from "../constants.js";
 import {
   AccountNotConnected,
@@ -36,7 +36,13 @@ import {
   type PaymasterConfig,
 } from "./types.js";
 import { getChainId } from "../api/index.js";
+import { MultiSendAbi } from "../abis/MultiSendAbi.js";
 
+export function isBatchUserOperationCallData(
+  data: any
+): data is BatchUserOperationCallData {
+  return data && Array.isArray(data);
+}
 export class TokenPaymaster extends Paymaster {
   constructor(
     provider: ZeroDevProvider,
@@ -68,7 +74,12 @@ export class TokenPaymaster extends Paymaster {
   async decodeMainCallFromCallData(
     kernelAddress: PromiseOrValue<string>,
     callData: PromiseOrValue<BytesLike>
-  ): Promise<UserOperationCallDataWithDelegate | undefined> {
+  ): Promise<
+    | UserOperationCallData
+    | BatchUserOperationCallData
+    | UserOperationCallDataWithDelegate
+    | undefined
+  > {
     let data: Hex = "0x";
     if (callData instanceof Promise) {
       const _data = await callData;
@@ -113,6 +124,13 @@ export class TokenPaymaster extends Paymaster {
           };
         }
         return mainCall;
+      } else if (functionName === "executeBatch") {
+        const [txs] = args;
+        return txs.map((tx) => ({
+          target: tx.to,
+          value: tx.value ?? 0n,
+          data: tx.data,
+        }));
       }
     } catch (error) {
       return {
@@ -127,9 +145,11 @@ export class TokenPaymaster extends Paymaster {
     return;
   }
 
-  async getERC20UserOp(
+  async getERC20UserOp<
+    T extends UserOperationCallData | BatchUserOperationCallData
+  >(
     struct: UserOperationStruct,
-    mainCall: UserOperationCallDataWithDelegate,
+    mainCall: T,
     gasTokenAddress: Hex,
     paymasterAddress: Hex
   ): Promise<UserOperationStruct | undefined> {
@@ -146,10 +166,17 @@ export class TokenPaymaster extends Paymaster {
       if (!this.provider.account) {
         throw AccountNotConnected;
       }
-      const erc20CallData = await this.provider.account.encodeBatchExecute([
-        approveData,
-        mainCall,
-      ]);
+
+      let calls: BatchUserOperationCallData;
+
+      if (isBatchUserOperationCallData(mainCall)) {
+        calls = [approveData, ...mainCall];
+      } else {
+        calls = [approveData, mainCall];
+      }
+      const erc20CallData = await this.provider.account.encodeBatchExecute(
+        calls
+      );
       return {
         ...struct,
         callData: erc20CallData,
@@ -176,52 +203,46 @@ export class TokenPaymaster extends Paymaster {
     paymasterProvider?: PaymasterAndBundlerProviders,
     shouldOverrideFee?: boolean
   ): Promise<UserOperationStruct | undefined> {
-    try {
-      const mainCall = await this.decodeMainCallFromCallData(
-        struct.sender,
-        struct.callData
-      );
-      if (!mainCall) {
-        throw IncorrectCallDataForTokenPaymaster;
-      }
-      const chainId = await getChainId(this.provider.getProjectId());
-      if (!chainId) {
-        throw new Error("ChainId not found");
-      }
-      const gasTokenAddress = getGasTokenAddress(
-        this.paymasterConfig.gasToken,
-        chainId
+    const mainCall = await this.decodeMainCallFromCallData(
+      struct.sender,
+      struct.callData
+    );
+    if (!mainCall) {
+      throw IncorrectCallDataForTokenPaymaster;
+    }
+    const chainId = await getChainId(this.provider.getProjectId());
+    if (!chainId) {
+      throw new Error("ChainId not found");
+    }
+    const gasTokenAddress = getGasTokenAddress(
+      this.paymasterConfig.gasToken,
+      chainId
+    );
+    let paymasterAddress = await this.getPaymasterAddress(paymasterProvider);
+    if (
+      gasTokenAddress !== undefined &&
+      paymasterAddress !== undefined &&
+      isAddress(paymasterAddress)
+    ) {
+      const erc20UserOp = await this.getERC20UserOp(
+        struct,
+        mainCall,
+        gasTokenAddress,
+        paymasterAddress
       );
-      let paymasterAddress = await this.getPaymasterAddress(paymasterProvider);
-      if (
-        gasTokenAddress !== undefined &&
-        paymasterAddress !== undefined &&
-        isAddress(paymasterAddress)
-      ) {
-        const erc20UserOp = await this.getERC20UserOp(
-          struct,
-          mainCall,
-          gasTokenAddress,
-          paymasterAddress
-        );
-        if (!erc20UserOp) {
-          return;
-        }
-        const paymasterResp = await this.signUserOp({
-          userOp: struct,
-          callData: struct.callData,
-          gasTokenAddress,
-          erc20UserOp,
-          erc20CallData: erc20UserOp.callData,
-          paymasterProvider,
-          shouldOverrideFee,
-        });
-        if (paymasterResp) {
-          return paymasterResp;
-        }
+      if (!erc20UserOp) {
+        return;
       }
-    } catch (error) {
-      console.log(error);
+      const paymasterResp = await this.signUserOp({
+        userOp: struct,
+        callData: struct.callData,
+        gasTokenAddress,
+        erc20UserOp,
+        erc20CallData: erc20UserOp.callData,
+        paymasterProvider,
+        shouldOverrideFee,
+      });
+      return paymasterResp;
     }
     return;
   }

package/src/kernel-zerodev/paymaster/verifying-paymaster.ts

@@ -19,19 +19,12 @@ export class VerifyingPaymaster extends Paymaster {
     paymasterProvider?: PaymasterAndBundlerProviders,
     shouldOverrideFee?: boolean
   ): Promise<UserOperationStruct | undefined> {
-    try {
-      const hexifiedUserOp = deepHexlify(await resolveProperties(struct));
-      const paymasterResp = await this.signUserOp({
-        userOp: hexifiedUserOp,
-        paymasterProvider,
-        shouldOverrideFee,
-      });
-      if (paymasterResp) {
-        return paymasterResp;
-      }
-    } catch (error) {
-      console.log(error);
-    }
-    return;
+    const hexifiedUserOp = deepHexlify(await resolveProperties(struct));
+    const paymasterResp = await this.signUserOp({
+      userOp: hexifiedUserOp,
+      paymasterProvider,
+      shouldOverrideFee,
+    });
+    return paymasterResp;
   }
 }

package/src/kernel-zerodev/provider.ts

@@ -298,8 +298,7 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
   dummyPaymasterDataMiddleware: AccountMiddlewareFn = async (
     struct: UserOperationStruct
   ): Promise<UserOperationStruct> => {
-    struct.paymasterAndData =
-      "0xfe7dbcab8aaee4eb67943c1e6be95b1d065985c6000000000000000000000000000000000000000000000000000001869aa31cf400000000000000000000000000000000000000000000000000000000000000007dfe2190f34af27b265bae608717cdc9368b471fc0c097ab7b4088f255b4961e57b039e7e571b15221081c5dce7bcb93459b27a3ab65d2f8a889f4a40b4022801b";
+    struct.paymasterAndData = "0x";
     return struct;
   };