@virtuals-protocol/acp-node 0.3.0-beta.3 → 0.3.0-beta.5

package/dist/index.js

@@ -55,7 +55,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.3",
+      version: "0.3.0-beta.5",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -70,9 +70,9 @@ var require_package = __commonJS({
         typescript: "^5.8.3"
       },
       dependencies: {
-        "@aa-sdk/core": "^4.30.0",
-        "@account-kit/infra": "^4.30.0",
-        "@account-kit/smart-contracts": "^4.30.0",
+        "@aa-sdk/core": "^4.73.0",
+        "@account-kit/infra": "^4.73.0",
+        "@account-kit/smart-contracts": "^4.73.0",
         ajv: "^8.17.1",
         "socket.io-client": "^4.8.1",
         tsup: "^8.5.0",
@@ -1892,6 +1892,7 @@ var ACP_ABI = [
 var acpAbi_default = ACP_ABI;
 
 // src/acpClient.ts
+var import_viem4 = require("viem");
 var import_socket = require("socket.io-client");
 
 // src/contractClients/baseAcpContractClient.ts
@@ -3062,171 +3063,160 @@ var BaseAcpContractClient = class {
     return this.agentWalletAddress;
   }
   createJobWithAccount(accountId, providerAddress, evaluatorAddress, budgetBaseUnit, paymentTokenAddress, expiredAt) {
-    return __async(this, null, function* () {
-      try {
-        const data = (0, import_viem2.encodeFunctionData)({
-          abi: this.abi,
-          functionName: "createJobWithAccount",
-          args: [
-            accountId,
-            evaluatorAddress,
-            budgetBaseUnit,
-            paymentTokenAddress,
-            Math.floor(expiredAt.getTime() / 1e3)
-          ]
-        });
-        const hash = yield this.handleOperation(data, this.contractAddress);
-        const jobId = yield this.getJobId(
-          hash,
-          this.agentWalletAddress,
-          providerAddress
-        );
-        return { txHash: hash, jobId };
-      } catch (error) {
-        throw new acpError_default("Failed to create job with account", error);
-      }
-    });
+    try {
+      const data = (0, import_viem2.encodeFunctionData)({
+        abi: this.abi,
+        functionName: "createJobWithAccount",
+        args: [
+          accountId,
+          evaluatorAddress,
+          budgetBaseUnit,
+          paymentTokenAddress,
+          Math.floor(expiredAt.getTime() / 1e3)
+        ]
+      });
+      const payload = {
+        data,
+        contractAddress: this.contractAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to create job with account", error);
+    }
   }
   createJob(providerAddress, evaluatorAddress, expiredAt, paymentTokenAddress, budgetBaseUnit, metadata) {
-    return __async(this, null, function* () {
-      try {
-        const data = (0, import_viem2.encodeFunctionData)({
-          abi: this.abi,
-          functionName: "createJob",
-          args: [
-            providerAddress,
-            evaluatorAddress,
-            Math.floor(expiredAt.getTime() / 1e3),
-            paymentTokenAddress,
-            budgetBaseUnit,
-            metadata
-          ]
-        });
-        const hash = yield this.handleOperation(data, this.contractAddress);
-        const jobId = yield this.getJobId(
-          hash,
-          this.agentWalletAddress,
-          providerAddress
-        );
-        return { txHash: hash, jobId };
-      } catch (error) {
-        throw new acpError_default("Failed to create job", error);
-      }
-    });
+    try {
+      const data = (0, import_viem2.encodeFunctionData)({
+        abi: this.abi,
+        functionName: "createJob",
+        args: [
+          providerAddress,
+          evaluatorAddress,
+          Math.floor(expiredAt.getTime() / 1e3),
+          paymentTokenAddress,
+          budgetBaseUnit,
+          metadata
+        ]
+      });
+      const payload = {
+        data,
+        contractAddress: this.contractAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to create job", error);
+    }
   }
-  approveAllowance(_0) {
-    return __async(this, arguments, function* (amountBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
-      try {
-        const data = (0, import_viem2.encodeFunctionData)({
-          abi: import_viem2.erc20Abi,
-          functionName: "approve",
-          args: [this.contractAddress, amountBaseUnit]
-        });
-        return yield this.handleOperation(data, paymentTokenAddress);
-      } catch (error) {
-        throw new acpError_default("Failed to approve allowance", error);
-      }
-    });
+  approveAllowance(amountBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
+    try {
+      const data = (0, import_viem2.encodeFunctionData)({
+        abi: import_viem2.erc20Abi,
+        functionName: "approve",
+        args: [this.contractAddress, amountBaseUnit]
+      });
+      const payload = {
+        data,
+        contractAddress: paymentTokenAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to approve allowance", error);
+    }
   }
-  createPayableMemo(_0, _1, _2, _3, _4, _5, _6, _7, _8) {
-    return __async(this, arguments, function* (jobId, content, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, nextPhase, type, expiredAt, token = this.config.baseFare.contractAddress, secured = true) {
-      try {
-        const data = (0, import_viem2.encodeFunctionData)({
-          abi: this.abi,
-          functionName: "createPayableMemo",
-          args: [
-            jobId,
-            content,
-            token,
-            amountBaseUnit,
-            recipient,
-            feeAmountBaseUnit,
-            feeType,
-            type,
-            Math.floor(expiredAt.getTime() / 1e3),
-            secured,
-            nextPhase
-          ]
-        });
-        return yield this.handleOperation(data, this.contractAddress);
-      } catch (error) {
-        throw new acpError_default("Failed to create payable memo", error);
-      }
-    });
+  createPayableMemo(jobId, content, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, nextPhase, type, expiredAt, token = this.config.baseFare.contractAddress, secured = true) {
+    try {
+      const data = (0, import_viem2.encodeFunctionData)({
+        abi: this.abi,
+        functionName: "createPayableMemo",
+        args: [
+          jobId,
+          content,
+          token,
+          amountBaseUnit,
+          recipient,
+          feeAmountBaseUnit,
+          feeType,
+          type,
+          Math.floor(expiredAt.getTime() / 1e3),
+          secured,
+          nextPhase
+        ]
+      });
+      const payload = {
+        data,
+        contractAddress: this.contractAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to create payable memo", error);
+    }
   }
   createMemo(jobId, content, type, isSecured, nextPhase) {
-    return __async(this, null, function* () {
-      try {
-        const data = (0, import_viem2.encodeFunctionData)({
-          abi: this.abi,
-          functionName: "createMemo",
-          args: [jobId, content, type, isSecured, nextPhase]
-        });
-        return yield this.handleOperation(data, this.contractAddress);
-      } catch (error) {
-        throw new acpError_default("Failed to create memo", error);
-      }
-    });
+    try {
+      const data = (0, import_viem2.encodeFunctionData)({
+        abi: this.abi,
+        functionName: "createMemo",
+        args: [jobId, content, type, isSecured, nextPhase]
+      });
+      const payload = {
+        data,
+        contractAddress: this.contractAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to create memo", error);
+    }
   }
   signMemo(memoId, isApproved, reason) {
-    return __async(this, null, function* () {
-      try {
-        const data = (0, import_viem2.encodeFunctionData)({
-          abi: this.abi,
-          functionName: "signMemo",
-          args: [memoId, isApproved, reason]
-        });
-        const hash = yield this.handleOperation(data, this.contractAddress);
-        return hash;
-      } catch (error) {
-        throw new acpError_default("Failed to sign memo", error);
-      }
-    });
+    try {
+      const data = (0, import_viem2.encodeFunctionData)({
+        abi: this.abi,
+        functionName: "signMemo",
+        args: [memoId, isApproved, reason]
+      });
+      const payload = {
+        data,
+        contractAddress: this.contractAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to sign memo", error);
+    }
   }
-  setBudgetWithPaymentToken(_0, _1) {
-    return __async(this, arguments, function* (jobId, budgetBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
-      try {
-        const data = (0, import_viem2.encodeFunctionData)({
-          abi: this.abi,
-          functionName: "setBudgetWithPaymentToken",
-          args: [jobId, budgetBaseUnit, paymentTokenAddress]
-        });
-        return yield this.handleOperation(data, this.contractAddress);
-      } catch (error) {
-        throw new acpError_default("Failed to set budget", error);
-      }
-    });
+  setBudgetWithPaymentToken(jobId, budgetBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
+    return void 0;
   }
   updateAccountMetadata(accountId, metadata) {
-    return __async(this, null, function* () {
-      try {
-        const data = (0, import_viem2.encodeFunctionData)({
-          abi: this.abi,
-          functionName: "updateAccountMetadata",
-          args: [accountId, metadata]
-        });
-        return yield this.handleOperation(data, this.contractAddress);
-      } catch (error) {
-        throw new acpError_default("Failed to update account metadata", error);
-      }
-    });
+    try {
+      const data = (0, import_viem2.encodeFunctionData)({
+        abi: this.abi,
+        functionName: "updateAccountMetadata",
+        args: [accountId, metadata]
+      });
+      const payload = {
+        data,
+        contractAddress: this.contractAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to update account metadata", error);
+    }
   }
   wrapEth(amountBaseUnit) {
-    return __async(this, null, function* () {
-      try {
-        const data = (0, import_viem2.encodeFunctionData)({
-          abi: wethAbi_default,
-          functionName: "deposit"
-        });
-        return yield this.handleOperation(
-          data,
-          wethFare.contractAddress,
-          amountBaseUnit
-        );
-      } catch (error) {
-        throw new acpError_default("Failed to wrap eth", error);
-      }
-    });
+    try {
+      const data = (0, import_viem2.encodeFunctionData)({
+        abi: wethAbi_default,
+        functionName: "deposit"
+      });
+      const payload = {
+        data,
+        contractAddress: wethFare.contractAddress,
+        value: amountBaseUnit
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to wrap eth", error);
+    }
   }
 };
 var baseAcpContractClient_default = BaseAcpContractClient;
@@ -3340,9 +3330,7 @@ var AcpJob = class {
     if (requestMemo) {
       return requestMemo.signedReason;
     }
-    return (_a = this.memos.find(
-      (m) => m.nextPhase === 5 /* REJECTED */
-    )) == null ? void 0 : _a.content;
+    return (_a = this.memos.find((m) => m.nextPhase === 5 /* REJECTED */)) == null ? void 0 : _a.content;
   }
   get providerAgent() {
     return this.acpClient.getAgent(this.providerAddress);
@@ -3361,36 +3349,46 @@ var AcpJob = class {
   }
   createRequirement(content) {
     return __async(this, null, function* () {
-      return yield this.acpContractClient.createMemo(
-        this.id,
-        content,
-        0 /* MESSAGE */,
-        true,
-        2 /* TRANSACTION */
+      const operations = [];
+      operations.push(
+        this.acpContractClient.createMemo(
+          this.id,
+          content,
+          0 /* MESSAGE */,
+          true,
+          2 /* TRANSACTION */
+        )
       );
+      return yield this.acpContractClient.handleOperation(operations);
     });
   }
   createPayableRequirement(_0, _1, _2, _3) {
     return __async(this, arguments, function* (content, type, amount, recipient, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
+      const operations = [];
       if (type === 8 /* PAYABLE_TRANSFER_ESCROW */) {
-        yield this.acpContractClient.approveAllowance(
-          amount.amount,
-          amount.fare.contractAddress
+        operations.push(
+          this.acpContractClient.approveAllowance(
+            amount.amount,
+            amount.fare.contractAddress
+          )
         );
       }
       const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
-      return yield this.acpContractClient.createPayableMemo(
-        this.id,
-        content,
-        amount.amount,
-        recipient,
-        feeAmount.amount,
-        0 /* NO_FEE */,
-        2 /* TRANSACTION */,
-        type,
-        expiredAt,
-        amount.fare.contractAddress
+      operations.push(
+        this.acpContractClient.createPayableMemo(
+          this.id,
+          content,
+          amount.amount,
+          recipient,
+          feeAmount.amount,
+          0 /* NO_FEE */,
+          2 /* TRANSACTION */,
+          type,
+          expiredAt,
+          amount.fare.contractAddress
+        )
       );
+      return yield this.acpContractClient.handleOperation(operations);
     });
   }
   payAndAcceptRequirement(reason) {
@@ -3399,8 +3397,9 @@ var AcpJob = class {
         (m) => m.nextPhase === 2 /* TRANSACTION */
       );
       if (!memo) {
-        throw new acpError_default("No transaction memo found");
+        throw new acpError_default("No notification memo found");
       }
+      const operations = [];
       const baseFareAmount = new FareAmount(this.price, this.baseFare);
       const transferAmount = memo.payableDetails ? yield FareAmountBase.fromContractAddress(
         memo.payableDetails.amount,
@@ -3408,24 +3407,31 @@ var AcpJob = class {
         this.config
       ) : new FareAmount(0, this.baseFare);
       const totalAmount = baseFareAmount.fare.contractAddress === transferAmount.fare.contractAddress ? baseFareAmount.add(transferAmount) : baseFareAmount;
-      yield this.acpContractClient.approveAllowance(
-        totalAmount.amount,
-        this.baseFare.contractAddress
+      operations.push(
+        this.acpContractClient.approveAllowance(
+          totalAmount.amount,
+          this.baseFare.contractAddress
+        )
       );
       if (baseFareAmount.fare.contractAddress !== transferAmount.fare.contractAddress) {
-        yield this.acpContractClient.approveAllowance(
-          transferAmount.amount,
-          transferAmount.fare.contractAddress
+        operations.push(
+          this.acpContractClient.approveAllowance(
+            transferAmount.amount,
+            transferAmount.fare.contractAddress
+          )
         );
       }
-      yield memo.sign(true, reason);
-      return yield this.acpContractClient.createMemo(
-        this.id,
-        `Payment made. ${reason != null ? reason : ""}`.trim(),
-        0 /* MESSAGE */,
-        true,
-        3 /* EVALUATION */
+      operations.push(this.acpContractClient.signMemo(memo.id, true, reason));
+      operations.push(
+        this.acpContractClient.createMemo(
+          this.id,
+          `Payment made. ${reason != null ? reason : ""}`.trim(),
+          0 /* MESSAGE */,
+          true,
+          3 /* EVALUATION */
+        )
       );
+      return yield this.acpContractClient.handleOperation(operations);
     });
   }
   respond(accept, reason) {
@@ -3433,7 +3439,7 @@ var AcpJob = class {
       const memoContent = `${reason || `Job ${this.id} ${accept ? "accepted" : "rejected"}.`}`;
       if (accept) {
         yield this.accept(memoContent);
-        return this.createRequirement(memoContent);
+        return yield this.createRequirement(memoContent);
       }
       return yield this.reject(memoContent);
     });
@@ -3442,31 +3448,42 @@ var AcpJob = class {
     return __async(this, null, function* () {
       var _a;
       const memoContent = `Job ${this.id} accepted. ${reason || ""}`;
+      const operations = [];
       if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 1 /* NEGOTIATION */) {
-        throw new acpError_default("No negotiation memo found");
+        throw new acpError_default("No request memo found");
       }
       const memo = this.latestMemo;
-      yield memo.sign(true, memoContent);
+      operations.push(
+        this.acpContractClient.signMemo(memo.id, true, memoContent)
+      );
+      return yield this.acpContractClient.handleOperation(operations);
     });
   }
   reject(reason) {
     return __async(this, null, function* () {
       var _a;
       const memoContent = `Job ${this.id} rejected. ${reason || ""}`;
+      const operations = [];
       if (this.phase === 0 /* REQUEST */) {
         if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 1 /* NEGOTIATION */) {
           throw new acpError_default("No request memo found");
         }
         const memo = this.latestMemo;
-        return yield this.acpContractClient.signMemo(memo.id, false, memoContent);
+        operations.push(
+          this.acpContractClient.signMemo(memo.id, false, memoContent)
+        );
+        return yield this.acpContractClient.handleOperation(operations);
       }
-      return yield this.acpContractClient.createMemo(
-        this.id,
-        memoContent,
-        0 /* MESSAGE */,
-        true,
-        5 /* REJECTED */
+      operations.push(
+        this.acpContractClient.createMemo(
+          this.id,
+          memoContent,
+          0 /* MESSAGE */,
+          true,
+          5 /* REJECTED */
+        )
       );
+      return yield this.acpContractClient.handleOperation(operations);
     });
   }
   deliver(deliverable) {
@@ -3475,13 +3492,17 @@ var AcpJob = class {
       if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 3 /* EVALUATION */) {
         throw new acpError_default("No transaction memo found");
       }
-      return yield this.acpContractClient.createMemo(
-        this.id,
-        preparePayload(deliverable),
-        0 /* MESSAGE */,
-        true,
-        4 /* COMPLETED */
+      const operations = [];
+      operations.push(
+        this.acpContractClient.createMemo(
+          this.id,
+          preparePayload(deliverable),
+          0 /* MESSAGE */,
+          true,
+          4 /* COMPLETED */
+        )
       );
+      return yield this.acpContractClient.handleOperation(operations);
     });
   }
   deliverPayable(_0, _1) {
@@ -3490,23 +3511,29 @@ var AcpJob = class {
       if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 3 /* EVALUATION */) {
         throw new acpError_default("No transaction memo found");
       }
-      yield this.acpContractClient.approveAllowance(
-        amount.amount,
-        amount.fare.contractAddress
+      const operations = [];
+      operations.push(
+        this.acpContractClient.approveAllowance(
+          amount.amount,
+          amount.fare.contractAddress
+        )
       );
       const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
-      return yield this.acpContractClient.createPayableMemo(
-        this.id,
-        preparePayload(deliverable),
-        amount.amount,
-        this.clientAddress,
-        feeAmount.amount,
-        0 /* NO_FEE */,
-        4 /* COMPLETED */,
-        7 /* PAYABLE_TRANSFER */,
-        expiredAt,
-        amount.fare.contractAddress
+      operations.push(
+        this.acpContractClient.createPayableMemo(
+          this.id,
+          preparePayload(deliverable),
+          amount.amount,
+          this.clientAddress,
+          feeAmount.amount,
+          0 /* NO_FEE */,
+          4 /* COMPLETED */,
+          7 /* PAYABLE_TRANSFER */,
+          expiredAt,
+          amount.fare.contractAddress
+        )
       );
+      return yield this.acpContractClient.handleOperation(operations);
     });
   }
   evaluate(accept, reason) {
@@ -3519,419 +3546,46 @@ var AcpJob = class {
       yield memo.sign(accept, reason);
     });
   }
-  pay(reason) {
-    return __async(this, null, function* () {
-      const memo = this.memos.find(
-        (m) => m.nextPhase === 2 /* TRANSACTION */
-      );
-      if (!memo) {
-        throw new acpError_default("No transaction memo found");
-      }
-      return yield this.acpClient.payJob(
-        this.id,
-        this.baseFare.formatAmount(this.price),
-        memo.id,
-        reason
-      );
-    });
-  }
   createNotification(content) {
     return __async(this, null, function* () {
-      return yield this.acpContractClient.createMemo(
-        this.id,
-        content,
-        9 /* NOTIFICATION */,
-        true,
-        4 /* COMPLETED */
+      const operations = [];
+      operations.push(
+        this.acpContractClient.createMemo(
+          this.id,
+          content,
+          9 /* NOTIFICATION */,
+          true,
+          4 /* COMPLETED */
+        )
       );
+      return yield this.acpContractClient.handleOperation(operations);
     });
   }
   createPayableNotification(_0, _1) {
     return __async(this, arguments, function* (content, amount, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
-      yield this.acpContractClient.approveAllowance(
-        amount.amount,
-        amount.fare.contractAddress
+      const operations = [];
+      operations.push(
+        this.acpContractClient.approveAllowance(
+          amount.amount,
+          amount.fare.contractAddress
+        )
       );
       const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
-      return yield this.acpContractClient.createPayableMemo(
-        this.id,
-        content,
-        amount.amount,
-        this.clientAddress,
-        feeAmount.amount,
-        0 /* NO_FEE */,
-        4 /* COMPLETED */,
-        10 /* PAYABLE_NOTIFICATION */,
-        expiredAt,
-        amount.fare.contractAddress
-      );
-    });
-  }
-  // to be deprecated
-  /**
-   * @deprecated The method should not be used
-   */
-  openPosition(_0, _1) {
-    return __async(this, arguments, function* (payload, feeAmount, expiredAt = new Date(Date.now() + 1e3 * 60 * 3), walletAddress) {
-      if (payload.length === 0) {
-        throw new acpError_default("No positions to open");
-      }
-      const sumAmount = payload.reduce((acc, curr) => acc + curr.amount, 0);
-      return yield this.acpClient.transferFunds(
-        this.id,
-        new FareAmount(sumAmount, this.baseFare),
-        walletAddress || this.providerAddress,
-        new FareAmount(feeAmount, this.baseFare),
-        1 /* IMMEDIATE_FEE */,
-        {
-          type: "open_position" /* OPEN_POSITION */,
-          data: payload
-        },
-        2 /* TRANSACTION */,
-        expiredAt
-      );
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  swapToken(payload, decimals, feeAmount, walletAddress) {
-    return __async(this, null, function* () {
-      return yield this.acpClient.transferFunds(
-        this.id,
-        new FareAmount(
-          payload.amount,
-          new Fare(payload.fromContractAddress, decimals)
-        ),
-        walletAddress || this.providerAddress,
-        new FareAmount(feeAmount, this.baseFare),
-        1 /* IMMEDIATE_FEE */,
-        {
-          type: "swap_token" /* SWAP_TOKEN */,
-          data: payload
-        },
-        2 /* TRANSACTION */,
-        new Date(Date.now() + 1e3 * 60 * 30)
-      );
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  responseSwapToken(memoId, accept, reason) {
-    return __async(this, null, function* () {
-      const memo = this.memos.find((m) => m.id === memoId);
-      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
-        throw new acpError_default("No swap token memo found");
-      }
-      const payload = tryParseJson(
-        memo.content
-      );
-      if ((payload == null ? void 0 : payload.type) !== "swap_token" /* SWAP_TOKEN */) {
-        throw new acpError_default("Invalid swap token memo");
-      }
-      return yield memo.sign(accept, reason);
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  transferFunds(_0, _1, _2) {
-    return __async(this, arguments, function* (payload, fareAmount, walletAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 30)) {
-      return yield this.acpClient.transferFunds(
-        this.id,
-        fareAmount,
-        walletAddress || this.clientAddress,
-        new FareAmount(0, this.baseFare),
-        0 /* NO_FEE */,
-        payload,
-        2 /* TRANSACTION */,
-        expiredAt
-      );
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  responseOpenPosition(memoId, accept, reason) {
-    return __async(this, null, function* () {
-      const memo = this.memos.find((m) => m.id === memoId);
-      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
-        throw new acpError_default("No open position memo found");
-      }
-      const payload = tryParseJson(
-        memo.content
-      );
-      if ((payload == null ? void 0 : payload.type) !== "open_position" /* OPEN_POSITION */) {
-        throw new acpError_default("Invalid open position memo");
-      }
-      return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  closePartialPosition(_0) {
-    return __async(this, arguments, function* (payload, expireAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
-      return yield this.acpClient.requestFunds(
-        this.id,
-        new FareAmount(payload.amount, this.baseFare),
-        this.clientAddress,
-        new FareAmount(0, this.baseFare),
-        0 /* NO_FEE */,
-        {
-          type: "close_partial_position" /* CLOSE_PARTIAL_POSITION */,
-          data: payload
-        },
-        2 /* TRANSACTION */,
-        expireAt
-      );
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  responseClosePartialPosition(memoId, accept, reason) {
-    return __async(this, null, function* () {
-      const memo = this.memos.find((m) => m.id === memoId);
-      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 6 /* PAYABLE_REQUEST */) {
-        throw new acpError_default("No close position memo found");
-      }
-      const payload = tryParseJson(
-        memo.content
-      );
-      if ((payload == null ? void 0 : payload.type) !== "close_partial_position" /* CLOSE_PARTIAL_POSITION */) {
-        throw new acpError_default("Invalid close position memo");
-      }
-      return yield this.acpClient.responseFundsRequest(
-        memo.id,
-        accept,
-        this.baseFare.formatAmount(payload.data.amount),
-        reason
-      );
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  requestClosePosition(payload) {
-    return __async(this, null, function* () {
-      return yield this.acpClient.sendMessage(
-        this.id,
-        {
-          type: "close_position" /* CLOSE_POSITION */,
-          data: payload
-        },
-        2 /* TRANSACTION */
-      );
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  responseRequestClosePosition(_0, _1, _2, _3) {
-    return __async(this, arguments, function* (memoId, accept, payload, reason, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
-      const memo = this.memos.find((m) => m.id === memoId);
-      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 0 /* MESSAGE */) {
-        throw new acpError_default("No message memo found");
-      }
-      const messagePayload = tryParseJson(memo.content);
-      if ((messagePayload == null ? void 0 : messagePayload.type) !== "close_position" /* CLOSE_POSITION */) {
-        throw new acpError_default("Invalid close position memo");
-      }
-      yield memo.sign(accept, reason);
-      if (accept) {
-        return yield this.acpClient.transferFunds(
+      operations.push(
+        this.acpContractClient.createPayableMemo(
           this.id,
-          new FareAmount(payload.amount, this.baseFare),
+          content,
+          amount.amount,
           this.clientAddress,
-          new FareAmount(0, this.baseFare),
+          feeAmount.amount,
           0 /* NO_FEE */,
-          {
-            type: "close_position" /* CLOSE_POSITION */,
-            data: payload
-          },
-          2 /* TRANSACTION */,
-          expiredAt
-        );
-      }
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  confirmClosePosition(memoId, accept, reason) {
-    return __async(this, null, function* () {
-      const memo = this.memos.find((m) => m.id === memoId);
-      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
-        throw new acpError_default("No payable transfer memo found");
-      }
-      const payload = tryParseJson(
-        memo.content
-      );
-      if ((payload == null ? void 0 : payload.type) !== "close_position" /* CLOSE_POSITION */) {
-        throw new acpError_default("Invalid close position memo");
-      }
-      yield memo.sign(accept, reason);
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  positionFulfilled(_0) {
-    return __async(this, arguments, function* (payload, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
-      return yield this.acpClient.transferFunds(
-        this.id,
-        new FareAmount(payload.amount, this.baseFare),
-        this.clientAddress,
-        new FareAmount(0, this.baseFare),
-        0 /* NO_FEE */,
-        {
-          type: "position_fulfilled" /* POSITION_FULFILLED */,
-          data: payload
-        },
-        2 /* TRANSACTION */,
-        expiredAt
-      );
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  unfulfilledPosition(_0) {
-    return __async(this, arguments, function* (payload, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
-      return yield this.acpClient.transferFunds(
-        this.id,
-        new FareAmount(payload.amount, this.baseFare),
-        this.clientAddress,
-        new FareAmount(0, this.baseFare),
-        0 /* NO_FEE */,
-        {
-          type: "unfulfilled_position" /* UNFULFILLED_POSITION */,
-          data: payload
-        },
-        2 /* TRANSACTION */,
-        expiredAt
-      );
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  responseUnfulfilledPosition(memoId, accept, reason) {
-    return __async(this, null, function* () {
-      const memo = this.memos.find((m) => m.id === memoId);
-      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
-        throw new acpError_default("No unfulfilled position memo found");
-      }
-      const payload = tryParseJson(
-        memo.content
-      );
-      if ((payload == null ? void 0 : payload.type) !== "unfulfilled_position" /* UNFULFILLED_POSITION */) {
-        throw new acpError_default("Invalid unfulfilled position memo");
-      }
-      return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  responsePositionFulfilled(memoId, accept, reason) {
-    return __async(this, null, function* () {
-      const memo = this.memos.find((m) => m.id === memoId);
-      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
-        throw new acpError_default("No position fulfilled memo found");
-      }
-      const payload = tryParseJson(
-        memo.content
-      );
-      if ((payload == null ? void 0 : payload.type) !== "position_fulfilled" /* POSITION_FULFILLED */) {
-        throw new acpError_default("Invalid position fulfilled memo");
-      }
-      return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  closeJob(message = "Close job and withdraw all") {
-    return __async(this, null, function* () {
-      return yield this.acpClient.sendMessage(
-        this.id,
-        {
-          type: "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */,
-          data: {
-            message
-          }
-        },
-        2 /* TRANSACTION */
-      );
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  responseCloseJob(_0, _1, _2, _3) {
-    return __async(this, arguments, function* (memoId, accept, fulfilledPositions, reason, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
-      const memo = this.memos.find((m) => m.id === memoId);
-      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 0 /* MESSAGE */) {
-        throw new acpError_default("No message memo found");
-      }
-      const payload = tryParseJson(
-        memo.content
-      );
-      if ((payload == null ? void 0 : payload.type) !== "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */) {
-        throw new acpError_default("Invalid close job and withdraw memo");
-      }
-      yield memo.sign(accept, reason);
-      if (!accept) {
-        return;
-      }
-      const totalAmount = fulfilledPositions.reduce(
-        (acc, curr) => acc + curr.amount,
-        0
-      );
-      if (totalAmount === 0) {
-        return yield this.acpClient.sendMessage(
-          this.id,
-          {
-            type: "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */,
-            data: fulfilledPositions
-          },
-          4 /* COMPLETED */
-        );
-      }
-      return yield this.acpClient.transferFunds(
-        this.id,
-        new FareAmount(totalAmount, this.baseFare),
-        this.clientAddress,
-        new FareAmount(0, this.baseFare),
-        0 /* NO_FEE */,
-        {
-          type: "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */,
-          data: fulfilledPositions
-        },
-        4 /* COMPLETED */,
-        expiredAt
-      );
-    });
-  }
-  /**
-   * @deprecated The method should not be used
-   */
-  confirmJobClosure(memoId, accept, reason) {
-    return __async(this, null, function* () {
-      const memo = this.memos.find((m) => m.id === memoId);
-      if (!memo) {
-        throw new acpError_default("Memo not found");
-      }
-      const payload = tryParseJson(
-        memo.content
+          4 /* COMPLETED */,
+          10 /* PAYABLE_NOTIFICATION */,
+          expiredAt,
+          amount.fare.contractAddress
+        )
       );
-      if ((payload == null ? void 0 : payload.type) !== "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */) {
-        throw new acpError_default("Invalid close job and withdraw memo");
-      }
-      yield memo.sign(accept, reason);
+      return yield this.acpContractClient.handleOperation(operations);
     });
   }
 };
@@ -3976,7 +3630,8 @@ var AcpMemo = class {
   }
   sign(approved, reason) {
     return __async(this, null, function* () {
-      return yield this.contractClient.signMemo(this.id, approved, reason);
+      const payload = this.contractClient.signMemo(this.id, approved, reason);
+      return yield this.contractClient.handleOperation([payload]);
     });
   }
 };
@@ -4017,7 +3672,7 @@ var AcpJobOffering = class {
         this.providerAddress,
         this.acpContractClient
       );
-      const { jobId, txHash } = [
+      const createJobPayload = [
         baseSepoliaAcpConfig.contractAddress,
         baseAcpConfig.contractAddress
       ].includes(this.acpContractClient.config.contractAddress) || !account ? yield this.acpContractClient.createJob(
@@ -4035,13 +3690,33 @@ var AcpJobOffering = class {
         fareAmount.fare.contractAddress,
         expiredAt
       );
-      yield this.acpContractClient.createMemo(
+      const createJobTxnHash = yield this.acpContractClient.handleOperation([
+        createJobPayload
+      ]);
+      const jobId = yield this.acpContractClient.getJobId(
+        createJobTxnHash,
+        this.acpContractClient.walletAddress,
+        this.providerAddress
+      );
+      const payloads = [];
+      const setBudgetWithPaymentTokenPayload = this.acpContractClient.setBudgetWithPaymentToken(
         jobId,
-        JSON.stringify(finalServiceRequirement),
-        0 /* MESSAGE */,
-        true,
-        1 /* NEGOTIATION */
+        fareAmount.amount,
+        fareAmount.fare.contractAddress
       );
+      if (setBudgetWithPaymentTokenPayload) {
+        payloads.push(setBudgetWithPaymentTokenPayload);
+      }
+      payloads.push(
+        this.acpContractClient.createMemo(
+          jobId,
+          JSON.stringify(finalServiceRequirement),
+          0 /* MESSAGE */,
+          true,
+          1 /* NEGOTIATION */
+        )
+      );
+      yield this.acpContractClient.handleOperation(payloads);
       return jobId;
     });
   }
@@ -4293,12 +3968,16 @@ var AcpClient = class {
         providerAddress,
         this.acpContractClient
       );
-      const { jobId, txHash } = [
+      const defaultEvaluatorAddress = [
+        baseSepoliaAcpConfig.contractAddress,
+        baseAcpConfig.contractAddress
+      ].includes(this.acpContractClient.config.contractAddress) && !evaluatorAddress ? this.walletAddress : import_viem4.zeroAddress;
+      const createJobPayload = [
         baseSepoliaAcpConfig.contractAddress,
         baseAcpConfig.contractAddress
       ].includes(this.acpContractClient.config.contractAddress) || !account ? yield this.acpContractClient.createJob(
         providerAddress,
-        evaluatorAddress || this.walletAddress,
+        evaluatorAddress || defaultEvaluatorAddress,
         expiredAt,
         fareAmount.fare.contractAddress,
         fareAmount.amount,
@@ -4306,182 +3985,39 @@ var AcpClient = class {
       ) : yield this.acpContractClient.createJobWithAccount(
         account.id,
         providerAddress,
-        evaluatorAddress || this.walletAddress,
+        evaluatorAddress || defaultEvaluatorAddress,
         fareAmount.amount,
         fareAmount.fare.contractAddress,
         expiredAt
       );
-      yield this.acpContractClient.createMemo(
-        jobId,
-        preparePayload(serviceRequirement),
-        0 /* MESSAGE */,
-        true,
-        1 /* NEGOTIATION */
-      );
-      return jobId;
-    });
-  }
-  createMemo(jobId, content, nextPhase) {
-    return __async(this, null, function* () {
-      return yield this.acpContractClient.createMemo(
-        jobId,
-        content,
-        0 /* MESSAGE */,
-        false,
-        nextPhase
-      );
-    });
-  }
-  createPayableMemo(jobId, content, amount, recipient, nextPhase, type, expiredAt) {
-    return __async(this, null, function* () {
-      if (type === 8 /* PAYABLE_TRANSFER_ESCROW */) {
-        yield this.acpContractClient.approveAllowance(
-          amount.amount,
-          amount.fare.contractAddress
-        );
-      }
-      const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
-      return yield this.acpContractClient.createPayableMemo(
-        jobId,
-        content,
-        amount.amount,
-        recipient,
-        feeAmount.amount,
-        0 /* NO_FEE */,
-        nextPhase,
-        type,
-        expiredAt,
-        amount.fare.contractAddress
-      );
-    });
-  }
-  respondJob(jobId, memoId, accept, content, reason) {
-    return __async(this, null, function* () {
-      yield this.acpContractClient.signMemo(memoId, accept, reason);
-      if (!accept) {
-        return;
-      }
-      return yield this.acpContractClient.createMemo(
-        jobId,
-        content != null ? content : `Job ${jobId} accepted. ${reason != null ? reason : ""}`,
-        0 /* MESSAGE */,
-        false,
-        2 /* TRANSACTION */
-      );
-    });
-  }
-  payJob(jobId, amountBaseUnit, memoId, reason) {
-    return __async(this, null, function* () {
-      if (amountBaseUnit > BigInt(0)) {
-        yield this.acpContractClient.approveAllowance(amountBaseUnit);
-      }
-      yield this.acpContractClient.signMemo(memoId, true, reason);
-      return yield this.acpContractClient.createMemo(
-        jobId,
-        `Payment made. ${reason != null ? reason : ""}`,
-        0 /* MESSAGE */,
-        false,
-        3 /* EVALUATION */
+      const txHash = yield this.acpContractClient.handleOperation([
+        createJobPayload
+      ]);
+      const jobId = yield this.acpContractClient.getJobId(
+        txHash,
+        this.walletAddress,
+        providerAddress
       );
-    });
-  }
-  requestFunds(jobId, transferFareAmount, recipient, feeFareAmount, feeType, reason, nextPhase, expiredAt) {
-    return __async(this, null, function* () {
-      return yield this.acpContractClient.createPayableMemo(
+      const payloads = [];
+      const setBudgetWithPaymentTokenPayload = this.acpContractClient.setBudgetWithPaymentToken(
         jobId,
-        JSON.stringify(reason),
-        transferFareAmount.amount,
-        recipient,
-        feeFareAmount.amount,
-        feeType,
-        nextPhase,
-        6 /* PAYABLE_REQUEST */,
-        expiredAt
+        fareAmount.amount,
+        fareAmount.fare.contractAddress
       );
-    });
-  }
-  responseFundsRequest(memoId, accept, amountBaseUnit, reason) {
-    return __async(this, null, function* () {
-      if (!accept) {
-        return yield this.acpContractClient.signMemo(memoId, accept, reason);
+      if (setBudgetWithPaymentTokenPayload) {
+        payloads.push(setBudgetWithPaymentTokenPayload);
       }
-      if (amountBaseUnit > BigInt(0)) {
-        yield this.acpContractClient.approveAllowance(amountBaseUnit);
-      }
-      return yield this.acpContractClient.signMemo(memoId, true, reason);
-    });
-  }
-  transferFunds(jobId, transferFareAmount, recipient, feeFareAmount, feeType, reason, nextPhase, expiredAt) {
-    return __async(this, null, function* () {
-      if (transferFareAmount.fare.contractAddress === ethFare.contractAddress) {
-        yield this.acpContractClient.wrapEth(transferFareAmount.amount);
-        transferFareAmount = new FareBigInt(transferFareAmount.amount, wethFare);
-      }
-      if (feeFareAmount.amount > 0 && feeFareAmount.fare.contractAddress !== this.acpContractClient.config.baseFare.contractAddress) {
-        throw new acpError_default("Fee token address is not the same as the base fare");
-      }
-      const isFeeTokenDifferent = feeFareAmount.fare.contractAddress !== transferFareAmount.fare.contractAddress;
-      if (isFeeTokenDifferent) {
-        yield this.acpContractClient.approveAllowance(
-          feeFareAmount.amount,
-          feeFareAmount.fare.contractAddress
-        );
-      }
-      const finalAmount = isFeeTokenDifferent ? transferFareAmount : transferFareAmount.add(feeFareAmount);
-      yield this.acpContractClient.approveAllowance(
-        finalAmount.amount,
-        transferFareAmount.fare.contractAddress
-      );
-      return yield this.acpContractClient.createPayableMemo(
-        jobId,
-        JSON.stringify(reason),
-        transferFareAmount.amount,
-        recipient,
-        feeFareAmount.amount,
-        feeType,
-        nextPhase,
-        8 /* PAYABLE_TRANSFER_ESCROW */,
-        expiredAt,
-        transferFareAmount.fare.contractAddress
-      );
-    });
-  }
-  sendMessage(jobId, message, nextPhase) {
-    return __async(this, null, function* () {
-      return yield this.acpContractClient.createMemo(
-        jobId,
-        JSON.stringify(message),
-        0 /* MESSAGE */,
-        false,
-        nextPhase
-      );
-    });
-  }
-  responseFundsTransfer(memoId, accept, reason) {
-    return __async(this, null, function* () {
-      return yield this.acpContractClient.signMemo(memoId, accept, reason);
-    });
-  }
-  rejectJob(jobId, reason) {
-    return __async(this, null, function* () {
-      return yield this.acpContractClient.createMemo(
-        jobId,
-        `Job ${jobId} rejected. ${reason || ""}`,
-        0 /* MESSAGE */,
-        false,
-        5 /* REJECTED */
-      );
-    });
-  }
-  deliverJob(jobId, deliverable) {
-    return __async(this, null, function* () {
-      return yield this.acpContractClient.createMemo(
-        jobId,
-        preparePayload(deliverable),
-        4 /* OBJECT_URL */,
-        true,
-        4 /* COMPLETED */
+      payloads.push(
+        this.acpContractClient.createMemo(
+          jobId,
+          preparePayload(serviceRequirement),
+          0 /* MESSAGE */,
+          true,
+          1 /* NEGOTIATION */
+        )
       );
+      yield this.acpContractClient.handleOperation(payloads);
+      return jobId;
     });
   }
   getActiveJobs(page = 1, pageSize = 10) {
@@ -4811,7 +4347,7 @@ var acpClient_default = AcpClient;
 var import_core = require("@aa-sdk/core");
 var import_infra2 = require("@account-kit/infra");
 var import_smart_contracts = require("@account-kit/smart-contracts");
-var import_viem4 = require("viem");
+var import_viem5 = require("viem");
 var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_default {
   constructor(agentWalletAddress, config = baseAcpConfig) {
     super(agentWalletAddress, config);
@@ -4866,14 +4402,14 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
       return finalMaxFeePerGas;
     });
   }
-  handleOperation(_0) {
-    return __async(this, arguments, function* (data, contractAddress = this.contractAddress, value) {
+  handleOperation(operations) {
+    return __async(this, null, function* () {
       const payload = {
-        uo: {
-          target: contractAddress,
-          data,
-          value
-        },
+        uo: operations.map((op) => ({
+          target: op.contractAddress,
+          data: op.data,
+          value: op.value
+        })),
         overrides: {
           nonceKey: this.getRandomNonce()
         }
@@ -4914,7 +4450,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
       const contractLogs = result.logs.filter((log) => {
         return log.address.toLowerCase() === this.contractAddress.toLowerCase();
       }).map(
-        (log) => (0, import_viem4.decodeEventLog)({
+        (log) => (0, import_viem5.decodeEventLog)({
           abi: this.abi,
           data: log.data,
           topics: log.topics
@@ -4930,68 +4466,73 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
     });
   }
   createJob(providerAddress, evaluatorAddress, expireAt, paymentTokenAddress, budgetBaseUnit, metadata) {
-    return __async(this, null, function* () {
-      try {
-        const data = (0, import_viem4.encodeFunctionData)({
-          abi: this.abi,
-          functionName: "createJob",
-          args: [
-            providerAddress,
-            evaluatorAddress,
-            Math.floor(expireAt.getTime() / 1e3)
-          ]
-        });
-        const hash = yield this.handleOperation(data, this.contractAddress);
-        const jobId = yield this.getJobId(
-          hash,
-          this.agentWalletAddress,
-          providerAddress
-        );
-        yield this.setBudgetWithPaymentToken(
-          jobId,
-          budgetBaseUnit,
-          paymentTokenAddress
-        );
-        return { txHash: hash, jobId };
-      } catch (error) {
-        throw new acpError_default("Failed to create job", error);
-      }
-    });
+    try {
+      const data = (0, import_viem5.encodeFunctionData)({
+        abi: this.abi,
+        functionName: "createJob",
+        args: [
+          providerAddress,
+          evaluatorAddress,
+          Math.floor(expireAt.getTime() / 1e3)
+        ]
+      });
+      const payload = {
+        data,
+        contractAddress: this.contractAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to create job", error);
+    }
   }
-  createPayableMemo(_0, _1, _2, _3, _4, _5, _6, _7, _8) {
-    return __async(this, arguments, function* (jobId, content, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, nextPhase, type, expiredAt, token = this.config.baseFare.contractAddress, secured = true) {
-      try {
-        const data = (0, import_viem4.encodeFunctionData)({
-          abi: this.abi,
-          functionName: "createPayableMemo",
-          args: [
-            jobId,
-            content,
-            token,
-            amountBaseUnit,
-            recipient,
-            feeAmountBaseUnit,
-            feeType,
-            type,
-            nextPhase,
-            Math.floor(expiredAt.getTime() / 1e3)
-          ]
-        });
-        return yield this.handleOperation(data, this.contractAddress);
-      } catch (error) {
-        throw new acpError_default("Failed to create payable memo", error);
-      }
-    });
+  setBudgetWithPaymentToken(jobId, budgetBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
+    try {
+      const data = (0, import_viem5.encodeFunctionData)({
+        abi: this.abi,
+        functionName: "setBudgetWithPaymentToken",
+        args: [jobId, budgetBaseUnit, paymentTokenAddress]
+      });
+      const payload = {
+        data,
+        contractAddress: this.contractAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to set budget", error);
+    }
+  }
+  createPayableMemo(jobId, content, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, nextPhase, type, expiredAt, token = this.config.baseFare.contractAddress, secured = true) {
+    try {
+      const data = (0, import_viem5.encodeFunctionData)({
+        abi: this.abi,
+        functionName: "createPayableMemo",
+        args: [
+          jobId,
+          content,
+          token,
+          amountBaseUnit,
+          recipient,
+          feeAmountBaseUnit,
+          feeType,
+          type,
+          nextPhase,
+          Math.floor(expiredAt.getTime() / 1e3)
+        ]
+      });
+      const payload = {
+        data,
+        contractAddress: this.contractAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to create payable memo", error);
+    }
   }
   createJobWithAccount(accountId, providerAddress, evaluatorAddress, budgetBaseUnit, paymentTokenAddress, expiredAt) {
-    return __async(this, null, function* () {
-      throw new acpError_default("Not Supported");
-    });
+    throw new acpError_default("Not Supported");
   }
   updateAccountMetadata(accountId, metadata) {
-    return __async(this, null, function* () {
-      throw new acpError_default("Not Supported");
-    });
+    throw new acpError_default("Not Supported");
   }
 };
 var acpContractClient_default = AcpContractClient;
@@ -5000,7 +4541,7 @@ var acpContractClient_default = AcpContractClient;
 var import_core2 = require("@aa-sdk/core");
 var import_infra3 = require("@account-kit/infra");
 var import_smart_contracts2 = require("@account-kit/smart-contracts");
-var import_viem5 = require("viem");
+var import_viem6 = require("viem");
 
 // src/abis/jobManagerAbi.ts
 var JOB_MANAGER_ABI = [
@@ -5874,9 +5415,9 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
   }
   static build(_0, _1, _2) {
     return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
-      const publicClient = (0, import_viem5.createPublicClient)({
+      const publicClient = (0, import_viem6.createPublicClient)({
         chain: config.chain,
-        transport: (0, import_viem5.http)(config.rpcEndpoint)
+        transport: (0, import_viem6.http)(config.rpcEndpoint)
       });
       const [jobManagerAddress, memoManagerAddress, accountManagerAddress] = yield publicClient.multicall({
         contracts: [
@@ -5952,14 +5493,14 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
       return finalMaxFeePerGas;
     });
   }
-  handleOperation(_0) {
-    return __async(this, arguments, function* (data, contractAddress = this.contractAddress, value) {
+  handleOperation(operations) {
+    return __async(this, null, function* () {
       const payload = {
-        uo: {
-          target: contractAddress,
-          data,
-          value
-        },
+        uo: operations.map((operation) => ({
+          target: operation.contractAddress,
+          data: operation.data,
+          value: operation.value
+        })),
         overrides: {
           nonceKey: this.getRandomNonce()
         }
@@ -5976,7 +5517,13 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
           }
           const { hash } = yield this.sessionKeyClient.sendUserOperation(payload);
           yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash
+            hash,
+            tag: "pending",
+            retries: {
+              intervalMs: 200,
+              multiplier: 1.1,
+              maxRetries: 10
+            }
           });
           return hash;
         } catch (error) {
@@ -5993,14 +5540,17 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
   }
   getJobId(hash, clientAddress, providerAddress) {
     return __async(this, null, function* () {
-      const result = yield this.sessionKeyClient.getUserOperationReceipt(hash);
+      const result = yield this.sessionKeyClient.getUserOperationReceipt(
+        hash,
+        "pending"
+      );
       if (!result) {
         throw new acpError_default("Failed to get user operation receipt");
       }
       const contractLogs = result.logs.filter((log) => {
         return log.address.toLowerCase() === this.jobManagerAddress.toLowerCase();
       }).map(
-        (log) => (0, import_viem5.decodeEventLog)({
+        (log) => (0, import_viem6.decodeEventLog)({
           abi: jobManagerAbi_default,
           data: log.data,
           topics: log.topics