@zerodev/sdk 4.0.33 → 4.0.34

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

@@ -3,7 +3,6 @@ import {
   type BytesLike,
   type UserOperationCallData,
   type UserOperationStruct,
-  type BatchUserOperationCallData,
 } from "@alchemy/aa-core";
 import axios from "axios";
 import {
@@ -15,11 +14,12 @@ 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,
-  ERC20_APPROVAL_AMOUNT,
   MULTISEND_ADDR,
+  ERC20_APPROVAL_AMOUNT,
 } from "../constants.js";
 import {
   AccountNotConnected,
@@ -36,13 +36,7 @@ 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,
@@ -74,12 +68,7 @@ export class TokenPaymaster extends Paymaster {
   async decodeMainCallFromCallData(
     kernelAddress: PromiseOrValue<string>,
     callData: PromiseOrValue<BytesLike>
-  ): Promise<
-    | UserOperationCallData
-    | BatchUserOperationCallData
-    | UserOperationCallDataWithDelegate
-    | undefined
-  > {
+  ): Promise<UserOperationCallDataWithDelegate | undefined> {
     let data: Hex = "0x";
     if (callData instanceof Promise) {
       const _data = await callData;
@@ -124,13 +113,6 @@ 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 {
@@ -145,11 +127,9 @@ export class TokenPaymaster extends Paymaster {
     return;
   }
 
-  async getERC20UserOp<
-    T extends UserOperationCallData | BatchUserOperationCallData
-  >(
+  async getERC20UserOp(
     struct: UserOperationStruct,
-    mainCall: T,
+    mainCall: UserOperationCallDataWithDelegate,
     gasTokenAddress: Hex,
     paymasterAddress: Hex
   ): Promise<UserOperationStruct | undefined> {
@@ -166,17 +146,10 @@ export class TokenPaymaster extends Paymaster {
       if (!this.provider.account) {
         throw AccountNotConnected;
       }
-
-      let calls: BatchUserOperationCallData;
-
-      if (isBatchUserOperationCallData(mainCall)) {
-        calls = [approveData, ...mainCall];
-      } else {
-        calls = [approveData, mainCall];
-      }
-      const erc20CallData = await this.provider.account.encodeBatchExecute(
-        calls
-      );
+      const erc20CallData = await this.provider.account.encodeBatchExecute([
+        approveData,
+        mainCall,
+      ]);
       return {
         ...struct,
         callData: erc20CallData,
@@ -203,46 +176,52 @@ export class TokenPaymaster extends Paymaster {
     paymasterProvider?: PaymasterAndBundlerProviders,
     shouldOverrideFee?: boolean
   ): Promise<UserOperationStruct | undefined> {
-    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
+    try {
+      const mainCall = await this.decodeMainCallFromCallData(
+        struct.sender,
+        struct.callData
       );
-      if (!erc20UserOp) {
-        return;
+      if (!mainCall) {
+        throw IncorrectCallDataForTokenPaymaster;
       }
-      const paymasterResp = await this.signUserOp({
-        userOp: struct,
-        callData: struct.callData,
-        gasTokenAddress,
-        erc20UserOp,
-        erc20CallData: erc20UserOp.callData,
-        paymasterProvider,
-        shouldOverrideFee,
-      });
-      return paymasterResp;
+      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
+        );
+        if (!erc20UserOp) {
+          return;
+        }
+        const paymasterResp = await this.signUserOp({
+          userOp: struct,
+          callData: struct.callData,
+          gasTokenAddress,
+          erc20UserOp,
+          erc20CallData: erc20UserOp.callData,
+          paymasterProvider,
+          shouldOverrideFee,
+        });
+        if (paymasterResp) {
+          return paymasterResp;
+        }
+      }
+    } catch (error) {
+      console.log(error);
     }
     return;
   }

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

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

package/src/kernel-zerodev/provider.ts

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