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

package/README.md

@@ -8,7 +8,6 @@ The Agent Commerce Protocol (ACP) Node SDK is a modular, agentic-framework-agnos
 - [ACP Node SDK](#acp-node-sdk)
   - [Features](#features)
   - [Prerequisites](#prerequisites)
-    - [Testing Requirements](#testing-requirements)
   - [Installation](#installation)
   - [Usage](#usage)
   - [Core Functionality](#core-functionality)
@@ -46,14 +45,29 @@ The ACP Node SDK provides the following core functionalities:
 
 ## Prerequisites
 
-⚠️ **Important**: Before testing your agent's services with a counterpart agent, you must register your agent with the [Service Registry](https://acp-staging.virtuals.io/). This step is critical as without registration, other agents will not be able to discover or interact with your agent.
+⚠️ **Important**: Before testing your agent's services with a counterpart agent, you must register your agent with the [Service Registry](https://app.virtuals.io/acp/join). This step is critical as without registration, other agents will not be able to discover or interact with your agent.
 
-### Testing Requirements
+### Testing Flow
+#### 1. Register a New Agent
+- You’ll be working in the sandbox environment. Follow the [tutorial](https://whitepaper.virtuals.io/info-hub/builders-hub/agent-commerce-protocol-acp-builder-guide/acp-tech-playbook#id-2.-agent-creation-and-whitelisting) here to create your agent.
 
-For testing on Base Sepolia:
-- You'll need $BMW tokens (Virtuals testnet token) for transactions
-- Contract address: `0xbfAB80ccc15DF6fb7185f9498d6039317331846a`
-- If you need $BMW tokens for testing, please reach out to Virtuals' DevRel team
+#### 2. Create Smart Wallet and Whitelist Dev Wallet
+- Follow the [tutorial](https://whitepaper.virtuals.io/info-hub/builders-hub/agent-commerce-protocol-acp-builder-guide/acp-tech-playbook#id-2b.-create-smart-wallet-account-and-wallet-whitelisting-steps) here
+
+#### 3. Use Self-Evaluation Flow to Test the Full Job Lifecycle
+- Node SDK (Self Evaluation Example): [Link](https://github.com/Virtual-Protocol/acp-node/tree/main/examples/acp-base/self-evaluation)
+
+#### 4. Fund Your Test Agent
+- Top up your test buyer agent with $VIRTUAL. Gas fee is sponsored, ETH are not required.
+- It is recommended to set the service price of the seller agent to $0.01 for testing purposes.
+
+#### 5. Run Your Test Agent
+- Set up your environment variables correctly (private key, wallet address, entity ID, etc.)
+- When inserting `WHITELISTED_WALLET_PRIVATE_KEY`, you do not need to include the 0x prefix.
+
+#### 6. Set up your buyer agent search keyword.
+- Run your agent script.
+- Note: Your agent will only appear in the sandbox after it has initiated at least 1 job request.
 
 ## Installation
 

package/dist/index.d.mts

@@ -114,8 +114,7 @@ declare enum MemoType {
     TXHASH = 5,
     PAYABLE_REQUEST = 6,
     PAYABLE_TRANSFER = 7,
-    PAYABLE_FEE = 8,
-    PAYABLE_FEE_REQUEST = 9
+    PAYABLE_TRANSFER_ESCROW = 8
 }
 declare enum AcpJobPhases {
     REQUEST = 0,
@@ -8386,8 +8385,7 @@ declare class AcpContractClient {
         jobId: number;
     }>;
     approveAllowance(priceInWei: bigint): Promise<`0x${string}`>;
-    createPayableFeeMemo(jobId: number, content: string, amount: bigint, memoType: MemoType.PAYABLE_FEE | MemoType.PAYABLE_FEE_REQUEST, nextPhase: AcpJobPhases): Promise<`0x${string}`>;
-    createPayableMemo(jobId: number, content: string, amount: bigint, recipient: Address, feeAmount: bigint, feeType: FeeType, nextPhase: AcpJobPhases, type: MemoType.PAYABLE_REQUEST | MemoType.PAYABLE_TRANSFER, expiredAt?: Date, token?: Address): Promise<`0x${string}`>;
+    createPayableMemo(jobId: number, content: string, amount: bigint, recipient: Address, feeAmount: bigint, feeType: FeeType, nextPhase: AcpJobPhases, type: MemoType.PAYABLE_REQUEST | MemoType.PAYABLE_TRANSFER_ESCROW, expiredAt: Date, token?: Address): Promise<`0x${string}`>;
     createMemo(jobId: number, content: string, type: MemoType, isSecured: boolean, nextPhase: AcpJobPhases): Promise<Address>;
     getMemoId(hash: Address): Promise<number>;
     signMemo(memoId: number, isApproved: boolean, reason?: string): Promise<`0x${string}`>;
@@ -8547,19 +8545,20 @@ declare class AcpJob {
     respond<T>(accept: boolean, payload?: GenericPayload<T>, reason?: string): Promise<`0x${string}` | undefined>;
     deliver(deliverable: IDeliverable): Promise<`0x${string}`>;
     evaluate(accept: boolean, reason?: string): Promise<`0x${string}`>;
-    openPosition(payload: OpenPositionPayload[], feeAmount: number, expiredAt?: Date, walletAddress?: Address$1): Promise<`0x${string}`>;
+    openPosition(payload: OpenPositionPayload[], feeAmount: number, expiredAt?: Date, // 3 minutes
+    walletAddress?: Address$1): Promise<`0x${string}`>;
     responseOpenPosition(memoId: number, accept: boolean, reason: string): Promise<`0x${string}`>;
-    closePartialPosition(payload: ClosePositionPayload): Promise<`0x${string}`>;
+    closePartialPosition(payload: ClosePositionPayload, expireAt?: Date): Promise<`0x${string}`>;
     responseClosePartialPosition(memoId: number, accept: boolean, reason: string): Promise<`0x${string}`>;
     requestClosePosition(payload: RequestClosePositionPayload): Promise<`0x${string}`>;
-    responseRequestClosePosition(memoId: number, accept: boolean, payload: ClosePositionPayload, reason?: string): Promise<`0x${string}` | undefined>;
+    responseRequestClosePosition(memoId: number, accept: boolean, payload: ClosePositionPayload, reason?: string, expiredAt?: Date): Promise<`0x${string}` | undefined>;
     confirmClosePosition(memoId: number, accept: boolean, reason?: string): Promise<void>;
-    positionFulfilled(payload: PositionFulfilledPayload): Promise<`0x${string}`>;
-    unfulfilledPosition(payload: UnfulfilledPositionPayload): Promise<`0x${string}`>;
+    positionFulfilled(payload: PositionFulfilledPayload, expiredAt?: Date): Promise<`0x${string}`>;
+    unfulfilledPosition(payload: UnfulfilledPositionPayload, expiredAt?: Date): Promise<`0x${string}`>;
     responseUnfulfilledPosition(memoId: number, accept: boolean, reason: string): Promise<`0x${string}`>;
     responsePositionFulfilled(memoId: number, accept: boolean, reason: string): Promise<`0x${string}`>;
     closeJob(message?: string): Promise<`0x${string}`>;
-    responseCloseJob(memoId: number, accept: boolean, fulfilledPositions: PositionFulfilledPayload[], reason?: string): Promise<`0x${string}` | undefined>;
+    responseCloseJob(memoId: number, accept: boolean, fulfilledPositions: PositionFulfilledPayload[], reason?: string, expiredAt?: Date): Promise<`0x${string}` | undefined>;
     confirmJobClosure(memoId: number, accept: boolean, reason?: string): Promise<void>;
 }
 
@@ -8607,9 +8606,9 @@ declare class AcpClient {
     initiateJob(providerAddress: Address$1, serviceRequirement: Object | string, amount: number, evaluatorAddress?: Address$1, expiredAt?: Date): Promise<number>;
     respondJob(jobId: number, memoId: number, accept: boolean, content?: string, reason?: string): Promise<`0x${string}` | undefined>;
     payJob(jobId: number, amount: number, memoId: number, reason?: string): Promise<`0x${string}`>;
-    requestFunds<T>(jobId: number, amount: number, recipient: Address$1, feeAmount: number, feeType: FeeType, reason: GenericPayload<T>, nextPhase: AcpJobPhases): Promise<`0x${string}`>;
+    requestFunds<T>(jobId: number, amount: number, recipient: Address$1, feeAmount: number, feeType: FeeType, reason: GenericPayload<T>, nextPhase: AcpJobPhases, expiredAt: Date): Promise<`0x${string}`>;
     responseFundsRequest(memoId: number, accept: boolean, amount: number, reason?: string): Promise<`0x${string}`>;
-    transferFunds<T>(jobId: number, amount: number, recipient: Address$1, feeAmount: number, feeType: FeeType, reason: GenericPayload<T>, nextPhase: AcpJobPhases, expiredAt?: Date): Promise<`0x${string}`>;
+    transferFunds<T>(jobId: number, amount: number, recipient: Address$1, feeAmount: number, feeType: FeeType, reason: GenericPayload<T>, nextPhase: AcpJobPhases, expiredAt: Date): Promise<`0x${string}`>;
     sendMessage<T>(jobId: number, message: GenericPayload<T>, nextPhase: AcpJobPhases): Promise<`0x${string}`>;
     responseFundsTransfer(memoId: number, accept: boolean, reason?: string): Promise<`0x${string}`>;
     deliverJob(jobId: number, deliverable: IDeliverable): Promise<`0x${string}`>;

package/dist/index.d.ts

@@ -114,8 +114,7 @@ declare enum MemoType {
     TXHASH = 5,
     PAYABLE_REQUEST = 6,
     PAYABLE_TRANSFER = 7,
-    PAYABLE_FEE = 8,
-    PAYABLE_FEE_REQUEST = 9
+    PAYABLE_TRANSFER_ESCROW = 8
 }
 declare enum AcpJobPhases {
     REQUEST = 0,
@@ -8386,8 +8385,7 @@ declare class AcpContractClient {
         jobId: number;
     }>;
     approveAllowance(priceInWei: bigint): Promise<`0x${string}`>;
-    createPayableFeeMemo(jobId: number, content: string, amount: bigint, memoType: MemoType.PAYABLE_FEE | MemoType.PAYABLE_FEE_REQUEST, nextPhase: AcpJobPhases): Promise<`0x${string}`>;
-    createPayableMemo(jobId: number, content: string, amount: bigint, recipient: Address, feeAmount: bigint, feeType: FeeType, nextPhase: AcpJobPhases, type: MemoType.PAYABLE_REQUEST | MemoType.PAYABLE_TRANSFER, expiredAt?: Date, token?: Address): Promise<`0x${string}`>;
+    createPayableMemo(jobId: number, content: string, amount: bigint, recipient: Address, feeAmount: bigint, feeType: FeeType, nextPhase: AcpJobPhases, type: MemoType.PAYABLE_REQUEST | MemoType.PAYABLE_TRANSFER_ESCROW, expiredAt: Date, token?: Address): Promise<`0x${string}`>;
     createMemo(jobId: number, content: string, type: MemoType, isSecured: boolean, nextPhase: AcpJobPhases): Promise<Address>;
     getMemoId(hash: Address): Promise<number>;
     signMemo(memoId: number, isApproved: boolean, reason?: string): Promise<`0x${string}`>;
@@ -8547,19 +8545,20 @@ declare class AcpJob {
     respond<T>(accept: boolean, payload?: GenericPayload<T>, reason?: string): Promise<`0x${string}` | undefined>;
     deliver(deliverable: IDeliverable): Promise<`0x${string}`>;
     evaluate(accept: boolean, reason?: string): Promise<`0x${string}`>;
-    openPosition(payload: OpenPositionPayload[], feeAmount: number, expiredAt?: Date, walletAddress?: Address$1): Promise<`0x${string}`>;
+    openPosition(payload: OpenPositionPayload[], feeAmount: number, expiredAt?: Date, // 3 minutes
+    walletAddress?: Address$1): Promise<`0x${string}`>;
     responseOpenPosition(memoId: number, accept: boolean, reason: string): Promise<`0x${string}`>;
-    closePartialPosition(payload: ClosePositionPayload): Promise<`0x${string}`>;
+    closePartialPosition(payload: ClosePositionPayload, expireAt?: Date): Promise<`0x${string}`>;
     responseClosePartialPosition(memoId: number, accept: boolean, reason: string): Promise<`0x${string}`>;
     requestClosePosition(payload: RequestClosePositionPayload): Promise<`0x${string}`>;
-    responseRequestClosePosition(memoId: number, accept: boolean, payload: ClosePositionPayload, reason?: string): Promise<`0x${string}` | undefined>;
+    responseRequestClosePosition(memoId: number, accept: boolean, payload: ClosePositionPayload, reason?: string, expiredAt?: Date): Promise<`0x${string}` | undefined>;
     confirmClosePosition(memoId: number, accept: boolean, reason?: string): Promise<void>;
-    positionFulfilled(payload: PositionFulfilledPayload): Promise<`0x${string}`>;
-    unfulfilledPosition(payload: UnfulfilledPositionPayload): Promise<`0x${string}`>;
+    positionFulfilled(payload: PositionFulfilledPayload, expiredAt?: Date): Promise<`0x${string}`>;
+    unfulfilledPosition(payload: UnfulfilledPositionPayload, expiredAt?: Date): Promise<`0x${string}`>;
     responseUnfulfilledPosition(memoId: number, accept: boolean, reason: string): Promise<`0x${string}`>;
     responsePositionFulfilled(memoId: number, accept: boolean, reason: string): Promise<`0x${string}`>;
     closeJob(message?: string): Promise<`0x${string}`>;
-    responseCloseJob(memoId: number, accept: boolean, fulfilledPositions: PositionFulfilledPayload[], reason?: string): Promise<`0x${string}` | undefined>;
+    responseCloseJob(memoId: number, accept: boolean, fulfilledPositions: PositionFulfilledPayload[], reason?: string, expiredAt?: Date): Promise<`0x${string}` | undefined>;
     confirmJobClosure(memoId: number, accept: boolean, reason?: string): Promise<void>;
 }
 
@@ -8607,9 +8606,9 @@ declare class AcpClient {
     initiateJob(providerAddress: Address$1, serviceRequirement: Object | string, amount: number, evaluatorAddress?: Address$1, expiredAt?: Date): Promise<number>;
     respondJob(jobId: number, memoId: number, accept: boolean, content?: string, reason?: string): Promise<`0x${string}` | undefined>;
     payJob(jobId: number, amount: number, memoId: number, reason?: string): Promise<`0x${string}`>;
-    requestFunds<T>(jobId: number, amount: number, recipient: Address$1, feeAmount: number, feeType: FeeType, reason: GenericPayload<T>, nextPhase: AcpJobPhases): Promise<`0x${string}`>;
+    requestFunds<T>(jobId: number, amount: number, recipient: Address$1, feeAmount: number, feeType: FeeType, reason: GenericPayload<T>, nextPhase: AcpJobPhases, expiredAt: Date): Promise<`0x${string}`>;
     responseFundsRequest(memoId: number, accept: boolean, amount: number, reason?: string): Promise<`0x${string}`>;
-    transferFunds<T>(jobId: number, amount: number, recipient: Address$1, feeAmount: number, feeType: FeeType, reason: GenericPayload<T>, nextPhase: AcpJobPhases, expiredAt?: Date): Promise<`0x${string}`>;
+    transferFunds<T>(jobId: number, amount: number, recipient: Address$1, feeAmount: number, feeType: FeeType, reason: GenericPayload<T>, nextPhase: AcpJobPhases, expiredAt: Date): Promise<`0x${string}`>;
     sendMessage<T>(jobId: number, message: GenericPayload<T>, nextPhase: AcpJobPhases): Promise<`0x${string}`>;
     responseFundsTransfer(memoId: number, accept: boolean, reason?: string): Promise<`0x${string}`>;
     deliverJob(jobId: number, deliverable: IDeliverable): Promise<`0x${string}`>;

package/dist/index.js

@@ -72,7 +72,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.2.0-beta.3",
+      version: "0.2.0-beta.5",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -410,6 +410,49 @@ var ACP_ABI = [
     name: "PayableFeeRequestExecuted",
     type: "event"
   },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "memoId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "sender",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "token",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "feeAmount",
+        type: "uint256"
+      }
+    ],
+    name: "PayableFundsEscrowed",
+    type: "event"
+  },
   {
     anonymous: false,
     inputs: [
@@ -908,6 +951,15 @@ var ACP_ABI = [
     stateMutability: "view",
     type: "function"
   },
+  {
+    inputs: [{ internalType: "uint256", name: "jobId", type: "uint256" }],
+    name: "jobPayment",
+    outputs: [
+      { internalType: "address", name: "paymentToken", type: "address" }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [{ internalType: "uint256", name: "", type: "uint256" }],
     name: "jobs",
@@ -1079,6 +1131,13 @@ var ACP_ABI = [
     outputs: [],
     stateMutability: "nonpayable",
     type: "function"
+  },
+  {
+    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
+    name: "withdrawEscrowedFunds",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
   }
 ];
 var acpAbi_default = ACP_ABI;
@@ -1127,8 +1186,7 @@ var MemoType = /* @__PURE__ */ ((MemoType2) => {
   MemoType2[MemoType2["TXHASH"] = 5] = "TXHASH";
   MemoType2[MemoType2["PAYABLE_REQUEST"] = 6] = "PAYABLE_REQUEST";
   MemoType2[MemoType2["PAYABLE_TRANSFER"] = 7] = "PAYABLE_TRANSFER";
-  MemoType2[MemoType2["PAYABLE_FEE"] = 8] = "PAYABLE_FEE";
-  MemoType2[MemoType2["PAYABLE_FEE_REQUEST"] = 9] = "PAYABLE_FEE_REQUEST";
+  MemoType2[MemoType2["PAYABLE_TRANSFER_ESCROW"] = 8] = "PAYABLE_TRANSFER_ESCROW";
   return MemoType2;
 })(MemoType || {});
 var AcpJobPhases = /* @__PURE__ */ ((AcpJobPhases2) => {
@@ -1300,37 +1358,6 @@ var AcpContractClient = class _AcpContractClient {
       }
     });
   }
-  createPayableFeeMemo(jobId, content, amount, memoType, nextPhase) {
-    return __async(this, null, function* () {
-      let retries = 3;
-      while (retries > 0) {
-        try {
-          const data = (0, import_viem.encodeFunctionData)({
-            abi: acpAbi_default,
-            functionName: "createPayableFeeMemo",
-            args: [jobId, content, amount, memoType, nextPhase]
-          });
-          const { hash } = yield this.sessionKeyClient.sendUserOperation({
-            uo: {
-              target: this.contractAddress,
-              data
-            }
-          });
-          yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash
-          });
-          return hash;
-        } catch (error) {
-          console.error(
-            `failed to create payable fee memo ${jobId} ${content} ${error}`
-          );
-          retries -= 1;
-          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
-        }
-      }
-      throw new Error("Failed to create payable fee memo");
-    });
-  }
   createPayableMemo(_0, _1, _2, _3, _4, _5, _6, _7, _8) {
     return __async(this, arguments, function* (jobId, content, amount, recipient, feeAmount, feeType, nextPhase, type, expiredAt, token = this.config.virtualsTokenAddress) {
       let retries = 3;
@@ -1349,7 +1376,7 @@ var AcpContractClient = class _AcpContractClient {
               feeType,
               type,
               nextPhase,
-              expiredAt ? Math.floor(expiredAt.getTime() / 1e3) : 0
+              Math.floor(expiredAt.getTime() / 1e3)
             ]
           });
           const { hash } = yield this.sessionKeyClient.sendUserOperation({
@@ -1571,8 +1598,8 @@ var AcpJob = class {
       );
     });
   }
-  openPosition(payload, feeAmount, expiredAt, walletAddress) {
-    return __async(this, null, function* () {
+  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 Error("No positions to open");
       }
@@ -1594,7 +1621,7 @@ var AcpJob = class {
   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) !== 7 /* PAYABLE_TRANSFER */) {
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
         throw new Error("No open position memo found");
       }
       const payload = tryParseJson(
@@ -1606,8 +1633,8 @@ var AcpJob = class {
       return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
     });
   }
-  closePartialPosition(payload) {
-    return __async(this, null, function* () {
+  closePartialPosition(_0) {
+    return __async(this, arguments, function* (payload, expireAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       return yield this.acpClient.requestFunds(
         this.id,
         payload.amount,
@@ -1618,7 +1645,8 @@ var AcpJob = class {
           type: "close_partial_position" /* CLOSE_PARTIAL_POSITION */,
           data: payload
         },
-        2 /* TRANSACTION */
+        2 /* TRANSACTION */,
+        expireAt
       );
     });
   }
@@ -1654,8 +1682,8 @@ var AcpJob = class {
       );
     });
   }
-  responseRequestClosePosition(memoId, accept, payload, reason) {
-    return __async(this, null, function* () {
+  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 Error("No message memo found");
@@ -1676,7 +1704,8 @@ var AcpJob = class {
             type: "close_position" /* CLOSE_POSITION */,
             data: payload
           },
-          2 /* TRANSACTION */
+          2 /* TRANSACTION */,
+          expiredAt
         );
       }
     });
@@ -1684,7 +1713,7 @@ var AcpJob = class {
   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) !== 7 /* PAYABLE_TRANSFER */) {
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
         throw new Error("No payable transfer memo found");
       }
       const payload = tryParseJson(
@@ -1696,8 +1725,8 @@ var AcpJob = class {
       yield memo.sign(accept, reason);
     });
   }
-  positionFulfilled(payload) {
-    return __async(this, null, function* () {
+  positionFulfilled(_0) {
+    return __async(this, arguments, function* (payload, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       return yield this.acpClient.transferFunds(
         this.id,
         payload.amount,
@@ -1708,12 +1737,13 @@ var AcpJob = class {
           type: "position_fulfilled" /* POSITION_FULFILLED */,
           data: payload
         },
-        2 /* TRANSACTION */
+        2 /* TRANSACTION */,
+        expiredAt
       );
     });
   }
-  unfulfilledPosition(payload) {
-    return __async(this, null, function* () {
+  unfulfilledPosition(_0) {
+    return __async(this, arguments, function* (payload, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       return yield this.acpClient.transferFunds(
         this.id,
         payload.amount,
@@ -1724,14 +1754,15 @@ var AcpJob = class {
           type: "unfulfilled_position" /* UNFULFILLED_POSITION */,
           data: payload
         },
-        2 /* TRANSACTION */
+        2 /* TRANSACTION */,
+        expiredAt
       );
     });
   }
   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) !== 7 /* PAYABLE_TRANSFER */) {
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
         throw new Error("No unfulfilled position memo found");
       }
       const payload = tryParseJson(
@@ -1746,7 +1777,7 @@ var AcpJob = class {
   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) !== 7 /* PAYABLE_TRANSFER */) {
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
         throw new Error("No position fulfilled memo found");
       }
       const payload = tryParseJson(
@@ -1772,8 +1803,8 @@ var AcpJob = class {
       );
     });
   }
-  responseCloseJob(memoId, accept, fulfilledPositions, reason) {
-    return __async(this, null, function* () {
+  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 Error("No message memo found");
@@ -1812,7 +1843,8 @@ var AcpJob = class {
           type: "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */,
           data: fulfilledPositions
         },
-        4 /* COMPLETED */
+        4 /* COMPLETED */,
+        expiredAt
       );
     });
   }
@@ -2130,7 +2162,7 @@ var AcpClient = class {
       );
     });
   }
-  requestFunds(jobId, amount, recipient, feeAmount, feeType, reason, nextPhase) {
+  requestFunds(jobId, amount, recipient, feeAmount, feeType, reason, nextPhase, expiredAt) {
     return __async(this, null, function* () {
       return yield this.acpContractClient.createPayableMemo(
         jobId,
@@ -2140,7 +2172,8 @@ var AcpClient = class {
         (0, import_viem2.parseEther)(feeAmount.toString()),
         feeType,
         nextPhase,
-        6 /* PAYABLE_REQUEST */
+        6 /* PAYABLE_REQUEST */,
+        expiredAt
       );
     });
   }
@@ -2173,7 +2206,7 @@ var AcpClient = class {
         (0, import_viem2.parseEther)(feeAmount.toString()),
         feeType,
         nextPhase,
-        7 /* PAYABLE_TRANSFER */,
+        8 /* PAYABLE_TRANSFER_ESCROW */,
         expiredAt
       );
     });

package/dist/index.mjs

@@ -47,7 +47,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.2.0-beta.3",
+      version: "0.2.0-beta.5",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -365,6 +365,49 @@ var ACP_ABI = [
     name: "PayableFeeRequestExecuted",
     type: "event"
   },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "memoId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "sender",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "token",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "feeAmount",
+        type: "uint256"
+      }
+    ],
+    name: "PayableFundsEscrowed",
+    type: "event"
+  },
   {
     anonymous: false,
     inputs: [
@@ -863,6 +906,15 @@ var ACP_ABI = [
     stateMutability: "view",
     type: "function"
   },
+  {
+    inputs: [{ internalType: "uint256", name: "jobId", type: "uint256" }],
+    name: "jobPayment",
+    outputs: [
+      { internalType: "address", name: "paymentToken", type: "address" }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [{ internalType: "uint256", name: "", type: "uint256" }],
     name: "jobs",
@@ -1034,6 +1086,13 @@ var ACP_ABI = [
     outputs: [],
     stateMutability: "nonpayable",
     type: "function"
+  },
+  {
+    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
+    name: "withdrawEscrowedFunds",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
   }
 ];
 var acpAbi_default = ACP_ABI;
@@ -1091,8 +1150,7 @@ var MemoType = /* @__PURE__ */ ((MemoType2) => {
   MemoType2[MemoType2["TXHASH"] = 5] = "TXHASH";
   MemoType2[MemoType2["PAYABLE_REQUEST"] = 6] = "PAYABLE_REQUEST";
   MemoType2[MemoType2["PAYABLE_TRANSFER"] = 7] = "PAYABLE_TRANSFER";
-  MemoType2[MemoType2["PAYABLE_FEE"] = 8] = "PAYABLE_FEE";
-  MemoType2[MemoType2["PAYABLE_FEE_REQUEST"] = 9] = "PAYABLE_FEE_REQUEST";
+  MemoType2[MemoType2["PAYABLE_TRANSFER_ESCROW"] = 8] = "PAYABLE_TRANSFER_ESCROW";
   return MemoType2;
 })(MemoType || {});
 var AcpJobPhases = /* @__PURE__ */ ((AcpJobPhases2) => {
@@ -1264,37 +1322,6 @@ var AcpContractClient = class _AcpContractClient {
       }
     });
   }
-  createPayableFeeMemo(jobId, content, amount, memoType, nextPhase) {
-    return __async(this, null, function* () {
-      let retries = 3;
-      while (retries > 0) {
-        try {
-          const data = encodeFunctionData({
-            abi: acpAbi_default,
-            functionName: "createPayableFeeMemo",
-            args: [jobId, content, amount, memoType, nextPhase]
-          });
-          const { hash } = yield this.sessionKeyClient.sendUserOperation({
-            uo: {
-              target: this.contractAddress,
-              data
-            }
-          });
-          yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash
-          });
-          return hash;
-        } catch (error) {
-          console.error(
-            `failed to create payable fee memo ${jobId} ${content} ${error}`
-          );
-          retries -= 1;
-          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
-        }
-      }
-      throw new Error("Failed to create payable fee memo");
-    });
-  }
   createPayableMemo(_0, _1, _2, _3, _4, _5, _6, _7, _8) {
     return __async(this, arguments, function* (jobId, content, amount, recipient, feeAmount, feeType, nextPhase, type, expiredAt, token = this.config.virtualsTokenAddress) {
       let retries = 3;
@@ -1313,7 +1340,7 @@ var AcpContractClient = class _AcpContractClient {
               feeType,
               type,
               nextPhase,
-              expiredAt ? Math.floor(expiredAt.getTime() / 1e3) : 0
+              Math.floor(expiredAt.getTime() / 1e3)
             ]
           });
           const { hash } = yield this.sessionKeyClient.sendUserOperation({
@@ -1535,8 +1562,8 @@ var AcpJob = class {
       );
     });
   }
-  openPosition(payload, feeAmount, expiredAt, walletAddress) {
-    return __async(this, null, function* () {
+  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 Error("No positions to open");
       }
@@ -1558,7 +1585,7 @@ var AcpJob = class {
   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) !== 7 /* PAYABLE_TRANSFER */) {
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
         throw new Error("No open position memo found");
       }
       const payload = tryParseJson(
@@ -1570,8 +1597,8 @@ var AcpJob = class {
       return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
     });
   }
-  closePartialPosition(payload) {
-    return __async(this, null, function* () {
+  closePartialPosition(_0) {
+    return __async(this, arguments, function* (payload, expireAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       return yield this.acpClient.requestFunds(
         this.id,
         payload.amount,
@@ -1582,7 +1609,8 @@ var AcpJob = class {
           type: "close_partial_position" /* CLOSE_PARTIAL_POSITION */,
           data: payload
         },
-        2 /* TRANSACTION */
+        2 /* TRANSACTION */,
+        expireAt
       );
     });
   }
@@ -1618,8 +1646,8 @@ var AcpJob = class {
       );
     });
   }
-  responseRequestClosePosition(memoId, accept, payload, reason) {
-    return __async(this, null, function* () {
+  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 Error("No message memo found");
@@ -1640,7 +1668,8 @@ var AcpJob = class {
             type: "close_position" /* CLOSE_POSITION */,
             data: payload
           },
-          2 /* TRANSACTION */
+          2 /* TRANSACTION */,
+          expiredAt
         );
       }
     });
@@ -1648,7 +1677,7 @@ var AcpJob = class {
   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) !== 7 /* PAYABLE_TRANSFER */) {
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
         throw new Error("No payable transfer memo found");
       }
       const payload = tryParseJson(
@@ -1660,8 +1689,8 @@ var AcpJob = class {
       yield memo.sign(accept, reason);
     });
   }
-  positionFulfilled(payload) {
-    return __async(this, null, function* () {
+  positionFulfilled(_0) {
+    return __async(this, arguments, function* (payload, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       return yield this.acpClient.transferFunds(
         this.id,
         payload.amount,
@@ -1672,12 +1701,13 @@ var AcpJob = class {
           type: "position_fulfilled" /* POSITION_FULFILLED */,
           data: payload
         },
-        2 /* TRANSACTION */
+        2 /* TRANSACTION */,
+        expiredAt
       );
     });
   }
-  unfulfilledPosition(payload) {
-    return __async(this, null, function* () {
+  unfulfilledPosition(_0) {
+    return __async(this, arguments, function* (payload, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       return yield this.acpClient.transferFunds(
         this.id,
         payload.amount,
@@ -1688,14 +1718,15 @@ var AcpJob = class {
           type: "unfulfilled_position" /* UNFULFILLED_POSITION */,
           data: payload
         },
-        2 /* TRANSACTION */
+        2 /* TRANSACTION */,
+        expiredAt
       );
     });
   }
   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) !== 7 /* PAYABLE_TRANSFER */) {
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
         throw new Error("No unfulfilled position memo found");
       }
       const payload = tryParseJson(
@@ -1710,7 +1741,7 @@ var AcpJob = class {
   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) !== 7 /* PAYABLE_TRANSFER */) {
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
         throw new Error("No position fulfilled memo found");
       }
       const payload = tryParseJson(
@@ -1736,8 +1767,8 @@ var AcpJob = class {
       );
     });
   }
-  responseCloseJob(memoId, accept, fulfilledPositions, reason) {
-    return __async(this, null, function* () {
+  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 Error("No message memo found");
@@ -1776,7 +1807,8 @@ var AcpJob = class {
           type: "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */,
           data: fulfilledPositions
         },
-        4 /* COMPLETED */
+        4 /* COMPLETED */,
+        expiredAt
       );
     });
   }
@@ -2094,7 +2126,7 @@ var AcpClient = class {
       );
     });
   }
-  requestFunds(jobId, amount, recipient, feeAmount, feeType, reason, nextPhase) {
+  requestFunds(jobId, amount, recipient, feeAmount, feeType, reason, nextPhase, expiredAt) {
     return __async(this, null, function* () {
       return yield this.acpContractClient.createPayableMemo(
         jobId,
@@ -2104,7 +2136,8 @@ var AcpClient = class {
         parseEther(feeAmount.toString()),
         feeType,
         nextPhase,
-        6 /* PAYABLE_REQUEST */
+        6 /* PAYABLE_REQUEST */,
+        expiredAt
       );
     });
   }
@@ -2137,7 +2170,7 @@ var AcpClient = class {
         parseEther(feeAmount.toString()),
         feeType,
         nextPhase,
-        7 /* PAYABLE_TRANSFER */,
+        8 /* PAYABLE_TRANSFER_ESCROW */,
         expiredAt
       );
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@virtuals-protocol/acp-node",
-  "version": "0.2.0-beta.3",
+  "version": "0.2.0-beta.5",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",