@zerodev/sdk 4.5.0 → 4.5.2

package/src/kernel-zerodev/constants.ts

@@ -106,7 +106,8 @@ export const CHAIN_ID_TO_NODE: { [key: number]: string } = {
   204: "https://opbnb.rpc.thirdweb.com/eed98c1f30120c0508f17c1f01d3102b",
   42069: "https://rpc.op-testnet.gelato.digital",
   1261120: "https://rpc.zkatana.gelato.digital",
-  84532: 'https://floral-old-feather.base-sepolia.quiknode.pro/4c3b4295d0c174410872b1e461a91cc33c7969a9/',
+  84532:
+    "https://floral-old-feather.base-sepolia.quiknode.pro/4c3b4295d0c174410872b1e461a91cc33c7969a9/",
   421614: `https://arbitrum-sepolia.infura.io/v3/${INFURA_API_KEY}`,
   11155420: `https://optimism-sepolia.infura.io/v3/${INFURA_API_KEY}`,
   // 5611: 'opBnb-testnet',

package/src/kernel-zerodev/ethers-provider/account-signer.ts

@@ -161,6 +161,7 @@ export class ZeroDevAccountSigner<V extends SupportedValidators>
       from: (await this.getAddress()) as `0x${string}`,
       to: resolved.to as `0x${string}` | undefined,
       data: hexlifyOptional(resolved.data),
+      value: hexlifyOptional(resolved.value),
     });
 
     return this.provider.getTransaction(txHash);

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

@@ -47,7 +47,9 @@ export const zeroDevPaymasterAndDataMiddleware = <
             verificationGasLimit,
             callGasLimit,
           },
-          paymasterConfig.paymasterProvider
+          paymasterConfig.paymasterProvider,
+          false,
+          provider.shouldConsume()
         );
       } catch (error: any) {
         console.error(error);

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

@@ -17,7 +17,8 @@ export abstract class Paymaster {
   abstract getPaymasterResponse(
     struct: UserOperationStruct,
     paymasterProvider?: PaymasterAndBundlerProviders,
-    shouldOverrideFee?: boolean
+    shouldOverrideFee?: boolean,
+    shouldConsume?: boolean
   ): Promise<UserOperationStruct | undefined>;
   protected async signUserOp({
     userOp,
@@ -27,6 +28,7 @@ export abstract class Paymaster {
     erc20CallData,
     paymasterProvider,
     shouldOverrideFee = false,
+    shouldConsume = true,
   }: {
     userOp: UserOperationStruct;
     callData?: PromiseOrValue<BytesLike>;
@@ -35,6 +37,7 @@ export abstract class Paymaster {
     erc20CallData?: PromiseOrValue<BytesLike>;
     paymasterProvider?: PaymasterAndBundlerProviders;
     shouldOverrideFee?: boolean;
+    shouldConsume?: boolean;
   }): Promise<any> {
     const hexifiedUserOp = deepHexlify(await resolveProperties(userOp));
     let resolvedERC20UserOp;
@@ -72,6 +75,7 @@ export abstract class Paymaster {
             : erc20CallData,
         paymasterProvider,
         shouldOverrideFee,
+        shouldConsume,
       }).filter(([_, value]) => value !== undefined)
     );
     const { data: paymasterResp } = await axios.post(

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

@@ -201,7 +201,8 @@ export class TokenPaymaster extends Paymaster {
   async getPaymasterResponse(
     struct: UserOperationStruct,
     paymasterProvider?: PaymasterAndBundlerProviders,
-    shouldOverrideFee?: boolean
+    shouldOverrideFee?: boolean,
+    shouldConsume?: boolean
   ): Promise<UserOperationStruct | undefined> {
     const mainCall = await this.decodeMainCallFromCallData(
       struct.sender,
@@ -241,6 +242,7 @@ export class TokenPaymaster extends Paymaster {
         erc20CallData: erc20UserOp.callData,
         paymasterProvider,
         shouldOverrideFee,
+        shouldConsume,
       });
       return paymasterResp;
     }

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

@@ -17,13 +17,15 @@ export class VerifyingPaymaster extends Paymaster {
   async getPaymasterResponse(
     struct: UserOperationStruct,
     paymasterProvider?: PaymasterAndBundlerProviders,
-    shouldOverrideFee?: boolean
+    shouldOverrideFee?: boolean,
+    shouldConsume?: boolean
   ): Promise<UserOperationStruct | undefined> {
     const hexifiedUserOp = deepHexlify(await resolveProperties(struct));
     const paymasterResp = await this.signUserOp({
       userOp: hexifiedUserOp,
       paymasterProvider,
       shouldOverrideFee,
+      shouldConsume,
     });
     return paymasterResp;
   }

package/src/kernel-zerodev/provider.ts

@@ -75,6 +75,7 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
   readonly bundlerProvider?: PaymasterAndBundlerProviders;
   private _txMaxRetries: number;
   private _txRetryIntervalMs: number;
+  private _shouldConsume: boolean = true;
 
   constructor({
     projectId,
@@ -116,6 +117,8 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
 
   getProjectId = (): string => this.projectId;
 
+  shouldConsume = (): boolean => this._shouldConsume;
+
   sendTransaction = async (
     request: RpcTransactionRequest,
     operation: UserOpDataOperationTypes<UserOperationCallData> = Operation.Call
@@ -152,6 +155,7 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
     overrides?: UserOperationOverrides,
     operation: UserOpDataOperationTypes<T> = Operation.Call as UserOpDataOperationTypes<T>
   ): Promise<UserOperationStruct> => {
+    this._shouldConsume = false;
     if (!isKernelAccount(this.account)) {
       throw new Error("account not connected!");
     }
@@ -189,7 +193,7 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
 
     const initCode = await this.account.getInitCode();
     const nonce = await this.account.getNonce();
-    return await this._runMiddlewareStack(
+    const result = await this._runMiddlewareStack(
       {
         initCode,
         sender: this.getAddress(),
@@ -201,6 +205,8 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
       } as UserOperationStruct,
       overrides
     );
+    this._shouldConsume = true;
+    return result;
   };
 
   private _runMiddlewareStack = async (
@@ -226,6 +232,10 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
     overrides?: UserOperationOverrides,
     operation: UserOpDataOperationTypes<T> = Operation.Call as UserOpDataOperationTypes<T>
   ): Promise<SendUserOperationResult> => {
+    if (!this._shouldConsume)
+      throw new Error(
+        "Cannot send user operation while building user operation"
+      );
     if (!isKernelAccount(this.account)) {
       throw new Error("account not connected!");
     }