@virtuals-protocol/acp-node 0.3.0-beta.30 → 0.3.0-beta.32

package/dist/index.d.mts

@@ -281,22 +281,23 @@ declare class AcpJob {
     phase: AcpJobPhases;
     context: Record<string, any>;
     contractAddress: Address;
+    private _deliverable;
     netPayableAmount?: number | undefined;
     name: string | undefined;
     requirement: Record<string, any> | string | undefined;
     priceType: PriceType;
     priceValue: number;
-    constructor(acpClient: AcpClient, id: number, clientAddress: Address, providerAddress: Address, evaluatorAddress: Address, price: number, priceTokenAddress: Address, memos: AcpMemo[], phase: AcpJobPhases, context: Record<string, any>, contractAddress: Address, netPayableAmount?: number | undefined);
+    constructor(acpClient: AcpClient, id: number, clientAddress: Address, providerAddress: Address, evaluatorAddress: Address, price: number, priceTokenAddress: Address, memos: AcpMemo[], phase: AcpJobPhases, context: Record<string, any>, contractAddress: Address, _deliverable: DeliverablePayload | null, netPayableAmount?: number | undefined);
     get acpContractClient(): BaseAcpContractClient;
     get config(): AcpContractConfig;
     get baseFare(): Fare;
-    get deliverable(): string | undefined;
     get rejectionReason(): string | undefined;
     get providerAgent(): Promise<AcpAgent | null>;
     get clientAgent(): Promise<AcpAgent | null>;
     get evaluatorAgent(): Promise<AcpAgent | null>;
     get account(): Promise<AcpAccount | null>;
     get latestMemo(): AcpMemo | undefined;
+    getDeliverable(): Promise<DeliverablePayload | null>;
     createRequirement(content: string): Promise<{
         userOpHash: Address;
         txnHash: Address;
@@ -488,6 +489,11 @@ type X402PaymentResponse = {
     isPaymentRequired: boolean;
     data: X402PayableRequirements;
 };
+type IAcpMemoContent = {
+    id: number;
+    content: string;
+    url: string;
+};
 
 type SupportedChain = typeof mainnet | typeof sepolia | typeof polygon | typeof polygonAmoy | typeof bsc | typeof bscTestnet | typeof arbitrum | typeof arbitrumSepolia;
 declare class AcpContractConfig {
@@ -643,7 +649,8 @@ declare class AcpClient {
     getAgent(walletAddress: Address, options?: IAcpGetAgentOptions): Promise<AcpAgent | null>;
     getAccountByJobId(jobId: number, acpContractClient?: BaseAcpContractClient): Promise<AcpAccount | null>;
     getByClientAndProvider(clientAddress: Address, providerAddress: Address, acpContractClient?: BaseAcpContractClient): Promise<AcpAccount | null>;
-    createMemoContent(jobId: number, content: string): Promise<{}>;
+    createMemoContent(jobId: number, content: string): Promise<IAcpMemoContent>;
+    getMemoContent(url: string): Promise<string>;
     getTokenBalances(): Promise<{
         tokens: Record<string, any>;
     } | undefined>;

package/dist/index.d.ts

@@ -281,22 +281,23 @@ declare class AcpJob {
     phase: AcpJobPhases;
     context: Record<string, any>;
     contractAddress: Address;
+    private _deliverable;
     netPayableAmount?: number | undefined;
     name: string | undefined;
     requirement: Record<string, any> | string | undefined;
     priceType: PriceType;
     priceValue: number;
-    constructor(acpClient: AcpClient, id: number, clientAddress: Address, providerAddress: Address, evaluatorAddress: Address, price: number, priceTokenAddress: Address, memos: AcpMemo[], phase: AcpJobPhases, context: Record<string, any>, contractAddress: Address, netPayableAmount?: number | undefined);
+    constructor(acpClient: AcpClient, id: number, clientAddress: Address, providerAddress: Address, evaluatorAddress: Address, price: number, priceTokenAddress: Address, memos: AcpMemo[], phase: AcpJobPhases, context: Record<string, any>, contractAddress: Address, _deliverable: DeliverablePayload | null, netPayableAmount?: number | undefined);
     get acpContractClient(): BaseAcpContractClient;
     get config(): AcpContractConfig;
     get baseFare(): Fare;
-    get deliverable(): string | undefined;
     get rejectionReason(): string | undefined;
     get providerAgent(): Promise<AcpAgent | null>;
     get clientAgent(): Promise<AcpAgent | null>;
     get evaluatorAgent(): Promise<AcpAgent | null>;
     get account(): Promise<AcpAccount | null>;
     get latestMemo(): AcpMemo | undefined;
+    getDeliverable(): Promise<DeliverablePayload | null>;
     createRequirement(content: string): Promise<{
         userOpHash: Address;
         txnHash: Address;
@@ -488,6 +489,11 @@ type X402PaymentResponse = {
     isPaymentRequired: boolean;
     data: X402PayableRequirements;
 };
+type IAcpMemoContent = {
+    id: number;
+    content: string;
+    url: string;
+};
 
 type SupportedChain = typeof mainnet | typeof sepolia | typeof polygon | typeof polygonAmoy | typeof bsc | typeof bscTestnet | typeof arbitrum | typeof arbitrumSepolia;
 declare class AcpContractConfig {
@@ -643,7 +649,8 @@ declare class AcpClient {
     getAgent(walletAddress: Address, options?: IAcpGetAgentOptions): Promise<AcpAgent | null>;
     getAccountByJobId(jobId: number, acpContractClient?: BaseAcpContractClient): Promise<AcpAccount | null>;
     getByClientAndProvider(clientAddress: Address, providerAddress: Address, acpContractClient?: BaseAcpContractClient): Promise<AcpAccount | null>;
-    createMemoContent(jobId: number, content: string): Promise<{}>;
+    createMemoContent(jobId: number, content: string): Promise<IAcpMemoContent>;
+    getMemoContent(url: string): Promise<string>;
     getTokenBalances(): Promise<{
         tokens: Record<string, any>;
     } | undefined>;

package/dist/index.js

@@ -35,7 +35,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.30",
+      version: "0.3.0-beta.32",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -4225,7 +4225,7 @@ var acpJobOffering_default = AcpJobOffering;
 // src/acpJob.ts
 var util = __toESM(require("util"));
 var AcpJob = class {
-  constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, priceTokenAddress, memos, phase, context, contractAddress, netPayableAmount) {
+  constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, priceTokenAddress, memos, phase, context, contractAddress, _deliverable, netPayableAmount) {
     this.acpClient = acpClient;
     this.id = id;
     this.clientAddress = clientAddress;
@@ -4237,6 +4237,7 @@ var AcpJob = class {
     this.phase = phase;
     this.context = context;
     this.contractAddress = contractAddress;
+    this._deliverable = _deliverable;
     this.netPayableAmount = netPayableAmount;
     this.priceType = "fixed" /* FIXED */;
     this.priceValue = 0;
@@ -4272,9 +4273,6 @@ var AcpJob = class {
   get baseFare() {
     return this.acpContractClient.config.baseFare;
   }
-  get deliverable() {
-    return this.memos.find((m) => m.nextPhase === 4 /* COMPLETED */)?.content;
-  }
   get rejectionReason() {
     const requestMemo = this.memos.find(
       (m) => m.nextPhase === 1 /* NEGOTIATION */ && m.status === "REJECTED" /* REJECTED */
@@ -4299,6 +4297,21 @@ var AcpJob = class {
   get latestMemo() {
     return this.memos[this.memos.length - 1];
   }
+  async getDeliverable() {
+    if (!this._deliverable) {
+      return null;
+    }
+    if (typeof this._deliverable !== "string") {
+      return this._deliverable;
+    }
+    const regex = /api\/memo-contents\/([0-9]+)$/;
+    const result = this._deliverable?.match(regex);
+    if (!result) {
+      return this._deliverable;
+    }
+    const deliverable = await this.acpClient.getMemoContent(this._deliverable);
+    return tryParseJson(deliverable);
+  }
   async createRequirement(content) {
     const operations = [];
     operations.push(
@@ -4519,12 +4532,19 @@ var AcpJob = class {
     return await this.acpContractClient.handleOperation(operations);
   }
   async deliver(deliverable) {
+    if (this.phase !== 2 /* TRANSACTION */) {
+      throw new acpError_default("Job is not in transaction phase");
+    }
     const operations = [];
+    const memoContent = await this.acpClient.createMemoContent(
+      this.id,
+      preparePayload(deliverable)
+    );
     operations.push(
       this.acpContractClient.createMemo(
         this.id,
-        preparePayload(deliverable),
-        0 /* MESSAGE */,
+        memoContent?.url,
+        1 /* CONTEXT_URL */,
         true,
         4 /* COMPLETED */
       )
@@ -4549,10 +4569,14 @@ var AcpJob = class {
     );
     const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
     const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */ && !skipFee;
+    const memoContent = await this.acpClient.createMemoContent(
+      this.id,
+      preparePayload(deliverable)
+    );
     operations.push(
       this.acpContractClient.createPayableMemo(
         this.id,
-        preparePayload(deliverable),
+        memoContent.url,
         amount.amount,
         this.clientAddress,
         isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
@@ -5067,6 +5091,7 @@ var AcpClient = class {
         job.phase,
         job.context,
         job.contractAddress,
+        job.deliverable,
         job.netPayableAmount
       );
     } catch (err) {
@@ -5357,6 +5382,13 @@ var AcpClient = class {
     }
     return response;
   }
+  async getMemoContent(url) {
+    const response = await this._fetch(url);
+    if (!response) {
+      throw new acpError_default("Failed to get memo content");
+    }
+    return response.content;
+  }
   async getTokenBalances() {
     const response = await this._fetch(
       `/chains/token-balances`,

package/dist/index.mjs

@@ -8,7 +8,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.30",
+      version: "0.3.0-beta.32",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -4202,7 +4202,7 @@ var acpJobOffering_default = AcpJobOffering;
 // src/acpJob.ts
 import * as util from "util";
 var AcpJob = class {
-  constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, priceTokenAddress, memos, phase, context, contractAddress, netPayableAmount) {
+  constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, priceTokenAddress, memos, phase, context, contractAddress, _deliverable, netPayableAmount) {
     this.acpClient = acpClient;
     this.id = id;
     this.clientAddress = clientAddress;
@@ -4214,6 +4214,7 @@ var AcpJob = class {
     this.phase = phase;
     this.context = context;
     this.contractAddress = contractAddress;
+    this._deliverable = _deliverable;
     this.netPayableAmount = netPayableAmount;
     this.priceType = "fixed" /* FIXED */;
     this.priceValue = 0;
@@ -4249,9 +4250,6 @@ var AcpJob = class {
   get baseFare() {
     return this.acpContractClient.config.baseFare;
   }
-  get deliverable() {
-    return this.memos.find((m) => m.nextPhase === 4 /* COMPLETED */)?.content;
-  }
   get rejectionReason() {
     const requestMemo = this.memos.find(
       (m) => m.nextPhase === 1 /* NEGOTIATION */ && m.status === "REJECTED" /* REJECTED */
@@ -4276,6 +4274,21 @@ var AcpJob = class {
   get latestMemo() {
     return this.memos[this.memos.length - 1];
   }
+  async getDeliverable() {
+    if (!this._deliverable) {
+      return null;
+    }
+    if (typeof this._deliverable !== "string") {
+      return this._deliverable;
+    }
+    const regex = /api\/memo-contents\/([0-9]+)$/;
+    const result = this._deliverable?.match(regex);
+    if (!result) {
+      return this._deliverable;
+    }
+    const deliverable = await this.acpClient.getMemoContent(this._deliverable);
+    return tryParseJson(deliverable);
+  }
   async createRequirement(content) {
     const operations = [];
     operations.push(
@@ -4496,12 +4509,19 @@ var AcpJob = class {
     return await this.acpContractClient.handleOperation(operations);
   }
   async deliver(deliverable) {
+    if (this.phase !== 2 /* TRANSACTION */) {
+      throw new acpError_default("Job is not in transaction phase");
+    }
     const operations = [];
+    const memoContent = await this.acpClient.createMemoContent(
+      this.id,
+      preparePayload(deliverable)
+    );
     operations.push(
       this.acpContractClient.createMemo(
         this.id,
-        preparePayload(deliverable),
-        0 /* MESSAGE */,
+        memoContent?.url,
+        1 /* CONTEXT_URL */,
         true,
         4 /* COMPLETED */
       )
@@ -4526,10 +4546,14 @@ var AcpJob = class {
     );
     const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
     const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */ && !skipFee;
+    const memoContent = await this.acpClient.createMemoContent(
+      this.id,
+      preparePayload(deliverable)
+    );
     operations.push(
       this.acpContractClient.createPayableMemo(
         this.id,
-        preparePayload(deliverable),
+        memoContent.url,
         amount.amount,
         this.clientAddress,
         isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
@@ -5044,6 +5068,7 @@ var AcpClient = class {
         job.phase,
         job.context,
         job.contractAddress,
+        job.deliverable,
         job.netPayableAmount
       );
     } catch (err) {
@@ -5334,6 +5359,13 @@ var AcpClient = class {
     }
     return response;
   }
+  async getMemoContent(url) {
+    const response = await this._fetch(url);
+    if (!response) {
+      throw new acpError_default("Failed to get memo content");
+    }
+    return response.content;
+  }
   async getTokenBalances() {
     const response = await this._fetch(
       `/chains/token-balances`,

package/package.json

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