fix(subscription): fix compile errors, simplify createPayableRequirement, and update tests

Author: ariessa

examples/acp-base/subscription/seller.ts

@@ -148,8 +148,9 @@ async function handleSubscriptionCheck(acpClient: AcpClient, job: AcpJob) {
     subscriptionMetadata,
     MemoType.PAYABLE_REQUEST_SUBSCRIPTION,
     fareAmount,
-    undefined,
-    { duration: durationSeconds },
+    job.providerAddress,
+    undefined, // expiredAt — defaults to 5 minutes from now
+    durationSeconds,
   );
   console.log(
     `Seller: Job ${job.id} — Subscription payment request created (tx: ${subReqTx})`,

src/acpAccount.ts

@@ -11,13 +11,6 @@ export class AcpAccount {
     public expiry?: number
   ) {}
 
-  isSubscriptionValid(): boolean {
-    if (!this.expiry || this.expiry === 0) {
-      return false;
-    }
-    return this.expiry > Math.floor(Date.now() / 1000);
-  }
-
   async updateMetadata(metadata: Record<string, any>) {
     const hash = await this.contractClient.updateAccountMetadata(
       this.id,

src/acpClient.ts

@@ -54,6 +54,8 @@ interface IAcpBrowseAgentsOptions {
   cluster?: string;
   sortBy?: AcpAgentSort[];
   topK?: number;
+  sort_by?: AcpAgentSort[]; // deprecated
+  top_k?: number; // deprecated
   graduationStatus?: AcpGraduationStatus;
   onlineStatus?: AcpOnlineStatus;
   showHiddenOfferings?: boolean;
@@ -463,11 +465,13 @@ class AcpClient {
   async browseAgents(
     keyword: string,
     options: IAcpBrowseAgentsOptions = {},
-  ): Promise<AcpAgent[] | undefined> {
+  ): Promise<AcpAgent[]> {
     const {
       cluster,
       sortBy,
       topK = 5,
+      sort_by,
+      top_k = 5,
       graduationStatus,
       onlineStatus,
       showHiddenOfferings,
@@ -477,11 +481,12 @@ class AcpClient {
       search: keyword,
     };
 
-    params.top_k = topK;
+    params.top_k = topK || top_k;
     params.walletAddressesToExclude = this.walletAddress;
 
-    if (sortBy && sortBy.length > 0) {
-      params.sortBy = sortBy.join(",");
+    const sortByArray = sortBy || sort_by;
+    if (sortByArray && sortByArray.length > 0) {
+      params.sortBy = sortByArray.join(",");
     }
 
     if (cluster) {

src/acpJob.ts

@@ -178,19 +178,12 @@ class AcpJob {
       | MemoType.PAYABLE_TRANSFER
       | MemoType.PAYABLE_REQUEST_SUBSCRIPTION,
     amount: FareAmountBase,
-    recipient?: Address,
-    options?: {
-      expiredAt?: Date;
-      duration?: number; // Required for PAYABLE_REQUEST_SUBSCRIPTION
-      nextPhase?: AcpJobPhases;
-    }
+    recipient: Address,
+    expiredAt: Date = new Date(Date.now() + 1000 * 60 * 5), // 5 minutes
+    duration?: number // Required for PAYABLE_REQUEST_SUBSCRIPTION
   ) {
-    const expiredAt = options?.expiredAt ?? new Date(Date.now() + 1000 * 60 * 5); // 5 minutes
-    const nextPhase = options?.nextPhase ?? AcpJobPhases.TRANSACTION;
-    const finalRecipient = recipient ?? this.providerAddress;
-
     // Validate subscription-specific requirements
-    if (type === MemoType.PAYABLE_REQUEST_SUBSCRIPTION && !options?.duration) {
+    if (type === MemoType.PAYABLE_REQUEST_SUBSCRIPTION && !duration) {
       throw new AcpError("Duration is required for subscription payment requests");
     }
 
@@ -247,13 +240,13 @@ class AcpJob {
           this.id,
           content,
           amount.amount,
-          finalRecipient,
+          recipient,
           isPercentagePricing
             ? BigInt(Math.round(this.priceValue * 10000))
             : feeAmount.amount,
           isPercentagePricing ? FeeType.PERCENTAGE_FEE : FeeType.NO_FEE,
-          options?.duration!,
-          nextPhase,
+          duration!,
+          AcpJobPhases.TRANSACTION,
           expiredAt,
           amount.fare.contractAddress
         )
@@ -270,14 +263,14 @@ class AcpJob {
           content,
           amount.fare.contractAddress,
           amount.amount,
-          finalRecipient,
+          recipient,
           isPercentagePricing
             ? BigInt(Math.round(this.priceValue * 10000)) // convert to basis points
             : feeAmount.amount,
           isPercentagePricing ? FeeType.PERCENTAGE_FEE : FeeType.NO_FEE,
           type as MemoType.PAYABLE_REQUEST,
           expiredAt,
-          nextPhase,
+          AcpJobPhases.TRANSACTION,
           getDestinationEndpointId(amount.fare.chainId as number)
         )
       );
@@ -289,12 +282,12 @@ class AcpJob {
           this.id,
           content,
           amount.amount,
-          finalRecipient,
+          recipient,
           isPercentagePricing
             ? BigInt(Math.round(this.priceValue * 10000)) // convert to basis points
             : feeAmount.amount,
           isPercentagePricing ? FeeType.PERCENTAGE_FEE : FeeType.NO_FEE,
-          nextPhase,
+          AcpJobPhases.TRANSACTION,
           type,
           expiredAt,
           amount.fare.contractAddress

src/interfaces.ts

@@ -114,7 +114,7 @@ export interface IAcpClientOptions {
 }
 
 export interface IAcpAgent {
-  id: string | number;
+  id: number;
   name: string;
   description: string;
   walletAddress: Address;

test/integration/acpClient.integration.test.ts

@@ -132,8 +132,6 @@ describe("AcpClient Integration Testing", () => {
       if (result.length > 0) {
         const firstAgent = result[0];
 
-        console.log("firstAgent: ", firstAgent);
-
         expect(firstAgent).toHaveProperty("id");
         expect(firstAgent).toHaveProperty("name");
         expect(firstAgent).toHaveProperty("description");

test/unit/acpJob.test.ts

@@ -430,7 +430,7 @@ describe("AcpJob Unit Testing", () => {
         MemoType.PAYABLE_REQUEST,
         mockFareAmount,
         recipient,
-        { expiredAt },
+        expiredAt,
       );
 
       expect(mockContractClient.approveAllowance).not.toHaveBeenCalled();
@@ -472,7 +472,7 @@ describe("AcpJob Unit Testing", () => {
         MemoType.PAYABLE_TRANSFER_ESCROW,
         mockFareAmount,
         recipient,
-        { expiredAt },
+        expiredAt,
       );
 
       expect(mockContractClient.approveAllowance).toHaveBeenCalledWith(

test/unit/acpJobOffering.test.ts

@@ -4,6 +4,7 @@ import AcpJobOffering, { PriceType } from "../../src/acpJobOffering";
 import { BaseAcpContractClient } from "../../src";
 import AcpClient from "../../src/acpClient";
 import AcpError from "../../src/acpError";
+import { AcpAccount } from "../../src/acpAccount";
 
 jest.mock("../../src/configs/acpConfigs", () => ({
   baseSepoliaAcpConfig: {
@@ -77,10 +78,11 @@ describe("AcpJobOffering Unit Testing", () => {
       expect(offering.requiredFunds).toBe(true);
       expect(offering.slaMinutes).toBe(1440);
       expect(offering.requirement).toBe(undefined);
+      expect(offering.deliverable).toBe(undefined);
       expect(offering.subscriptionTiers).toEqual([]);
     });
 
-    it("should use priceType FIXED", () => {
+    it("should use priceType FIXED and requiredFunds", () => {
       const offering = new AcpJobOffering(
         mockAcpClient,
         mockContractClient,
@@ -94,6 +96,7 @@ describe("AcpJobOffering Unit Testing", () => {
 
       expect(offering).toBeInstanceOf(AcpJobOffering);
       expect(offering.priceType).toBe(PriceType.FIXED);
+      expect(offering.requiredFunds).toBe(false);
     });
 
     it("should accept custom priceType", () => {
@@ -150,6 +153,44 @@ describe("AcpJobOffering Unit Testing", () => {
       expect(offering.requirement).toBe(requirementObject);
     });
 
+    it("should accept deliverable as string", () => {
+      const offering = new AcpJobOffering(
+        mockAcpClient,
+        mockContractClient,
+        "0xProvider" as Address,
+        "MockJob",
+        100,
+        PriceType.FIXED,
+        true,
+        1440,
+        undefined,
+        "custom deliverable",
+      );
+
+      expect(offering).toBeInstanceOf(AcpJobOffering);
+      expect(offering.deliverable).toBe("custom deliverable");
+    });
+
+    it("should accept deliverable as object", () => {
+      const deliverableObject = { type: "image", format: "png" };
+
+      const offering = new AcpJobOffering(
+        mockAcpClient,
+        mockContractClient,
+        "0xProvider" as Address,
+        "MockJob",
+        100,
+        PriceType.FIXED,
+        false,
+        1440,
+        undefined,
+        deliverableObject,
+      );
+
+      expect(offering).toBeInstanceOf(AcpJobOffering);
+      expect(offering.deliverable).toEqual(deliverableObject);
+    });
+
     it("should accept subscription tiers", () => {
       const offering = new AcpJobOffering(
         mockAcpClient,
@@ -401,6 +442,67 @@ describe("AcpJobOffering Unit Testing", () => {
     });
 
     it("should use createJobWithAccount for V2 contracts when account exists", async () => {
+      const mockUserOpHash = "0xmockUserOpHash";
+      const mockJobId = 12345;
+      const mockCreateJobPayload = { data: "createJobWithAccountPayload" };
+      const mockSetBudgetPayload = { data: "setBudgetPayload" };
+      const mockMemoPayload = { data: "memoPayload" };
+      const mockAccount = new AcpAccount(
+        mockContractClient as any,
+        999,
+        "0xClient" as Address,
+        "0xProvider" as Address,
+        {},
+      );
+
+      // Mock getByClientAndProvider to return an account (V2 behavior)
+      jest
+        .spyOn(mockAcpClient, "getByClientAndProvider")
+        .mockResolvedValue(mockAccount as any);
+
+      mockContractClient.createJobWithAccount.mockReturnValue(
+        mockCreateJobPayload as any,
+      );
+      mockContractClient.handleOperation.mockResolvedValue({
+        userOpHash: mockUserOpHash,
+      } as any);
+      mockContractClient.getJobId.mockResolvedValue(mockJobId);
+      mockContractClient.setBudgetWithPaymentToken.mockReturnValue(
+        mockSetBudgetPayload as any,
+      );
+      mockContractClient.createMemo.mockReturnValue(mockMemoPayload as any);
+
+      // Use a non-V1 contract address
+      mockContractClient.config.contractAddress =
+        "0xV2ContractAddress" as Address;
+
+      const offering = new AcpJobOffering(
+        mockAcpClient,
+        mockContractClient,
+        "0xProvider" as Address,
+        "Generate Image",
+        100,
+        PriceType.FIXED,
+        true,
+        1440,
+      );
+
+      const result = await offering.initiateJob(
+        "generate an image about Virtuals",
+      );
+
+      expect(result).toBe(mockJobId);
+      expect(mockContractClient.createJobWithAccount).toHaveBeenCalledTimes(1);
+      expect(mockContractClient.createJob).not.toHaveBeenCalled();
+
+      // Verify that createJobWithAccount was called with account.id (1st parameter)
+      const createJobCall =
+        mockContractClient.createJobWithAccount.mock.calls[0];
+      const accountIdParam = createJobCall[0];
+      expect(accountIdParam).toBe(mockAccount.id);
+    });
+
+    it("should use createJobWithAccount for V2 contracts when subscription account exists", async () => {
       const mockUserOpHash = "0xmockUserOpHash";
       const mockJobId = 12345;
       const mockCreateJobPayload = { data: "createJobWithAccountPayload" };