@zerodev/sdk 4.0.28 → 4.0.29

package/dist/cjs/kernel-zerodev/paymaster/token-paymaster.js

@@ -125,6 +125,10 @@ class TokenPaymaster extends base_js_1.Paymaster {
                     to: await this.provider.getAddress(),
                     data: erc20CallData,
                 }),
+                signature: await this.provider
+                    .getAccount()
+                    .getValidator()
+                    .getDynamicDummySignature((await struct.sender), erc20CallData),
             };
         }
         catch (error) {
@@ -148,7 +152,7 @@ class TokenPaymaster extends base_js_1.Paymaster {
                 (0, viem_1.isAddress)(paymasterAddress)) {
                 const erc20UserOp = await this.getERC20UserOp(struct, mainCall, gasTokenAddress, paymasterAddress);
                 if (!erc20UserOp) {
-                    return struct;
+                    return;
                 }
                 const paymasterResp = await this.signUserOp({
                     userOp: struct,

package/dist/cjs/kernel-zerodev/paymaster/token-paymaster.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-paymaster.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/token-paymaster.ts"],"names":[],"mappings":";;;;;;AAMA,kDAA0B;AAC1B,+BAMc;AACd,qDAA+C;AAC/C,qEAA+D;AAC/D,6DAAuD;AACvD,kDAKyB;AACzB,4CAGsB;AAEtB,0CAGqB;AACrB,uCAAsC;AAKtC,8CAA6C;AAE7C,MAAa,cAAe,SAAQ,mBAAS;IAC3C,YACE,QAAyB,EACf,eAAmD;QAE7D,KAAK,CAAC,QAAQ,CAAC,CAAC;QAFhB;;;;mBAAU,eAAe;WAAoC;IAG/D,CAAC;IACD,KAAK,CAAC,mBAAmB,CACvB,iBAAgD;QAEhD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;QAE/D,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,eAAK,CAAC,IAAI,CAC9C,GAAG,4BAAa,sBAAsB,EACtC;gBACE,OAAO;gBACP,iBAAiB,EAAE,iCAAkB;gBACrC,iBAAiB;aAClB,EACD,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,CACpD,CAAC;YACF,OAAO,aAAoB,CAAC;SAC7B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IACD,KAAK,CAAC,0BAA0B,CAC9B,aAAqC,EACrC,QAAmC;QAEnC,IAAI,IAAI,GAAQ,IAAI,CAAC;QACrB,IAAI,QAAQ,YAAY,OAAO,EAAE;YAC/B,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC;YAC7B,IAAI,KAAK,YAAY,UAAU,EAAE;gBAC/B,IAAI,GAAG,IAAA,YAAK,EAAC,KAAK,CAAC,CAAC;aACrB;iBAAM;gBACL,IAAI,GAAG,KAAY,CAAC;aACrB;SACF;aAAM,IAAI,QAAQ,YAAY,UAAU,EAAE;YACzC,IAAI,GAAG,IAAA,YAAK,EAAC,QAAQ,CAAC,CAAC;SACxB;aAAM;YACL,IAAI,GAAG,QAAe,CAAC;SACxB;QAED,IAAI;YACF,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,IAAA,yBAAkB,EAAC;gBAChD,GAAG,EAAE,sCAAgB;gBACrB,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;YACH,IAAI,YAAY,KAAK,SAAS,EAAE;gBAC9B,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC;gBACnC,IAAI,aAAa,CAAC;gBAClB,IAAI;oBACF,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAA,yBAAkB,EAAC;wBACpD,GAAG,EAAE,8BAAY;wBACjB,IAAI;qBACL,CAAC,CAAC,CAAC;iBACL;gBAAC,OAAO,KAAK,EAAE,GAAE;gBAClB,IAAI,QAAQ,GAE4B;oBACtC,MAAM;oBACN,KAAK,EAAE,KAAK,IAAI,EAAE;oBAClB,IAAI;iBACL,CAAC;gBACF,IAAI,aAAa,KAAK,WAAW,EAAE;oBACjC,QAAQ,GAAG;wBACT,GAAG,QAAQ;wBACX,MAAM,EAAE,6BAAc;wBACtB,YAAY,EAAE,IAAI;wBAClB,IAAI;qBACL,CAAC;iBACH;gBACD,OAAO,QAAQ,CAAC;aACjB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO;gBACL,MAAM,EAAE,CAAC,aAAa,YAAY,OAAO;oBACvC,CAAC,CAAC,MAAM,aAAa;oBACrB,CAAC,CAAC,aAAa,CAAQ;gBACzB,IAAI;gBACJ,KAAK,EAAE,EAAE;gBACT,YAAY,EAAE,IAAI;aACnB,CAAC;SACH;QACD,OAAO;IACT,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,MAA2B,EAC3B,QAA2C,EAC3C,eAAoB,EACpB,gBAAqB;QAErB,IAAI;YACF,MAAM,WAAW,GAA0B;gBACzC,MAAM,EAAE,eAAe;gBACvB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;gBAChB,IAAI,EAAE,IAAA,yBAAkB,EAAC;oBACvB,GAAG,EAAE,sBAAQ;oBACb,YAAY,EAAE,SAAS;oBACvB,IAAI,EAAE,CAAC,gBAAgB,EAAE,oCAAqB,CAAC,eAAe,CAAC,CAAC;iBACjE,CAAC;aACH,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAC1B,MAAM,+BAAmB,CAAC;aAC3B;YACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC;gBACnE,WAAW;gBACX,QAAQ;aACT,CAAC,CAAC;YACH,OAAO;gBACL,GAAG,MAAM;gBACT,QAAQ,EAAE,aAAa;gBACvB,YAAY,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC;oBACtD,OAAO,EAAE,iCAAkB;oBAC3B,EAAE,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;oBACpC,IAAI,EAAE,aAAa;iBACpB,CAAC;aACH,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,OAAO;SACR;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,MAA2B,EAC3B,iBAAgD,EAChD,iBAA2B;QAE3B,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,0BAA0B,CACpD,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,QAAQ,CAChB,CAAC;YACF,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,8CAAkC,CAAC;aAC1C;YACD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;YAC/D,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACtC;YACD,MAAM,eAAe,GAAG,IAAA,6BAAkB,EACxC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAC7B,OAAO,CACR,CAAC;YACF,IAAI,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;YACzE,IACE,eAAe,KAAK,SAAS;gBAC7B,gBAAgB,KAAK,SAAS;gBAC9B,IAAA,gBAAS,EAAC,gBAAgB,CAAC,EAC3B;gBACA,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAC3C,MAAM,EACN,QAAQ,EACR,eAAe,EACf,gBAAgB,CACjB,CAAC;gBACF,IAAI,CAAC,WAAW,EAAE;oBAChB,OAAO,MAAM,CAAC;iBACf;gBACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;oBAC1C,MAAM,EAAE,MAAM;oBACd,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,eAAe;oBACf,WAAW;oBACX,aAAa,EAAE,WAAW,CAAC,QAAQ;oBACnC,iBAAiB;oBACjB,iBAAiB;iBAClB,CAAC,CAAC;gBACH,IAAI,aAAa,EAAE;oBACjB,OAAO,aAAa,CAAC;iBACtB;aACF;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACpB;QACD,OAAO;IACT,CAAC;CACF;AArLD,wCAqLC","sourcesContent":["import {\n  type PromiseOrValue,\n  type BytesLike,\n  type UserOperationCallData,\n  type UserOperationStruct,\n} from \"@alchemy/aa-core\";\nimport axios from \"axios\";\nimport {\n  type Hex,\n  toHex,\n  decodeFunctionData,\n  encodeFunctionData,\n  isAddress,\n} from \"viem\";\nimport { ERC20Abi } from \"../abis/ERC20Abi.js\";\nimport { KernelAccountAbi } from \"../abis/KernelAccountAbi.js\";\nimport { MultiSendAbi } from \"../abis/MultiSendAbi.js\";\nimport {\n  PAYMASTER_URL,\n  ENTRYPOINT_ADDRESS,\n  MULTISEND_ADDR,\n  ERC20_APPROVAL_AMOUNT,\n} from \"../constants.js\";\nimport {\n  AccountNotConnected,\n  IncorrectCallDataForTokenPaymaster,\n} from \"../errors.js\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport {\n  getGasTokenAddress,\n  type UserOperationCallDataWithDelegate,\n} from \"../utils.js\";\nimport { Paymaster } from \"./base.js\";\nimport {\n  type PaymasterAndBundlerProviders,\n  type PaymasterConfig,\n} from \"./types.js\";\nimport { getChainId } from \"../api/index.js\";\n\nexport class TokenPaymaster extends Paymaster {\n  constructor(\n    provider: ZeroDevProvider,\n    protected paymasterConfig: PaymasterConfig<\"TOKEN_PAYMASTER\">\n  ) {\n    super(provider);\n  }\n  async getPaymasterAddress(\n    paymasterProvider?: PaymasterAndBundlerProviders\n  ): Promise<Hex | undefined> {\n    const chainId = await getChainId(this.provider.getProjectId());\n\n    try {\n      const { data: paymasterResp } = await axios.post(\n        `${PAYMASTER_URL}/getPaymasterAddress`,\n        {\n          chainId,\n          entryPointAddress: ENTRYPOINT_ADDRESS,\n          paymasterProvider,\n        },\n        { headers: { \"Content-Type\": \"application/json\" } }\n      );\n      return paymasterResp as Hex;\n    } catch (e) {\n      console.log(e);\n      return undefined;\n    }\n  }\n  async decodeMainCallFromCallData(\n    kernelAddress: PromiseOrValue<string>,\n    callData: PromiseOrValue<BytesLike>\n  ): Promise<UserOperationCallDataWithDelegate | undefined> {\n    let data: Hex = \"0x\";\n    if (callData instanceof Promise) {\n      const _data = await callData;\n      if (_data instanceof Uint8Array) {\n        data = toHex(_data);\n      } else {\n        data = _data as Hex;\n      }\n    } else if (callData instanceof Uint8Array) {\n      data = toHex(callData);\n    } else {\n      data = callData as Hex;\n    }\n\n    try {\n      const { functionName, args } = decodeFunctionData({\n        abi: KernelAccountAbi,\n        data: data,\n      });\n      if (functionName === \"execute\") {\n        const [target, value, data] = args;\n        let msFuntionName;\n        try {\n          ({ functionName: msFuntionName } = decodeFunctionData({\n            abi: MultiSendAbi,\n            data,\n          }));\n        } catch (error) {}\n        let mainCall:\n          | UserOperationCallData\n          | UserOperationCallDataWithDelegate = {\n          target,\n          value: value ?? 0n,\n          data,\n        };\n        if (msFuntionName === \"multiSend\") {\n          mainCall = {\n            ...mainCall,\n            target: MULTISEND_ADDR,\n            delegateCall: true,\n            data,\n          };\n        }\n        return mainCall;\n      }\n    } catch (error) {\n      return {\n        target: (kernelAddress instanceof Promise\n          ? await kernelAddress\n          : kernelAddress) as Hex,\n        data,\n        value: 0n,\n        delegateCall: true,\n      };\n    }\n    return;\n  }\n\n  async getERC20UserOp(\n    struct: UserOperationStruct,\n    mainCall: UserOperationCallDataWithDelegate,\n    gasTokenAddress: Hex,\n    paymasterAddress: Hex\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const approveData: UserOperationCallData = {\n        target: gasTokenAddress,\n        value: BigInt(0),\n        data: encodeFunctionData({\n          abi: ERC20Abi,\n          functionName: \"approve\",\n          args: [paymasterAddress, ERC20_APPROVAL_AMOUNT[gasTokenAddress]],\n        }),\n      };\n      if (!this.provider.account) {\n        throw AccountNotConnected;\n      }\n      const erc20CallData = await this.provider.account.encodeBatchExecute([\n        approveData,\n        mainCall,\n      ]);\n      return {\n        ...struct,\n        callData: erc20CallData,\n        callGasLimit: await this.provider.rpcClient.estimateGas({\n          account: ENTRYPOINT_ADDRESS,\n          to: await this.provider.getAddress(),\n          data: erc20CallData,\n        }),\n      };\n    } catch (error) {\n      return;\n    }\n  }\n\n  async getPaymasterResponse(\n    struct: UserOperationStruct,\n    paymasterProvider?: PaymasterAndBundlerProviders,\n    shouldOverrideFee?: boolean\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const mainCall = await this.decodeMainCallFromCallData(\n        struct.sender,\n        struct.callData\n      );\n      if (!mainCall) {\n        throw IncorrectCallDataForTokenPaymaster;\n      }\n      const chainId = await getChainId(this.provider.getProjectId());\n      if (!chainId) {\n        throw new Error(\"ChainId not found\");\n      }\n      const gasTokenAddress = getGasTokenAddress(\n        this.paymasterConfig.gasToken,\n        chainId\n      );\n      let paymasterAddress = await this.getPaymasterAddress(paymasterProvider);\n      if (\n        gasTokenAddress !== undefined &&\n        paymasterAddress !== undefined &&\n        isAddress(paymasterAddress)\n      ) {\n        const erc20UserOp = await this.getERC20UserOp(\n          struct,\n          mainCall,\n          gasTokenAddress,\n          paymasterAddress\n        );\n        if (!erc20UserOp) {\n          return struct;\n        }\n        const paymasterResp = await this.signUserOp({\n          userOp: struct,\n          callData: struct.callData,\n          gasTokenAddress,\n          erc20UserOp,\n          erc20CallData: erc20UserOp.callData,\n          paymasterProvider,\n          shouldOverrideFee,\n        });\n        if (paymasterResp) {\n          return paymasterResp;\n        }\n      }\n    } catch (error) {\n      console.log(error);\n    }\n    return;\n  }\n}\n"]}
+{"version":3,"file":"token-paymaster.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/token-paymaster.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type PromiseOrValue,\n  type BytesLike,\n  type UserOperationCallData,\n  type UserOperationStruct,\n} from \"@alchemy/aa-core\";\nimport axios from \"axios\";\nimport {\n  type Hex,\n  toHex,\n  decodeFunctionData,\n  encodeFunctionData,\n  isAddress,\n} from \"viem\";\nimport { ERC20Abi } from \"../abis/ERC20Abi.js\";\nimport { KernelAccountAbi } from \"../abis/KernelAccountAbi.js\";\nimport { MultiSendAbi } from \"../abis/MultiSendAbi.js\";\nimport {\n  PAYMASTER_URL,\n  ENTRYPOINT_ADDRESS,\n  MULTISEND_ADDR,\n  ERC20_APPROVAL_AMOUNT,\n} from \"../constants.js\";\nimport {\n  AccountNotConnected,\n  IncorrectCallDataForTokenPaymaster,\n} from \"../errors.js\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport {\n  getGasTokenAddress,\n  type UserOperationCallDataWithDelegate,\n} from \"../utils.js\";\nimport { Paymaster } from \"./base.js\";\nimport {\n  type PaymasterAndBundlerProviders,\n  type PaymasterConfig,\n} from \"./types.js\";\nimport { getChainId } from \"../api/index.js\";\n\nexport class TokenPaymaster extends Paymaster {\n  constructor(\n    provider: ZeroDevProvider,\n    protected paymasterConfig: PaymasterConfig<\"TOKEN_PAYMASTER\">\n  ) {\n    super(provider);\n  }\n  async getPaymasterAddress(\n    paymasterProvider?: PaymasterAndBundlerProviders\n  ): Promise<Hex | undefined> {\n    const chainId = await getChainId(this.provider.getProjectId());\n\n    try {\n      const { data: paymasterResp } = await axios.post(\n        `${PAYMASTER_URL}/getPaymasterAddress`,\n        {\n          chainId,\n          entryPointAddress: ENTRYPOINT_ADDRESS,\n          paymasterProvider,\n        },\n        { headers: { \"Content-Type\": \"application/json\" } }\n      );\n      return paymasterResp as Hex;\n    } catch (e) {\n      console.log(e);\n      return undefined;\n    }\n  }\n  async decodeMainCallFromCallData(\n    kernelAddress: PromiseOrValue<string>,\n    callData: PromiseOrValue<BytesLike>\n  ): Promise<UserOperationCallDataWithDelegate | undefined> {\n    let data: Hex = \"0x\";\n    if (callData instanceof Promise) {\n      const _data = await callData;\n      if (_data instanceof Uint8Array) {\n        data = toHex(_data);\n      } else {\n        data = _data as Hex;\n      }\n    } else if (callData instanceof Uint8Array) {\n      data = toHex(callData);\n    } else {\n      data = callData as Hex;\n    }\n\n    try {\n      const { functionName, args } = decodeFunctionData({\n        abi: KernelAccountAbi,\n        data: data,\n      });\n      if (functionName === \"execute\") {\n        const [target, value, data] = args;\n        let msFuntionName;\n        try {\n          ({ functionName: msFuntionName } = decodeFunctionData({\n            abi: MultiSendAbi,\n            data,\n          }));\n        } catch (error) {}\n        let mainCall:\n          | UserOperationCallData\n          | UserOperationCallDataWithDelegate = {\n          target,\n          value: value ?? 0n,\n          data,\n        };\n        if (msFuntionName === \"multiSend\") {\n          mainCall = {\n            ...mainCall,\n            target: MULTISEND_ADDR,\n            delegateCall: true,\n            data,\n          };\n        }\n        return mainCall;\n      }\n    } catch (error) {\n      return {\n        target: (kernelAddress instanceof Promise\n          ? await kernelAddress\n          : kernelAddress) as Hex,\n        data,\n        value: 0n,\n        delegateCall: true,\n      };\n    }\n    return;\n  }\n\n  async getERC20UserOp(\n    struct: UserOperationStruct,\n    mainCall: UserOperationCallDataWithDelegate,\n    gasTokenAddress: Hex,\n    paymasterAddress: Hex\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const approveData: UserOperationCallData = {\n        target: gasTokenAddress,\n        value: BigInt(0),\n        data: encodeFunctionData({\n          abi: ERC20Abi,\n          functionName: \"approve\",\n          args: [paymasterAddress, ERC20_APPROVAL_AMOUNT[gasTokenAddress]],\n        }),\n      };\n      if (!this.provider.account) {\n        throw AccountNotConnected;\n      }\n      const erc20CallData = await this.provider.account.encodeBatchExecute([\n        approveData,\n        mainCall,\n      ]);\n      return {\n        ...struct,\n        callData: erc20CallData,\n        callGasLimit: await this.provider.rpcClient.estimateGas({\n          account: ENTRYPOINT_ADDRESS,\n          to: await this.provider.getAddress(),\n          data: erc20CallData,\n        }),\n        signature: await this.provider\n          .getAccount()\n          .getValidator()\n          .getDynamicDummySignature(\n            (await struct.sender) as Hex,\n            erc20CallData\n          ),\n      };\n    } catch (error) {\n      return;\n    }\n  }\n\n  async getPaymasterResponse(\n    struct: UserOperationStruct,\n    paymasterProvider?: PaymasterAndBundlerProviders,\n    shouldOverrideFee?: boolean\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const mainCall = await this.decodeMainCallFromCallData(\n        struct.sender,\n        struct.callData\n      );\n      if (!mainCall) {\n        throw IncorrectCallDataForTokenPaymaster;\n      }\n      const chainId = await getChainId(this.provider.getProjectId());\n      if (!chainId) {\n        throw new Error(\"ChainId not found\");\n      }\n      const gasTokenAddress = getGasTokenAddress(\n        this.paymasterConfig.gasToken,\n        chainId\n      );\n      let paymasterAddress = await this.getPaymasterAddress(paymasterProvider);\n      if (\n        gasTokenAddress !== undefined &&\n        paymasterAddress !== undefined &&\n        isAddress(paymasterAddress)\n      ) {\n        const erc20UserOp = await this.getERC20UserOp(\n          struct,\n          mainCall,\n          gasTokenAddress,\n          paymasterAddress\n        );\n        if (!erc20UserOp) {\n          return;\n        }\n        const paymasterResp = await this.signUserOp({\n          userOp: struct,\n          callData: struct.callData,\n          gasTokenAddress,\n          erc20UserOp,\n          erc20CallData: erc20UserOp.callData,\n          paymasterProvider,\n          shouldOverrideFee,\n        });\n        if (paymasterResp) {\n          return paymasterResp;\n        }\n      }\n    } catch (error) {\n      console.log(error);\n    }\n    return;\n  }\n}\n"]}

package/dist/esm/kernel-zerodev/paymaster/token-paymaster.js

@@ -121,6 +121,10 @@ export class TokenPaymaster extends Paymaster {
                     to: await this.provider.getAddress(),
                     data: erc20CallData,
                 }),
+                signature: await this.provider
+                    .getAccount()
+                    .getValidator()
+                    .getDynamicDummySignature((await struct.sender), erc20CallData),
             };
         }
         catch (error) {
@@ -144,7 +148,7 @@ export class TokenPaymaster extends Paymaster {
                 isAddress(paymasterAddress)) {
                 const erc20UserOp = await this.getERC20UserOp(struct, mainCall, gasTokenAddress, paymasterAddress);
                 if (!erc20UserOp) {
-                    return struct;
+                    return;
                 }
                 const paymasterResp = await this.signUserOp({
                     userOp: struct,

package/dist/esm/kernel-zerodev/paymaster/token-paymaster.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-paymaster.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/token-paymaster.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type PromiseOrValue,\n  type BytesLike,\n  type UserOperationCallData,\n  type UserOperationStruct,\n} from \"@alchemy/aa-core\";\nimport axios from \"axios\";\nimport {\n  type Hex,\n  toHex,\n  decodeFunctionData,\n  encodeFunctionData,\n  isAddress,\n} from \"viem\";\nimport { ERC20Abi } from \"../abis/ERC20Abi.js\";\nimport { KernelAccountAbi } from \"../abis/KernelAccountAbi.js\";\nimport { MultiSendAbi } from \"../abis/MultiSendAbi.js\";\nimport {\n  PAYMASTER_URL,\n  ENTRYPOINT_ADDRESS,\n  MULTISEND_ADDR,\n  ERC20_APPROVAL_AMOUNT,\n} from \"../constants.js\";\nimport {\n  AccountNotConnected,\n  IncorrectCallDataForTokenPaymaster,\n} from \"../errors.js\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport {\n  getGasTokenAddress,\n  type UserOperationCallDataWithDelegate,\n} from \"../utils.js\";\nimport { Paymaster } from \"./base.js\";\nimport {\n  type PaymasterAndBundlerProviders,\n  type PaymasterConfig,\n} from \"./types.js\";\nimport { getChainId } from \"../api/index.js\";\n\nexport class TokenPaymaster extends Paymaster {\n  constructor(\n    provider: ZeroDevProvider,\n    protected paymasterConfig: PaymasterConfig<\"TOKEN_PAYMASTER\">\n  ) {\n    super(provider);\n  }\n  async getPaymasterAddress(\n    paymasterProvider?: PaymasterAndBundlerProviders\n  ): Promise<Hex | undefined> {\n    const chainId = await getChainId(this.provider.getProjectId());\n\n    try {\n      const { data: paymasterResp } = await axios.post(\n        `${PAYMASTER_URL}/getPaymasterAddress`,\n        {\n          chainId,\n          entryPointAddress: ENTRYPOINT_ADDRESS,\n          paymasterProvider,\n        },\n        { headers: { \"Content-Type\": \"application/json\" } }\n      );\n      return paymasterResp as Hex;\n    } catch (e) {\n      console.log(e);\n      return undefined;\n    }\n  }\n  async decodeMainCallFromCallData(\n    kernelAddress: PromiseOrValue<string>,\n    callData: PromiseOrValue<BytesLike>\n  ): Promise<UserOperationCallDataWithDelegate | undefined> {\n    let data: Hex = \"0x\";\n    if (callData instanceof Promise) {\n      const _data = await callData;\n      if (_data instanceof Uint8Array) {\n        data = toHex(_data);\n      } else {\n        data = _data as Hex;\n      }\n    } else if (callData instanceof Uint8Array) {\n      data = toHex(callData);\n    } else {\n      data = callData as Hex;\n    }\n\n    try {\n      const { functionName, args } = decodeFunctionData({\n        abi: KernelAccountAbi,\n        data: data,\n      });\n      if (functionName === \"execute\") {\n        const [target, value, data] = args;\n        let msFuntionName;\n        try {\n          ({ functionName: msFuntionName } = decodeFunctionData({\n            abi: MultiSendAbi,\n            data,\n          }));\n        } catch (error) {}\n        let mainCall:\n          | UserOperationCallData\n          | UserOperationCallDataWithDelegate = {\n          target,\n          value: value ?? 0n,\n          data,\n        };\n        if (msFuntionName === \"multiSend\") {\n          mainCall = {\n            ...mainCall,\n            target: MULTISEND_ADDR,\n            delegateCall: true,\n            data,\n          };\n        }\n        return mainCall;\n      }\n    } catch (error) {\n      return {\n        target: (kernelAddress instanceof Promise\n          ? await kernelAddress\n          : kernelAddress) as Hex,\n        data,\n        value: 0n,\n        delegateCall: true,\n      };\n    }\n    return;\n  }\n\n  async getERC20UserOp(\n    struct: UserOperationStruct,\n    mainCall: UserOperationCallDataWithDelegate,\n    gasTokenAddress: Hex,\n    paymasterAddress: Hex\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const approveData: UserOperationCallData = {\n        target: gasTokenAddress,\n        value: BigInt(0),\n        data: encodeFunctionData({\n          abi: ERC20Abi,\n          functionName: \"approve\",\n          args: [paymasterAddress, ERC20_APPROVAL_AMOUNT[gasTokenAddress]],\n        }),\n      };\n      if (!this.provider.account) {\n        throw AccountNotConnected;\n      }\n      const erc20CallData = await this.provider.account.encodeBatchExecute([\n        approveData,\n        mainCall,\n      ]);\n      return {\n        ...struct,\n        callData: erc20CallData,\n        callGasLimit: await this.provider.rpcClient.estimateGas({\n          account: ENTRYPOINT_ADDRESS,\n          to: await this.provider.getAddress(),\n          data: erc20CallData,\n        }),\n      };\n    } catch (error) {\n      return;\n    }\n  }\n\n  async getPaymasterResponse(\n    struct: UserOperationStruct,\n    paymasterProvider?: PaymasterAndBundlerProviders,\n    shouldOverrideFee?: boolean\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const mainCall = await this.decodeMainCallFromCallData(\n        struct.sender,\n        struct.callData\n      );\n      if (!mainCall) {\n        throw IncorrectCallDataForTokenPaymaster;\n      }\n      const chainId = await getChainId(this.provider.getProjectId());\n      if (!chainId) {\n        throw new Error(\"ChainId not found\");\n      }\n      const gasTokenAddress = getGasTokenAddress(\n        this.paymasterConfig.gasToken,\n        chainId\n      );\n      let paymasterAddress = await this.getPaymasterAddress(paymasterProvider);\n      if (\n        gasTokenAddress !== undefined &&\n        paymasterAddress !== undefined &&\n        isAddress(paymasterAddress)\n      ) {\n        const erc20UserOp = await this.getERC20UserOp(\n          struct,\n          mainCall,\n          gasTokenAddress,\n          paymasterAddress\n        );\n        if (!erc20UserOp) {\n          return struct;\n        }\n        const paymasterResp = await this.signUserOp({\n          userOp: struct,\n          callData: struct.callData,\n          gasTokenAddress,\n          erc20UserOp,\n          erc20CallData: erc20UserOp.callData,\n          paymasterProvider,\n          shouldOverrideFee,\n        });\n        if (paymasterResp) {\n          return paymasterResp;\n        }\n      }\n    } catch (error) {\n      console.log(error);\n    }\n    return;\n  }\n}\n"]}
+{"version":3,"file":"token-paymaster.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/token-paymaster.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type PromiseOrValue,\n  type BytesLike,\n  type UserOperationCallData,\n  type UserOperationStruct,\n} from \"@alchemy/aa-core\";\nimport axios from \"axios\";\nimport {\n  type Hex,\n  toHex,\n  decodeFunctionData,\n  encodeFunctionData,\n  isAddress,\n} from \"viem\";\nimport { ERC20Abi } from \"../abis/ERC20Abi.js\";\nimport { KernelAccountAbi } from \"../abis/KernelAccountAbi.js\";\nimport { MultiSendAbi } from \"../abis/MultiSendAbi.js\";\nimport {\n  PAYMASTER_URL,\n  ENTRYPOINT_ADDRESS,\n  MULTISEND_ADDR,\n  ERC20_APPROVAL_AMOUNT,\n} from \"../constants.js\";\nimport {\n  AccountNotConnected,\n  IncorrectCallDataForTokenPaymaster,\n} from \"../errors.js\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport {\n  getGasTokenAddress,\n  type UserOperationCallDataWithDelegate,\n} from \"../utils.js\";\nimport { Paymaster } from \"./base.js\";\nimport {\n  type PaymasterAndBundlerProviders,\n  type PaymasterConfig,\n} from \"./types.js\";\nimport { getChainId } from \"../api/index.js\";\n\nexport class TokenPaymaster extends Paymaster {\n  constructor(\n    provider: ZeroDevProvider,\n    protected paymasterConfig: PaymasterConfig<\"TOKEN_PAYMASTER\">\n  ) {\n    super(provider);\n  }\n  async getPaymasterAddress(\n    paymasterProvider?: PaymasterAndBundlerProviders\n  ): Promise<Hex | undefined> {\n    const chainId = await getChainId(this.provider.getProjectId());\n\n    try {\n      const { data: paymasterResp } = await axios.post(\n        `${PAYMASTER_URL}/getPaymasterAddress`,\n        {\n          chainId,\n          entryPointAddress: ENTRYPOINT_ADDRESS,\n          paymasterProvider,\n        },\n        { headers: { \"Content-Type\": \"application/json\" } }\n      );\n      return paymasterResp as Hex;\n    } catch (e) {\n      console.log(e);\n      return undefined;\n    }\n  }\n  async decodeMainCallFromCallData(\n    kernelAddress: PromiseOrValue<string>,\n    callData: PromiseOrValue<BytesLike>\n  ): Promise<UserOperationCallDataWithDelegate | undefined> {\n    let data: Hex = \"0x\";\n    if (callData instanceof Promise) {\n      const _data = await callData;\n      if (_data instanceof Uint8Array) {\n        data = toHex(_data);\n      } else {\n        data = _data as Hex;\n      }\n    } else if (callData instanceof Uint8Array) {\n      data = toHex(callData);\n    } else {\n      data = callData as Hex;\n    }\n\n    try {\n      const { functionName, args } = decodeFunctionData({\n        abi: KernelAccountAbi,\n        data: data,\n      });\n      if (functionName === \"execute\") {\n        const [target, value, data] = args;\n        let msFuntionName;\n        try {\n          ({ functionName: msFuntionName } = decodeFunctionData({\n            abi: MultiSendAbi,\n            data,\n          }));\n        } catch (error) {}\n        let mainCall:\n          | UserOperationCallData\n          | UserOperationCallDataWithDelegate = {\n          target,\n          value: value ?? 0n,\n          data,\n        };\n        if (msFuntionName === \"multiSend\") {\n          mainCall = {\n            ...mainCall,\n            target: MULTISEND_ADDR,\n            delegateCall: true,\n            data,\n          };\n        }\n        return mainCall;\n      }\n    } catch (error) {\n      return {\n        target: (kernelAddress instanceof Promise\n          ? await kernelAddress\n          : kernelAddress) as Hex,\n        data,\n        value: 0n,\n        delegateCall: true,\n      };\n    }\n    return;\n  }\n\n  async getERC20UserOp(\n    struct: UserOperationStruct,\n    mainCall: UserOperationCallDataWithDelegate,\n    gasTokenAddress: Hex,\n    paymasterAddress: Hex\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const approveData: UserOperationCallData = {\n        target: gasTokenAddress,\n        value: BigInt(0),\n        data: encodeFunctionData({\n          abi: ERC20Abi,\n          functionName: \"approve\",\n          args: [paymasterAddress, ERC20_APPROVAL_AMOUNT[gasTokenAddress]],\n        }),\n      };\n      if (!this.provider.account) {\n        throw AccountNotConnected;\n      }\n      const erc20CallData = await this.provider.account.encodeBatchExecute([\n        approveData,\n        mainCall,\n      ]);\n      return {\n        ...struct,\n        callData: erc20CallData,\n        callGasLimit: await this.provider.rpcClient.estimateGas({\n          account: ENTRYPOINT_ADDRESS,\n          to: await this.provider.getAddress(),\n          data: erc20CallData,\n        }),\n        signature: await this.provider\n          .getAccount()\n          .getValidator()\n          .getDynamicDummySignature(\n            (await struct.sender) as Hex,\n            erc20CallData\n          ),\n      };\n    } catch (error) {\n      return;\n    }\n  }\n\n  async getPaymasterResponse(\n    struct: UserOperationStruct,\n    paymasterProvider?: PaymasterAndBundlerProviders,\n    shouldOverrideFee?: boolean\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const mainCall = await this.decodeMainCallFromCallData(\n        struct.sender,\n        struct.callData\n      );\n      if (!mainCall) {\n        throw IncorrectCallDataForTokenPaymaster;\n      }\n      const chainId = await getChainId(this.provider.getProjectId());\n      if (!chainId) {\n        throw new Error(\"ChainId not found\");\n      }\n      const gasTokenAddress = getGasTokenAddress(\n        this.paymasterConfig.gasToken,\n        chainId\n      );\n      let paymasterAddress = await this.getPaymasterAddress(paymasterProvider);\n      if (\n        gasTokenAddress !== undefined &&\n        paymasterAddress !== undefined &&\n        isAddress(paymasterAddress)\n      ) {\n        const erc20UserOp = await this.getERC20UserOp(\n          struct,\n          mainCall,\n          gasTokenAddress,\n          paymasterAddress\n        );\n        if (!erc20UserOp) {\n          return;\n        }\n        const paymasterResp = await this.signUserOp({\n          userOp: struct,\n          callData: struct.callData,\n          gasTokenAddress,\n          erc20UserOp,\n          erc20CallData: erc20UserOp.callData,\n          paymasterProvider,\n          shouldOverrideFee,\n        });\n        if (paymasterResp) {\n          return paymasterResp;\n        }\n      }\n    } catch (error) {\n      console.log(error);\n    }\n    return;\n  }\n}\n"]}

package/dist/types/kernel-zerodev/paymaster/token-paymaster.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token-paymaster.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/token-paymaster.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,SAAS,EAEd,KAAK,mBAAmB,EACzB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,KAAK,GAAG,EAKT,MAAM,MAAM,CAAC;AAcd,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAEL,KAAK,iCAAiC,EACvC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACL,KAAK,4BAA4B,EACjC,KAAK,eAAe,EACrB,MAAM,YAAY,CAAC;AAGpB,qBAAa,cAAe,SAAQ,SAAS;IAGzC,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC,iBAAiB,CAAC;gBAD7D,QAAQ,EAAE,eAAe,EACf,eAAe,EAAE,eAAe,CAAC,iBAAiB,CAAC;IAIzD,mBAAmB,CACvB,iBAAiB,CAAC,EAAE,4BAA4B,GAC/C,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAmBrB,0BAA0B,CAC9B,aAAa,EAAE,cAAc,CAAC,MAAM,CAAC,EACrC,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,GAClC,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IA2DnD,cAAc,CAClB,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE,iCAAiC,EAC3C,eAAe,EAAE,GAAG,EACpB,gBAAgB,EAAE,GAAG,GACpB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAgCrC,oBAAoB,CACxB,MAAM,EAAE,mBAAmB,EAC3B,iBAAiB,CAAC,EAAE,4BAA4B,EAChD,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;CAkD5C"}
+{"version":3,"file":"token-paymaster.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/token-paymaster.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,SAAS,EAEd,KAAK,mBAAmB,EACzB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,KAAK,GAAG,EAKT,MAAM,MAAM,CAAC;AAcd,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAEL,KAAK,iCAAiC,EACvC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACL,KAAK,4BAA4B,EACjC,KAAK,eAAe,EACrB,MAAM,YAAY,CAAC;AAGpB,qBAAa,cAAe,SAAQ,SAAS;IAGzC,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC,iBAAiB,CAAC;gBAD7D,QAAQ,EAAE,eAAe,EACf,eAAe,EAAE,eAAe,CAAC,iBAAiB,CAAC;IAIzD,mBAAmB,CACvB,iBAAiB,CAAC,EAAE,4BAA4B,GAC/C,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAmBrB,0BAA0B,CAC9B,aAAa,EAAE,cAAc,CAAC,MAAM,CAAC,EACrC,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,GAClC,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IA2DnD,cAAc,CAClB,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE,iCAAiC,EAC3C,eAAe,EAAE,GAAG,EACpB,gBAAgB,EAAE,GAAG,GACpB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAuCrC,oBAAoB,CACxB,MAAM,EAAE,mBAAmB,EAC3B,iBAAiB,CAAC,EAAE,4BAA4B,EAChD,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;CAkD5C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerodev/sdk",
-  "version": "4.0.28",
+  "version": "4.0.29",
   "description": "A collection of ERC-4337 compliant smart contract account interfaces",
   "author": "ZeroDev",
   "license": "MIT",

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

@@ -158,6 +158,13 @@ export class TokenPaymaster extends Paymaster {
           to: await this.provider.getAddress(),
           data: erc20CallData,
         }),
+        signature: await this.provider
+          .getAccount()
+          .getValidator()
+          .getDynamicDummySignature(
+            (await struct.sender) as Hex,
+            erc20CallData
+          ),
       };
     } catch (error) {
       return;
@@ -198,7 +205,7 @@ export class TokenPaymaster extends Paymaster {
           paymasterAddress
         );
         if (!erc20UserOp) {
-          return struct;
+          return;
         }
         const paymasterResp = await this.signUserOp({
           userOp: struct,