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

package/dist/index.d.mts

@@ -216,7 +216,8 @@ declare enum AcpJobPhases {
 declare enum FeeType {
     NO_FEE = 0,
     IMMEDIATE_FEE = 1,
-    DEFERRED_FEE = 2
+    DEFERRED_FEE = 2,
+    PERCENTAGE_FEE = 3
 }
 interface OperationPayload {
     data: `0x${string}`;
@@ -234,7 +235,7 @@ declare abstract class BaseAcpContractClient {
     abstract handleOperation(operations: OperationPayload[]): Promise<Address>;
     abstract getJobId(hash: Address, clientAddress: Address, providerAddress: Address): Promise<number>;
     get walletAddress(): `0x${string}`;
-    createJobWithAccount(accountId: number, providerAddress: Address, evaluatorAddress: Address, budgetBaseUnit: bigint, paymentTokenAddress: Address, expiredAt: Date): OperationPayload;
+    createJobWithAccount(accountId: number, evaluatorAddress: Address, budgetBaseUnit: bigint, paymentTokenAddress: Address, expiredAt: Date): OperationPayload;
     createJob(providerAddress: Address, evaluatorAddress: Address, expiredAt: Date, paymentTokenAddress: Address, budgetBaseUnit: bigint, metadata: string): OperationPayload;
     approveAllowance(amountBaseUnit: bigint, paymentTokenAddress?: Address): OperationPayload;
     createPayableMemo(jobId: number, content: string, amountBaseUnit: bigint, recipient: Address, feeAmountBaseUnit: bigint, feeType: FeeType, nextPhase: AcpJobPhases, type: MemoType.PAYABLE_REQUEST | MemoType.PAYABLE_TRANSFER_ESCROW | MemoType.PAYABLE_TRANSFER | MemoType.PAYABLE_NOTIFICATION, expiredAt: Date, token?: Address, secured?: boolean): OperationPayload;
@@ -274,6 +275,23 @@ declare class AcpMemo {
     sign(approved: boolean, reason?: string): Promise<`0x${string}`>;
 }
 
+declare enum PriceType {
+    FIXED = "fixed",
+    PERCENTAGE = "percentage"
+}
+declare class AcpJobOffering {
+    private readonly acpClient;
+    private readonly acpContractClient;
+    providerAddress: Address;
+    name: string;
+    price: number;
+    priceType: PriceType;
+    requirement?: (Object | string) | undefined;
+    private ajv;
+    constructor(acpClient: AcpClient, acpContractClient: BaseAcpContractClient, providerAddress: Address, name: string, price: number, priceType?: PriceType, requirement?: (Object | string) | undefined);
+    initiateJob(serviceRequirement: Object | string, evaluatorAddress?: Address, expiredAt?: Date): Promise<number>;
+}
+
 type DeliverablePayload = string | Record<string, unknown>;
 /** @deprecated Use DeliverablePayload instead */
 type IDeliverable = DeliverablePayload;
@@ -325,7 +343,10 @@ type AcpAgent = {
     twitterHandle: string;
     jobs: {
         name: string;
-        price: number;
+        priceV2: {
+            type: PriceType;
+            value: number;
+        };
         requirement?: Object | string;
         deliverable?: Object | string;
     }[];
@@ -418,6 +439,8 @@ declare class AcpJob {
     contractAddress: Address;
     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);
     get acpContractClient(): BaseAcpContractClient;
     get config(): AcpContractConfig;
@@ -435,6 +458,7 @@ declare class AcpJob {
     respond(accept: boolean, reason?: string): Promise<`0x${string}`>;
     accept(reason?: string): Promise<`0x${string}`>;
     reject(reason?: string): Promise<`0x${string}`>;
+    rejectPayable(reason: string | undefined, amount: FareAmountBase, expiredAt?: Date): Promise<`0x${string}`>;
     deliver(deliverable: DeliverablePayload): Promise<`0x${string}`>;
     deliverPayable(deliverable: DeliverablePayload, amount: FareAmountBase, expiredAt?: Date): Promise<`0x${string}`>;
     evaluate(accept: boolean, reason?: string): Promise<void>;
@@ -442,18 +466,6 @@ declare class AcpJob {
     createPayableNotification(content: string, amount: FareAmountBase, expiredAt?: Date): Promise<`0x${string}`>;
 }
 
-declare class AcpJobOffering {
-    private readonly acpClient;
-    private readonly acpContractClient;
-    providerAddress: Address;
-    name: string;
-    price: number;
-    requirement?: (Object | string) | undefined;
-    private ajv;
-    constructor(acpClient: AcpClient, acpContractClient: BaseAcpContractClient, providerAddress: Address, name: string, price: number, requirement?: (Object | string) | undefined);
-    initiateJob(serviceRequirement: Object | string, evaluatorAddress?: Address, expiredAt?: Date): Promise<number>;
-}
-
 interface IAcpBrowseAgentsOptions {
     cluster?: string;
     sort_by?: AcpAgentSort[];
@@ -8770,7 +8782,7 @@ declare class AcpContractClient extends BaseAcpContractClient {
     createJob(providerAddress: Address$1, evaluatorAddress: Address$1, expireAt: Date, paymentTokenAddress: Address$1, budgetBaseUnit: bigint, metadata: string): OperationPayload;
     setBudgetWithPaymentToken(jobId: number, budgetBaseUnit: bigint, paymentTokenAddress?: Address$1): OperationPayload;
     createPayableMemo(jobId: number, content: string, amountBaseUnit: bigint, recipient: Address$1, feeAmountBaseUnit: bigint, feeType: FeeType, nextPhase: AcpJobPhases, type: MemoType.PAYABLE_REQUEST | MemoType.PAYABLE_TRANSFER_ESCROW, expiredAt: Date, token?: Address$1, secured?: boolean): OperationPayload;
-    createJobWithAccount(accountId: number, providerAddress: Address$1, evaluatorAddress: Address$1, budgetBaseUnit: bigint, paymentTokenAddress: Address$1, expiredAt: Date): OperationPayload;
+    createJobWithAccount(accountId: number, evaluatorAddress: Address$1, budgetBaseUnit: bigint, paymentTokenAddress: Address$1, expiredAt: Date): OperationPayload;
     updateAccountMetadata(accountId: number, metadata: string): OperationPayload;
 }
 

package/dist/index.d.ts

@@ -216,7 +216,8 @@ declare enum AcpJobPhases {
 declare enum FeeType {
     NO_FEE = 0,
     IMMEDIATE_FEE = 1,
-    DEFERRED_FEE = 2
+    DEFERRED_FEE = 2,
+    PERCENTAGE_FEE = 3
 }
 interface OperationPayload {
     data: `0x${string}`;
@@ -234,7 +235,7 @@ declare abstract class BaseAcpContractClient {
     abstract handleOperation(operations: OperationPayload[]): Promise<Address>;
     abstract getJobId(hash: Address, clientAddress: Address, providerAddress: Address): Promise<number>;
     get walletAddress(): `0x${string}`;
-    createJobWithAccount(accountId: number, providerAddress: Address, evaluatorAddress: Address, budgetBaseUnit: bigint, paymentTokenAddress: Address, expiredAt: Date): OperationPayload;
+    createJobWithAccount(accountId: number, evaluatorAddress: Address, budgetBaseUnit: bigint, paymentTokenAddress: Address, expiredAt: Date): OperationPayload;
     createJob(providerAddress: Address, evaluatorAddress: Address, expiredAt: Date, paymentTokenAddress: Address, budgetBaseUnit: bigint, metadata: string): OperationPayload;
     approveAllowance(amountBaseUnit: bigint, paymentTokenAddress?: Address): OperationPayload;
     createPayableMemo(jobId: number, content: string, amountBaseUnit: bigint, recipient: Address, feeAmountBaseUnit: bigint, feeType: FeeType, nextPhase: AcpJobPhases, type: MemoType.PAYABLE_REQUEST | MemoType.PAYABLE_TRANSFER_ESCROW | MemoType.PAYABLE_TRANSFER | MemoType.PAYABLE_NOTIFICATION, expiredAt: Date, token?: Address, secured?: boolean): OperationPayload;
@@ -274,6 +275,23 @@ declare class AcpMemo {
     sign(approved: boolean, reason?: string): Promise<`0x${string}`>;
 }
 
+declare enum PriceType {
+    FIXED = "fixed",
+    PERCENTAGE = "percentage"
+}
+declare class AcpJobOffering {
+    private readonly acpClient;
+    private readonly acpContractClient;
+    providerAddress: Address;
+    name: string;
+    price: number;
+    priceType: PriceType;
+    requirement?: (Object | string) | undefined;
+    private ajv;
+    constructor(acpClient: AcpClient, acpContractClient: BaseAcpContractClient, providerAddress: Address, name: string, price: number, priceType?: PriceType, requirement?: (Object | string) | undefined);
+    initiateJob(serviceRequirement: Object | string, evaluatorAddress?: Address, expiredAt?: Date): Promise<number>;
+}
+
 type DeliverablePayload = string | Record<string, unknown>;
 /** @deprecated Use DeliverablePayload instead */
 type IDeliverable = DeliverablePayload;
@@ -325,7 +343,10 @@ type AcpAgent = {
     twitterHandle: string;
     jobs: {
         name: string;
-        price: number;
+        priceV2: {
+            type: PriceType;
+            value: number;
+        };
         requirement?: Object | string;
         deliverable?: Object | string;
     }[];
@@ -418,6 +439,8 @@ declare class AcpJob {
     contractAddress: Address;
     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);
     get acpContractClient(): BaseAcpContractClient;
     get config(): AcpContractConfig;
@@ -435,6 +458,7 @@ declare class AcpJob {
     respond(accept: boolean, reason?: string): Promise<`0x${string}`>;
     accept(reason?: string): Promise<`0x${string}`>;
     reject(reason?: string): Promise<`0x${string}`>;
+    rejectPayable(reason: string | undefined, amount: FareAmountBase, expiredAt?: Date): Promise<`0x${string}`>;
     deliver(deliverable: DeliverablePayload): Promise<`0x${string}`>;
     deliverPayable(deliverable: DeliverablePayload, amount: FareAmountBase, expiredAt?: Date): Promise<`0x${string}`>;
     evaluate(accept: boolean, reason?: string): Promise<void>;
@@ -442,18 +466,6 @@ declare class AcpJob {
     createPayableNotification(content: string, amount: FareAmountBase, expiredAt?: Date): Promise<`0x${string}`>;
 }
 
-declare class AcpJobOffering {
-    private readonly acpClient;
-    private readonly acpContractClient;
-    providerAddress: Address;
-    name: string;
-    price: number;
-    requirement?: (Object | string) | undefined;
-    private ajv;
-    constructor(acpClient: AcpClient, acpContractClient: BaseAcpContractClient, providerAddress: Address, name: string, price: number, requirement?: (Object | string) | undefined);
-    initiateJob(serviceRequirement: Object | string, evaluatorAddress?: Address, expiredAt?: Date): Promise<number>;
-}
-
 interface IAcpBrowseAgentsOptions {
     cluster?: string;
     sort_by?: AcpAgentSort[];
@@ -8770,7 +8782,7 @@ declare class AcpContractClient extends BaseAcpContractClient {
     createJob(providerAddress: Address$1, evaluatorAddress: Address$1, expireAt: Date, paymentTokenAddress: Address$1, budgetBaseUnit: bigint, metadata: string): OperationPayload;
     setBudgetWithPaymentToken(jobId: number, budgetBaseUnit: bigint, paymentTokenAddress?: Address$1): OperationPayload;
     createPayableMemo(jobId: number, content: string, amountBaseUnit: bigint, recipient: Address$1, feeAmountBaseUnit: bigint, feeType: FeeType, nextPhase: AcpJobPhases, type: MemoType.PAYABLE_REQUEST | MemoType.PAYABLE_TRANSFER_ESCROW, expiredAt: Date, token?: Address$1, secured?: boolean): OperationPayload;
-    createJobWithAccount(accountId: number, providerAddress: Address$1, evaluatorAddress: Address$1, budgetBaseUnit: bigint, paymentTokenAddress: Address$1, expiredAt: Date): OperationPayload;
+    createJobWithAccount(accountId: number, evaluatorAddress: Address$1, budgetBaseUnit: bigint, paymentTokenAddress: Address$1, expiredAt: Date): OperationPayload;
     updateAccountMetadata(accountId: number, metadata: string): OperationPayload;
 }
 

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.5",
+      version: "0.3.0-beta.7",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -3062,7 +3062,7 @@ var BaseAcpContractClient = class {
   get walletAddress() {
     return this.agentWalletAddress;
   }
-  createJobWithAccount(accountId, providerAddress, evaluatorAddress, budgetBaseUnit, paymentTokenAddress, expiredAt) {
+  createJobWithAccount(accountId, evaluatorAddress, budgetBaseUnit, paymentTokenAddress, expiredAt) {
     try {
       const data = (0, import_viem2.encodeFunctionData)({
         abi: this.abi,
@@ -3277,6 +3277,94 @@ function preparePayload(payload) {
   return typeof payload === "string" ? payload : JSON.stringify(payload);
 }
 
+// src/acpJobOffering.ts
+var import_viem3 = require("viem");
+var import_ajv = __toESM(require("ajv"));
+var AcpJobOffering = class {
+  constructor(acpClient, acpContractClient, providerAddress, name, price, priceType = "fixed" /* FIXED */, requirement) {
+    this.acpClient = acpClient;
+    this.acpContractClient = acpContractClient;
+    this.providerAddress = providerAddress;
+    this.name = name;
+    this.price = price;
+    this.priceType = priceType;
+    this.requirement = requirement;
+    this.ajv = new import_ajv.default({ allErrors: true });
+  }
+  initiateJob(_0, _1) {
+    return __async(this, arguments, function* (serviceRequirement, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
+      if (this.requirement && typeof this.requirement === "object") {
+        const validator = this.ajv.compile(this.requirement);
+        const valid = validator(serviceRequirement);
+        if (!valid) {
+          throw new acpError_default(this.ajv.errorsText(validator.errors));
+        }
+      }
+      const finalServiceRequirement = {
+        name: this.name,
+        requirement: serviceRequirement,
+        priceValue: this.price,
+        priceType: this.priceType
+      };
+      const fareAmount = new FareAmount(
+        this.priceType === "fixed" /* FIXED */ ? this.price : 0,
+        this.acpContractClient.config.baseFare
+      );
+      const account = yield this.acpClient.getByClientAndProvider(
+        this.acpContractClient.walletAddress,
+        this.providerAddress,
+        this.acpContractClient
+      );
+      const createJobPayload = [
+        baseSepoliaAcpConfig.contractAddress,
+        baseAcpConfig.contractAddress
+      ].includes(this.acpContractClient.config.contractAddress) || !account ? yield this.acpContractClient.createJob(
+        this.providerAddress,
+        evaluatorAddress || this.acpContractClient.walletAddress,
+        expiredAt,
+        fareAmount.fare.contractAddress,
+        fareAmount.amount,
+        ""
+      ) : yield this.acpContractClient.createJobWithAccount(
+        account.id,
+        evaluatorAddress || import_viem3.zeroAddress,
+        fareAmount.amount,
+        fareAmount.fare.contractAddress,
+        expiredAt
+      );
+      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,
+        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;
+    });
+  }
+};
+var acpJobOffering_default = AcpJobOffering;
+
 // src/acpJob.ts
 var AcpJob = class {
   constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, priceTokenAddress, memos, phase, context, contractAddress) {
@@ -3291,6 +3379,8 @@ var AcpJob = class {
     this.phase = phase;
     this.context = context;
     this.contractAddress = contractAddress;
+    this.priceType = "fixed" /* FIXED */;
+    this.priceValue = 0;
     var _a;
     const content = (_a = this.memos.find(
       (m) => m.nextPhase === 1 /* NEGOTIATION */
@@ -3308,6 +3398,12 @@ var AcpJob = class {
     if (contentObj.serviceName || contentObj.name) {
       this.name = contentObj.name || contentObj.serviceName;
     }
+    if (contentObj.priceType) {
+      this.priceType = contentObj.priceType || "fixed" /* FIXED */;
+    }
+    if (contentObj.priceValue) {
+      this.priceValue = contentObj.priceValue || this.price;
+    }
   }
   get acpContractClient() {
     return this.acpClient.contractClientByAddress(this.contractAddress);
@@ -3380,8 +3476,8 @@ var AcpJob = class {
           content,
           amount.amount,
           recipient,
-          feeAmount.amount,
-          0 /* NO_FEE */,
+          this.priceType === "percentage" /* PERCENTAGE */ ? BigInt(this.priceValue * 1e4) : feeAmount.amount,
+          this.priceType === "percentage" /* PERCENTAGE */ ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
           2 /* TRANSACTION */,
           type,
           expiredAt,
@@ -3439,41 +3535,32 @@ var AcpJob = class {
       const memoContent = `${reason || `Job ${this.id} ${accept ? "accepted" : "rejected"}.`}`;
       if (accept) {
         yield this.accept(memoContent);
-        return yield this.createRequirement(memoContent);
+        return this.createRequirement(memoContent);
       }
       return yield this.reject(memoContent);
     });
   }
   accept(reason) {
     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 */) {
+      const latestMemo = this.latestMemo;
+      if ((latestMemo == null ? void 0 : latestMemo.nextPhase) !== 1 /* NEGOTIATION */) {
         throw new acpError_default("No request memo found");
       }
-      const memo = this.latestMemo;
-      operations.push(
-        this.acpContractClient.signMemo(memo.id, true, memoContent)
-      );
-      return yield this.acpContractClient.handleOperation(operations);
+      return yield latestMemo.sign(true, memoContent);
     });
   }
   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 */) {
+        const latestMemo = this.latestMemo;
+        if ((latestMemo == null ? void 0 : latestMemo.nextPhase) !== 1 /* NEGOTIATION */) {
           throw new acpError_default("No request memo found");
         }
-        const memo = this.latestMemo;
-        operations.push(
-          this.acpContractClient.signMemo(memo.id, false, memoContent)
-        );
-        return yield this.acpContractClient.handleOperation(operations);
+        return yield latestMemo.sign(false, memoContent);
       }
+      const operations = [];
       operations.push(
         this.acpContractClient.createMemo(
           this.id,
@@ -3486,6 +3573,34 @@ var AcpJob = class {
       return yield this.acpContractClient.handleOperation(operations);
     });
   }
+  rejectPayable() {
+    return __async(this, arguments, function* (reason = "", amount, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
+      const memoContent = `Job ${this.id} rejected. ${reason}`;
+      const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
+      const operations = [];
+      operations.push(
+        this.acpContractClient.approveAllowance(
+          amount.amount,
+          amount.fare.contractAddress
+        )
+      );
+      operations.push(
+        this.acpContractClient.createPayableMemo(
+          this.id,
+          memoContent,
+          amount.amount,
+          this.clientAddress,
+          feeAmount.amount,
+          0 /* NO_FEE */,
+          5 /* REJECTED */,
+          7 /* PAYABLE_TRANSFER */,
+          expiredAt,
+          amount.fare.contractAddress
+        )
+      );
+      return yield this.acpContractClient.handleOperation(operations);
+    });
+  }
   deliver(deliverable) {
     return __async(this, null, function* () {
       var _a;
@@ -3637,92 +3752,6 @@ var AcpMemo = class {
 };
 var acpMemo_default = AcpMemo;
 
-// src/acpJobOffering.ts
-var import_viem3 = require("viem");
-var import_ajv = __toESM(require("ajv"));
-var AcpJobOffering = class {
-  constructor(acpClient, acpContractClient, providerAddress, name, price, requirement) {
-    this.acpClient = acpClient;
-    this.acpContractClient = acpContractClient;
-    this.providerAddress = providerAddress;
-    this.name = name;
-    this.price = price;
-    this.requirement = requirement;
-    this.ajv = new import_ajv.default({ allErrors: true });
-  }
-  initiateJob(_0, _1) {
-    return __async(this, arguments, function* (serviceRequirement, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
-      if (this.requirement && typeof this.requirement === "object") {
-        const validator = this.ajv.compile(this.requirement);
-        const valid = validator(serviceRequirement);
-        if (!valid) {
-          throw new acpError_default(this.ajv.errorsText(validator.errors));
-        }
-      }
-      const finalServiceRequirement = {
-        name: this.name,
-        requirement: serviceRequirement
-      };
-      const fareAmount = new FareAmount(
-        this.price,
-        this.acpContractClient.config.baseFare
-      );
-      const account = yield this.acpClient.getByClientAndProvider(
-        this.acpContractClient.walletAddress,
-        this.providerAddress,
-        this.acpContractClient
-      );
-      const createJobPayload = [
-        baseSepoliaAcpConfig.contractAddress,
-        baseAcpConfig.contractAddress
-      ].includes(this.acpContractClient.config.contractAddress) || !account ? yield this.acpContractClient.createJob(
-        this.providerAddress,
-        evaluatorAddress || this.acpContractClient.walletAddress,
-        expiredAt,
-        fareAmount.fare.contractAddress,
-        fareAmount.amount,
-        ""
-      ) : yield this.acpContractClient.createJobWithAccount(
-        account.id,
-        this.providerAddress,
-        evaluatorAddress || import_viem3.zeroAddress,
-        fareAmount.amount,
-        fareAmount.fare.contractAddress,
-        expiredAt
-      );
-      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,
-        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;
-    });
-  }
-};
-var acpJobOffering_default = AcpJobOffering;
-
 // src/acpAccount.ts
 var AcpAccount = class {
   constructor(contractClient, id, clientAddress, providerAddress, metadata) {
@@ -3943,7 +3972,8 @@ var AcpClient = class {
               acpContractClient,
               agent.walletAddress,
               jobs.name,
-              jobs.price,
+              jobs.priceV2.value,
+              jobs.priceV2.type,
               jobs.requirement
             );
           }),
@@ -3984,7 +4014,6 @@ var AcpClient = class {
         ""
       ) : yield this.acpContractClient.createJobWithAccount(
         account.id,
-        providerAddress,
         evaluatorAddress || defaultEvaluatorAddress,
         fareAmount.amount,
         fareAmount.fare.contractAddress,
@@ -4528,7 +4557,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
       throw new acpError_default("Failed to create payable memo", error);
     }
   }
-  createJobWithAccount(accountId, providerAddress, evaluatorAddress, budgetBaseUnit, paymentTokenAddress, expiredAt) {
+  createJobWithAccount(accountId, evaluatorAddress, budgetBaseUnit, paymentTokenAddress, expiredAt) {
     throw new acpError_default("Not Supported");
   }
   updateAccountMetadata(accountId, metadata) {

package/dist/index.mjs

@@ -28,7 +28,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.5",
+      version: "0.3.0-beta.7",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -3014,7 +3014,7 @@ var BaseAcpContractClient = class {
   get walletAddress() {
     return this.agentWalletAddress;
   }
-  createJobWithAccount(accountId, providerAddress, evaluatorAddress, budgetBaseUnit, paymentTokenAddress, expiredAt) {
+  createJobWithAccount(accountId, evaluatorAddress, budgetBaseUnit, paymentTokenAddress, expiredAt) {
     try {
       const data = encodeFunctionData({
         abi: this.abi,
@@ -3229,6 +3229,94 @@ function preparePayload(payload) {
   return typeof payload === "string" ? payload : JSON.stringify(payload);
 }
 
+// src/acpJobOffering.ts
+import { zeroAddress } from "viem";
+import Ajv from "ajv";
+var AcpJobOffering = class {
+  constructor(acpClient, acpContractClient, providerAddress, name, price, priceType = "fixed" /* FIXED */, requirement) {
+    this.acpClient = acpClient;
+    this.acpContractClient = acpContractClient;
+    this.providerAddress = providerAddress;
+    this.name = name;
+    this.price = price;
+    this.priceType = priceType;
+    this.requirement = requirement;
+    this.ajv = new Ajv({ allErrors: true });
+  }
+  initiateJob(_0, _1) {
+    return __async(this, arguments, function* (serviceRequirement, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
+      if (this.requirement && typeof this.requirement === "object") {
+        const validator = this.ajv.compile(this.requirement);
+        const valid = validator(serviceRequirement);
+        if (!valid) {
+          throw new acpError_default(this.ajv.errorsText(validator.errors));
+        }
+      }
+      const finalServiceRequirement = {
+        name: this.name,
+        requirement: serviceRequirement,
+        priceValue: this.price,
+        priceType: this.priceType
+      };
+      const fareAmount = new FareAmount(
+        this.priceType === "fixed" /* FIXED */ ? this.price : 0,
+        this.acpContractClient.config.baseFare
+      );
+      const account = yield this.acpClient.getByClientAndProvider(
+        this.acpContractClient.walletAddress,
+        this.providerAddress,
+        this.acpContractClient
+      );
+      const createJobPayload = [
+        baseSepoliaAcpConfig.contractAddress,
+        baseAcpConfig.contractAddress
+      ].includes(this.acpContractClient.config.contractAddress) || !account ? yield this.acpContractClient.createJob(
+        this.providerAddress,
+        evaluatorAddress || this.acpContractClient.walletAddress,
+        expiredAt,
+        fareAmount.fare.contractAddress,
+        fareAmount.amount,
+        ""
+      ) : yield this.acpContractClient.createJobWithAccount(
+        account.id,
+        evaluatorAddress || zeroAddress,
+        fareAmount.amount,
+        fareAmount.fare.contractAddress,
+        expiredAt
+      );
+      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,
+        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;
+    });
+  }
+};
+var acpJobOffering_default = AcpJobOffering;
+
 // src/acpJob.ts
 var AcpJob = class {
   constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, priceTokenAddress, memos, phase, context, contractAddress) {
@@ -3243,6 +3331,8 @@ var AcpJob = class {
     this.phase = phase;
     this.context = context;
     this.contractAddress = contractAddress;
+    this.priceType = "fixed" /* FIXED */;
+    this.priceValue = 0;
     var _a;
     const content = (_a = this.memos.find(
       (m) => m.nextPhase === 1 /* NEGOTIATION */
@@ -3260,6 +3350,12 @@ var AcpJob = class {
     if (contentObj.serviceName || contentObj.name) {
       this.name = contentObj.name || contentObj.serviceName;
     }
+    if (contentObj.priceType) {
+      this.priceType = contentObj.priceType || "fixed" /* FIXED */;
+    }
+    if (contentObj.priceValue) {
+      this.priceValue = contentObj.priceValue || this.price;
+    }
   }
   get acpContractClient() {
     return this.acpClient.contractClientByAddress(this.contractAddress);
@@ -3332,8 +3428,8 @@ var AcpJob = class {
           content,
           amount.amount,
           recipient,
-          feeAmount.amount,
-          0 /* NO_FEE */,
+          this.priceType === "percentage" /* PERCENTAGE */ ? BigInt(this.priceValue * 1e4) : feeAmount.amount,
+          this.priceType === "percentage" /* PERCENTAGE */ ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
           2 /* TRANSACTION */,
           type,
           expiredAt,
@@ -3391,41 +3487,32 @@ var AcpJob = class {
       const memoContent = `${reason || `Job ${this.id} ${accept ? "accepted" : "rejected"}.`}`;
       if (accept) {
         yield this.accept(memoContent);
-        return yield this.createRequirement(memoContent);
+        return this.createRequirement(memoContent);
       }
       return yield this.reject(memoContent);
     });
   }
   accept(reason) {
     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 */) {
+      const latestMemo = this.latestMemo;
+      if ((latestMemo == null ? void 0 : latestMemo.nextPhase) !== 1 /* NEGOTIATION */) {
         throw new acpError_default("No request memo found");
       }
-      const memo = this.latestMemo;
-      operations.push(
-        this.acpContractClient.signMemo(memo.id, true, memoContent)
-      );
-      return yield this.acpContractClient.handleOperation(operations);
+      return yield latestMemo.sign(true, memoContent);
     });
   }
   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 */) {
+        const latestMemo = this.latestMemo;
+        if ((latestMemo == null ? void 0 : latestMemo.nextPhase) !== 1 /* NEGOTIATION */) {
           throw new acpError_default("No request memo found");
         }
-        const memo = this.latestMemo;
-        operations.push(
-          this.acpContractClient.signMemo(memo.id, false, memoContent)
-        );
-        return yield this.acpContractClient.handleOperation(operations);
+        return yield latestMemo.sign(false, memoContent);
       }
+      const operations = [];
       operations.push(
         this.acpContractClient.createMemo(
           this.id,
@@ -3438,6 +3525,34 @@ var AcpJob = class {
       return yield this.acpContractClient.handleOperation(operations);
     });
   }
+  rejectPayable() {
+    return __async(this, arguments, function* (reason = "", amount, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
+      const memoContent = `Job ${this.id} rejected. ${reason}`;
+      const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
+      const operations = [];
+      operations.push(
+        this.acpContractClient.approveAllowance(
+          amount.amount,
+          amount.fare.contractAddress
+        )
+      );
+      operations.push(
+        this.acpContractClient.createPayableMemo(
+          this.id,
+          memoContent,
+          amount.amount,
+          this.clientAddress,
+          feeAmount.amount,
+          0 /* NO_FEE */,
+          5 /* REJECTED */,
+          7 /* PAYABLE_TRANSFER */,
+          expiredAt,
+          amount.fare.contractAddress
+        )
+      );
+      return yield this.acpContractClient.handleOperation(operations);
+    });
+  }
   deliver(deliverable) {
     return __async(this, null, function* () {
       var _a;
@@ -3589,92 +3704,6 @@ var AcpMemo = class {
 };
 var acpMemo_default = AcpMemo;
 
-// src/acpJobOffering.ts
-import { zeroAddress } from "viem";
-import Ajv from "ajv";
-var AcpJobOffering = class {
-  constructor(acpClient, acpContractClient, providerAddress, name, price, requirement) {
-    this.acpClient = acpClient;
-    this.acpContractClient = acpContractClient;
-    this.providerAddress = providerAddress;
-    this.name = name;
-    this.price = price;
-    this.requirement = requirement;
-    this.ajv = new Ajv({ allErrors: true });
-  }
-  initiateJob(_0, _1) {
-    return __async(this, arguments, function* (serviceRequirement, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
-      if (this.requirement && typeof this.requirement === "object") {
-        const validator = this.ajv.compile(this.requirement);
-        const valid = validator(serviceRequirement);
-        if (!valid) {
-          throw new acpError_default(this.ajv.errorsText(validator.errors));
-        }
-      }
-      const finalServiceRequirement = {
-        name: this.name,
-        requirement: serviceRequirement
-      };
-      const fareAmount = new FareAmount(
-        this.price,
-        this.acpContractClient.config.baseFare
-      );
-      const account = yield this.acpClient.getByClientAndProvider(
-        this.acpContractClient.walletAddress,
-        this.providerAddress,
-        this.acpContractClient
-      );
-      const createJobPayload = [
-        baseSepoliaAcpConfig.contractAddress,
-        baseAcpConfig.contractAddress
-      ].includes(this.acpContractClient.config.contractAddress) || !account ? yield this.acpContractClient.createJob(
-        this.providerAddress,
-        evaluatorAddress || this.acpContractClient.walletAddress,
-        expiredAt,
-        fareAmount.fare.contractAddress,
-        fareAmount.amount,
-        ""
-      ) : yield this.acpContractClient.createJobWithAccount(
-        account.id,
-        this.providerAddress,
-        evaluatorAddress || zeroAddress,
-        fareAmount.amount,
-        fareAmount.fare.contractAddress,
-        expiredAt
-      );
-      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,
-        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;
-    });
-  }
-};
-var acpJobOffering_default = AcpJobOffering;
-
 // src/acpAccount.ts
 var AcpAccount = class {
   constructor(contractClient, id, clientAddress, providerAddress, metadata) {
@@ -3895,7 +3924,8 @@ var AcpClient = class {
               acpContractClient,
               agent.walletAddress,
               jobs.name,
-              jobs.price,
+              jobs.priceV2.value,
+              jobs.priceV2.type,
               jobs.requirement
             );
           }),
@@ -3936,7 +3966,6 @@ var AcpClient = class {
         ""
       ) : yield this.acpContractClient.createJobWithAccount(
         account.id,
-        providerAddress,
         evaluatorAddress || defaultEvaluatorAddress,
         fareAmount.amount,
         fareAmount.fare.contractAddress,
@@ -4482,7 +4511,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
       throw new acpError_default("Failed to create payable memo", error);
     }
   }
-  createJobWithAccount(accountId, providerAddress, evaluatorAddress, budgetBaseUnit, paymentTokenAddress, expiredAt) {
+  createJobWithAccount(accountId, evaluatorAddress, budgetBaseUnit, paymentTokenAddress, expiredAt) {
     throw new acpError_default("Not Supported");
   }
   updateAccountMetadata(accountId, metadata) {

package/package.json

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