@oobe-protocol-labs/synapse-sap-sdk 0.6.2 → 0.7.0

package/src/registries/x402.ts

@@ -74,12 +74,14 @@ import {
   deriveAgent,
   deriveAgentStats,
   deriveEscrow,
+  deriveEscrowV2,
 } from "../pda";
 import { sha256, hashToArray } from "../utils";
 import { SapNetwork } from "../constants/network";
 import type { SapNetworkId } from "../constants/network";
 import type {
   EscrowAccountData,
+  EscrowAccountV2Data,
   AgentAccountData,
   VolumeCurveBreakpoint,
   Settlement,
@@ -371,18 +373,14 @@ export class X402Registry {
       volumeCurve = opts.volumeCurve ?? [];
       totalBefore = opts.totalCallsBefore ?? 0;
     } else {
-      // Try to read from existing escrow
+      // Try to read from existing escrow (V2 first, then V1)
       const [agentPda] = deriveAgent(agentWallet);
-      const [escrowPda] = deriveEscrow(agentPda, this.wallet);
-      const escrow = await this.fetchNullable<EscrowAccountData>(
-        "escrowAccount",
-        escrowPda,
-      );
-
-      if (escrow) {
-        pricePerCall = escrow.pricePerCall;
-        volumeCurve = escrow.volumeCurve ?? [];
-        totalBefore = escrow.totalCallsSettled.toNumber();
+      const resolved = await this.resolveEscrow(agentPda, this.wallet);
+
+      if (resolved) {
+        pricePerCall = resolved.escrow.pricePerCall;
+        volumeCurve = resolved.escrow.volumeCurve ?? [];
+        totalBefore = resolved.escrow.totalCallsSettled.toNumber();
       } else {
         // Fall back to agent's first pricing tier
         const agent = await this.fetchNullable<AgentAccountData>(
@@ -493,6 +491,8 @@ export class X402Registry {
    * @param opts - Payment options (price, max calls, deposit, etc.).
    * @returns A {@link PaymentContext} with escrow details and transaction signature.
    * @since v0.1.0
+   * @deprecated Since v0.7.0 — Creates a V1 escrow. Use `client.escrowV2.create()` for
+   * V2 escrows with dispute windows, co-signing, and settlement security.
    *
    * @example
    * ```ts
@@ -509,7 +509,6 @@ export class X402Registry {
   ): Promise<PaymentContext> {
     const [agentPda] = deriveAgent(agentWallet);
     const [escrowPda] = deriveEscrow(agentPda, this.wallet);
-    const [statsPda] = deriveAgentStats(agentPda);
 
     const pricePerCall = new BN(opts.pricePerCall.toString());
     const maxCalls = new BN((opts.maxCalls ?? 0).toString());
@@ -536,7 +535,6 @@ export class X402Registry {
       .accounts({
         depositor: this.wallet,
         agent: agentPda,
-        agentStats: statsPda,
         escrow: escrowPda,
         systemProgram: SystemProgram.programId,
       })
@@ -562,6 +560,7 @@ export class X402Registry {
    * @param amount - Amount to deposit in smallest token unit.
    * @returns The transaction signature.
    * @since v0.1.0
+   * @deprecated Since v0.7.0 — Operates on V1 escrows only. Use `client.escrowV2.deposit()` instead.
    */
   async addFunds(
     agentWallet: PublicKey,
@@ -588,6 +587,7 @@ export class X402Registry {
    * @param amount - Amount to withdraw in smallest token unit.
    * @returns The transaction signature.
    * @since v0.1.0
+   * @deprecated Since v0.7.0 — Operates on V1 escrows only. Use `client.escrowV2.withdraw()` instead.
    */
   async withdrawFunds(
     agentWallet: PublicKey,
@@ -614,6 +614,7 @@ export class X402Registry {
    * @param agentWallet - Agent wallet of the escrow.
    * @returns The transaction signature.
    * @since v0.1.0
+   * @deprecated Since v0.7.0 — Operates on V1 escrows only. Use `client.escrowV2.close()` instead.
    */
   async closeEscrow(agentWallet: PublicKey): Promise<TransactionSignature> {
     const [agentPda] = deriveAgent(agentWallet);
@@ -678,17 +679,14 @@ export class X402Registry {
     opts?: { network?: SapNetworkId | string },
   ): Promise<X402Headers | null> {
     const [agentPda] = deriveAgent(agentWallet);
-    const [escrowPda] = deriveEscrow(agentPda, this.wallet);
+    const resolved = await this.resolveEscrow(agentPda, this.wallet);
+    if (!resolved) return null;
 
-    const escrow = await this.fetchNullable<EscrowAccountData>(
-      "escrowAccount",
-      escrowPda,
-    );
-    if (!escrow) return null;
+    const escrow = resolved.escrow;
 
     return {
       "X-Payment-Protocol": "SAP-x402",
-      "X-Payment-Escrow": escrowPda.toBase58(),
+      "X-Payment-Escrow": resolved.escrowPda.toBase58(),
       "X-Payment-Agent": agentPda.toBase58(),
       "X-Payment-Depositor": this.wallet.toBase58(),
       "X-Payment-MaxCalls": escrow.maxCalls.toString(),
@@ -742,14 +740,16 @@ export class X402Registry {
     );
 
     const [agentPda] = deriveAgent(this.wallet);
-    const [escrowPda] = deriveEscrow(agentPda, depositorWallet);
     const [statsPda] = deriveAgentStats(agentPda);
 
-    // Prefetch to calculate amount
-    const escrow = await this.fetch<EscrowAccountData>(
-      "escrowAccount",
-      escrowPda,
-    );
+    // Auto-detect escrow version
+    const resolved = await this.resolveEscrow(agentPda, depositorWallet);
+    if (!resolved) {
+      throw new Error("No escrow found for this agent + depositor pair");
+    }
+
+    const escrow = resolved.escrow;
+    const escrowPda = resolved.escrowPda;
     const estimate = this.calculateCost(
       escrow.pricePerCall,
       escrow.volumeCurve,
@@ -761,15 +761,29 @@ export class X402Registry {
     const preIxs = buildPriorityFeeIxs(opts);
     const rpcOpts = buildRpcOptions(opts);
 
-    let builder = this.methods
-      .settleCalls(new BN(callsToSettle), serviceHash)
-      .accounts({
-        wallet: this.wallet,
-        agent: agentPda,
-        agentStats: statsPda,
-        escrow: escrowPda,
-        systemProgram: SystemProgram.programId,
-      });
+    let builder;
+    if (resolved.version === 2) {
+      // V2: settleCallsV2 requires escrow_nonce (default 0)
+      builder = this.methods
+        .settleCallsV2(new BN(0), new BN(callsToSettle), serviceHash)
+        .accounts({
+          wallet: this.wallet,
+          agent: agentPda,
+          agentStats: statsPda,
+          escrow: escrowPda,
+          systemProgram: SystemProgram.programId,
+        });
+    } else {
+      builder = this.methods
+        .settleCalls(new BN(callsToSettle), serviceHash)
+        .accounts({
+          wallet: this.wallet,
+          agent: agentPda,
+          agentStats: statsPda,
+          escrow: escrowPda,
+          systemProgram: SystemProgram.programId,
+        });
+    }
 
     if (preIxs.length > 0) {
       builder = builder.preInstructions(preIxs);
@@ -825,14 +839,16 @@ export class X402Registry {
     const totalCalls = entries.reduce((sum, e) => sum + e.calls, 0);
 
     const [agentPda] = deriveAgent(this.wallet);
-    const [escrowPda] = deriveEscrow(agentPda, depositorWallet);
     const [statsPda] = deriveAgentStats(agentPda);
 
-    // Prefetch for amount estimation
-    const escrow = await this.fetch<EscrowAccountData>(
-      "escrowAccount",
-      escrowPda,
-    );
+    // Auto-detect escrow version
+    const resolved = await this.resolveEscrow(agentPda, depositorWallet);
+    if (!resolved) {
+      throw new Error("No escrow found for this agent + depositor pair");
+    }
+
+    const escrow = resolved.escrow;
+    const escrowPda = resolved.escrowPda;
     const estimate = this.calculateCost(
       escrow.pricePerCall,
       escrow.volumeCurve,
@@ -887,21 +903,17 @@ export class X402Registry {
   ): Promise<EscrowBalance | null> {
     const [agentPda] = deriveAgent(agentWallet);
     const dep = depositor ?? this.wallet;
-    const [escrowPda] = deriveEscrow(agentPda, dep);
 
-    const escrow = await this.fetchNullable<EscrowAccountData>(
-      "escrowAccount",
-      escrowPda,
-    );
-    if (!escrow) return null;
+    const resolved = await this.resolveEscrow(agentPda, dep);
+    if (!resolved) return null;
 
+    const escrow = resolved.escrow;
     const now = Math.floor(Date.now() / 1000);
     const isExpired = escrow.expiresAt.toNumber() > 0 && now >= escrow.expiresAt.toNumber();
     const maxCalls = escrow.maxCalls.toNumber();
     const settled = escrow.totalCallsSettled.toNumber();
     const callsRemaining = maxCalls > 0 ? maxCalls - settled : Infinity;
 
-    // Estimate affordable calls with current balance
     const pricePerCall = escrow.pricePerCall.toNumber();
     const balance = escrow.balance.toNumber();
     const affordableCalls = pricePerCall > 0
@@ -933,9 +945,18 @@ export class X402Registry {
     depositor?: PublicKey,
   ): Promise<boolean> {
     const [agentPda] = deriveAgent(agentWallet);
-    const [escrowPda] = deriveEscrow(agentPda, depositor ?? this.wallet);
-    const info = await this.program.provider.connection.getAccountInfo(escrowPda);
-    return info !== null;
+    const dep = depositor ?? this.wallet;
+    const conn = this.program.provider.connection;
+
+    // Check V2 first (nonce=0)
+    const [v2Pda] = deriveEscrowV2(agentPda, dep, 0);
+    const v2Info = await conn.getAccountInfo(v2Pda);
+    if (v2Info !== null) return true;
+
+    // Fall back to V1
+    const [v1Pda] = deriveEscrow(agentPda, dep);
+    const v1Info = await conn.getAccountInfo(v1Pda);
+    return v1Info !== null;
   }
 
   /**
@@ -950,11 +971,11 @@ export class X402Registry {
   async fetchEscrow(
     agentWallet: PublicKey,
     depositor?: PublicKey,
-  ): Promise<EscrowAccountData | null> {
+  ): Promise<EscrowAccountData | EscrowAccountV2Data | null> {
     const [agentPda] = deriveAgent(agentWallet);
     const dep = depositor ?? this.wallet;
-    const [escrowPda] = deriveEscrow(agentPda, dep);
-    return this.fetchNullable<EscrowAccountData>("escrowAccount", escrowPda);
+    const resolved = await this.resolveEscrow(agentPda, dep);
+    return resolved?.escrow ?? null;
   }
 
   // ── Internals ────────────────────────────────────────
@@ -971,21 +992,6 @@ export class X402Registry {
     return this.program.methods;
   }
 
-  /**
-   * @name fetch
-   * @description Fetch an on-chain account by name and PDA. Throws if not found.
-   * @param name - Anchor account discriminator name.
-   * @param pda - Account public key to fetch.
-   * @returns The deserialized account data.
-   * @throws If the account does not exist.
-   * @private
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private async fetch<T>(name: string, pda: PublicKey): Promise<T> {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-    return (this.program.account as any)[name].fetch(pda) as Promise<T>;
-  }
-
   /**
    * @name fetchNullable
    * @description Fetch an on-chain account by name and PDA. Returns `null` if not found.
@@ -999,4 +1005,37 @@ export class X402Registry {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
     return (this.program.account as any)[name].fetchNullable(pda) as Promise<T | null>;
   }
+
+  /**
+   * @name resolveEscrow
+   * @description Try to find an escrow: V2 (nonce=0) first, then V1 fallback.
+   * Returns the escrow data, PDA, and version indicator.
+   * @private
+   */
+  private async resolveEscrow(
+    agentPda: PublicKey,
+    depositor: PublicKey,
+  ): Promise<{
+    escrow: EscrowAccountData | EscrowAccountV2Data;
+    escrowPda: PublicKey;
+    version: 1 | 2;
+  } | null> {
+    // Try V2 first (nonce=0 is the default)
+    const [v2Pda] = deriveEscrowV2(agentPda, depositor, 0);
+    const v2 = await this.fetchNullable<EscrowAccountV2Data>(
+      "escrowAccountV2",
+      v2Pda,
+    );
+    if (v2) return { escrow: v2, escrowPda: v2Pda, version: 2 };
+
+    // Fall back to V1
+    const [v1Pda] = deriveEscrow(agentPda, depositor);
+    const v1 = await this.fetchNullable<EscrowAccountData>(
+      "escrowAccount",
+      v1Pda,
+    );
+    if (v1) return { escrow: v1, escrowPda: v1Pda, version: 1 };
+
+    return null;
+  }
 }

package/src/types/accounts.ts

@@ -11,7 +11,7 @@
 
 import type { PublicKey } from "@solana/web3.js";
 import type BN from "bn.js";
-import type { ToolHttpMethodKind, ToolCategoryKind } from "./enums";
+import type { ToolHttpMethodKind, ToolCategoryKind, SettlementSecurityKind, DisputeOutcomeKind, BillingIntervalKind } from "./enums";
 import type { Capability, PricingTier, PluginRef, VolumeCurveBreakpoint } from "./common";
 
 // ═══════════════════════════════════════════════════════════════════
@@ -479,6 +479,8 @@ export interface ToolDescriptorData {
  *
  * @category Types
  * @since v0.1.0
+ * @deprecated Since v0.7.0 — Use {@link EscrowAccountV2Data} for V2 escrows with
+ * settlement security, dispute windows, and co-signing.
  * @see {@link VolumeCurveBreakpoint} for discount curve details.
  */
 export interface EscrowAccountData {
@@ -616,3 +618,192 @@ export interface LedgerPageData {
   /** Raw archived data bytes. */
   readonly data: number[]; // Vec<u8>
 }
+
+// ═══════════════════════════════════════════════════════════════════
+//  Escrow V2 (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @interface EscrowAccountV2Data
+ * @description V2 escrow with triple-mode settlement security.
+ * @category Types
+ * @since v0.5.0
+ */
+export interface EscrowAccountV2Data {
+  readonly bump: number;
+  readonly version: number;
+  readonly agent: PublicKey;
+  readonly depositor: PublicKey;
+  readonly agentWallet: PublicKey;
+  readonly escrowNonce: BN;
+  readonly balance: BN;
+  readonly totalDeposited: BN;
+  readonly totalSettled: BN;
+  readonly totalCallsSettled: BN;
+  readonly pricePerCall: BN;
+  readonly maxCalls: BN;
+  readonly createdAt: BN;
+  readonly lastSettledAt: BN;
+  readonly expiresAt: BN;
+  readonly volumeCurve: VolumeCurveBreakpoint[];
+  readonly tokenMint: PublicKey | null;
+  readonly tokenDecimals: number;
+  readonly settlementSecurity: SettlementSecurityKind;
+  readonly disputeWindowSlots: BN;
+  readonly settlementIndex: BN;
+  readonly coSigner: PublicKey | null;
+  readonly arbiter: PublicKey | null;
+  readonly pendingAmount: BN;
+  readonly pendingCalls: BN;
+}
+
+// ═══════════════════════════════════════════════════════════════════
+//  Pending Settlement (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @interface PendingSettlementData
+ * @description Dispute-window settlement lock PDA.
+ * @category Types
+ * @since v0.5.0
+ */
+export interface PendingSettlementData {
+  readonly bump: number;
+  readonly escrow: PublicKey;
+  readonly agent: PublicKey;
+  readonly agentWallet: PublicKey;
+  readonly depositor: PublicKey;
+  readonly settlementIndex: BN;
+  readonly callsToSettle: BN;
+  readonly amount: BN;
+  readonly serviceHash: number[]; // [u8; 32]
+  readonly createdAt: BN;
+  readonly releaseSlot: BN;
+  readonly isFinalized: boolean;
+  readonly isDisputed: boolean;
+  readonly outcome: DisputeOutcomeKind;
+}
+
+// ═══════════════════════════════════════════════════════════════════
+//  Dispute Record (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @interface DisputeRecordData
+ * @description On-chain dispute with arbiter resolution.
+ * @category Types
+ * @since v0.5.0
+ */
+export interface DisputeRecordData {
+  readonly bump: number;
+  readonly pendingSettlement: PublicKey;
+  readonly escrow: PublicKey;
+  readonly depositor: PublicKey;
+  readonly agent: PublicKey;
+  readonly evidenceHash: number[]; // [u8; 32]
+  readonly agentEvidenceHash: number[]; // [u8; 32]
+  readonly arbiter: PublicKey;
+  readonly outcome: DisputeOutcomeKind;
+  readonly createdAt: BN;
+  readonly resolvedAt: BN;
+  readonly resolutionHash: number[]; // [u8; 32]
+  readonly slashAmount: BN;
+}
+
+// ═══════════════════════════════════════════════════════════════════
+//  Agent Stake (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @interface AgentStakeData
+ * @description Collateral staking account for honest behavior.
+ * @category Types
+ * @since v0.5.0
+ */
+export interface AgentStakeData {
+  readonly bump: number;
+  readonly agent: PublicKey;
+  readonly wallet: PublicKey;
+  readonly stakedAmount: BN;
+  readonly slashedAmount: BN;
+  readonly lastStakeAt: BN;
+  readonly unstakeRequestedAt: BN;
+  readonly unstakeAmount: BN;
+  readonly unstakeAvailableAt: BN;
+  readonly totalDisputesWon: number;
+  readonly totalDisputesLost: number;
+  readonly createdAt: BN;
+}
+
+// ═══════════════════════════════════════════════════════════════════
+//  Subscription (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @interface SubscriptionData
+ * @description Recurring payment subscription PDA.
+ * @category Types
+ * @since v0.5.0
+ */
+export interface SubscriptionData {
+  readonly bump: number;
+  readonly agent: PublicKey;
+  readonly subscriber: PublicKey;
+  readonly agentWallet: PublicKey;
+  readonly subId: BN;
+  readonly pricePerInterval: BN;
+  readonly billingInterval: BillingIntervalKind;
+  readonly tokenMint: PublicKey | null;
+  readonly tokenDecimals: number;
+  readonly balance: BN;
+  readonly totalPaid: BN;
+  readonly intervalsPaid: number;
+  readonly startedAt: BN;
+  readonly lastClaimedAt: BN;
+  readonly cancelledAt: BN;
+  readonly nextDueAt: BN;
+  readonly createdAt: BN;
+}
+
+// ═══════════════════════════════════════════════════════════════════
+//  Counter Shard (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @interface CounterShardData
+ * @description Sharded global counter PDA for write throughput.
+ * @category Types
+ * @since v0.5.0
+ */
+export interface CounterShardData {
+  readonly bump: number;
+  readonly shardIndex: number;
+  readonly totalAgents: BN;
+  readonly activeAgents: BN;
+  readonly totalFeedbacks: BN;
+  readonly totalTools: number;
+  readonly totalVaults: number;
+  readonly totalAttestations: number;
+  readonly totalSettlements: BN;
+  readonly totalDisputes: number;
+  readonly totalSubscriptions: number;
+  readonly lastUpdated: BN;
+}
+
+// ═══════════════════════════════════════════════════════════════════
+//  Index Page (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @interface IndexPageData
+ * @description Overflow page PDA for discovery indexes.
+ * @category Types
+ * @since v0.5.0
+ */
+export interface IndexPageData {
+  readonly bump: number;
+  readonly parentIndex: PublicKey;
+  readonly pageIndex: number;
+  readonly agents: PublicKey[];
+  readonly lastUpdated: BN;
+}

package/src/types/enums.ts

@@ -212,3 +212,68 @@ export const ToolCategory = {
  */
 export type ToolCategoryKind =
   (typeof ToolCategory)[keyof typeof ToolCategory];
+
+// ═══════════════════════════════════════════════════════════════════
+//  Settlement Security (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @name SettlementSecurity
+ * @description Anchor-compatible enum variants for V2 escrow settlement security levels.
+ *
+ * - `SelfReport` — Agent settles unilaterally (v1 compatible).
+ * - `CoSigned` — Agent + client must co-sign every settlement.
+ * - `DisputeWindow` — Settlement enters pending state, depositor can dispute.
+ *
+ * @category Types
+ * @since v0.5.0
+ */
+export const SettlementSecurity = {
+  SelfReport: { selfReport: {} },
+  CoSigned: { coSigned: {} },
+  DisputeWindow: { disputeWindow: {} },
+} as const;
+
+export type SettlementSecurityKind =
+  (typeof SettlementSecurity)[keyof typeof SettlementSecurity];
+
+// ═══════════════════════════════════════════════════════════════════
+//  Dispute Outcome (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @name DisputeOutcome
+ * @description Anchor-compatible enum variants for dispute resolution outcomes.
+ *
+ * @category Types
+ * @since v0.5.0
+ */
+export const DisputeOutcome = {
+  Pending: { pending: {} },
+  AutoReleased: { autoReleased: {} },
+  DepositorWins: { depositorWins: {} },
+  AgentWins: { agentWins: {} },
+} as const;
+
+export type DisputeOutcomeKind =
+  (typeof DisputeOutcome)[keyof typeof DisputeOutcome];
+
+// ═══════════════════════════════════════════════════════════════════
+//  Billing Interval (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @name BillingInterval
+ * @description Anchor-compatible enum variants for subscription billing intervals.
+ *
+ * @category Types
+ * @since v0.5.0
+ */
+export const BillingInterval = {
+  Daily: { daily: {} },
+  Weekly: { weekly: {} },
+  Monthly: { monthly: {} },
+} as const;
+
+export type BillingIntervalKind =
+  (typeof BillingInterval)[keyof typeof BillingInterval];

package/src/types/index.ts

@@ -27,6 +27,9 @@ export {
   SettlementMode,
   ToolHttpMethod,
   ToolCategory,
+  SettlementSecurity,
+  DisputeOutcome,
+  BillingInterval,
 } from "./enums";
 
 export type {
@@ -35,6 +38,9 @@ export type {
   SettlementModeKind,
   ToolHttpMethodKind,
   ToolCategoryKind,
+  SettlementSecurityKind,
+  DisputeOutcomeKind,
+  BillingIntervalKind,
 } from "./enums";
 
 // ── Common Structs ───────────────────────────────────
@@ -65,6 +71,13 @@ export type {
   AgentAttestationData,
   MemoryLedgerData,
   LedgerPageData,
+  EscrowAccountV2Data,
+  PendingSettlementData,
+  DisputeRecordData,
+  AgentStakeData,
+  SubscriptionData,
+  CounterShardData,
+  IndexPageData,
 } from "./accounts";
 
 // ── Instruction Args ─────────────────────────────────
@@ -83,6 +96,8 @@ export type {
   DelegatePermissionBit,
   SchemaTypeValue,
   CompressionTypeValue,
+  CreateEscrowV2Args,
+  CreateSubscriptionArgs,
 } from "./instructions";
 
 export {

package/src/types/instructions.ts

@@ -269,6 +269,7 @@ export interface CompactInscribeArgs {
  *
  * @category Types
  * @since v0.1.0
+ * @deprecated Since v0.7.0 — Use {@link CreateEscrowV2Args} for V2 escrows.
  * @see {@link VolumeCurveBreakpoint} for discount curve details.
  */
 export interface CreateEscrowArgs {
@@ -411,3 +412,42 @@ export const CompressionType = {
  */
 export type CompressionTypeValue =
   (typeof CompressionType)[keyof typeof CompressionType];
+
+// ═══════════════════════════════════════════════════════════════════
+//  Escrow V2 Instructions (V2.1)
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @interface CreateEscrowV2Args
+ * @description Arguments for the `createEscrowV2` instruction.
+ * @category Types
+ * @since v0.5.0
+ */
+export interface CreateEscrowV2Args {
+  readonly escrowNonce: BN;
+  readonly pricePerCall: BN;
+  readonly maxCalls: BN;
+  readonly initialDeposit: BN;
+  readonly expiresAt: BN;
+  readonly volumeCurve: VolumeCurveBreakpoint[];
+  readonly tokenMint: PublicKey | null;
+  readonly tokenDecimals: number;
+  /** 0=SelfReport, 1=CoSigned, 2=DisputeWindow */
+  readonly settlementSecurity: number;
+  readonly disputeWindowSlots: BN;
+  readonly coSigner: PublicKey | null;
+  readonly arbiter: PublicKey | null;
+}
+
+/**
+ * @interface CreateSubscriptionArgs
+ * @description Arguments for the `createSubscription` instruction.
+ * @category Types
+ * @since v0.5.0
+ */
+export interface CreateSubscriptionArgs {
+  readonly subId: BN;
+  readonly pricePerInterval: BN;
+  readonly billingInterval: number;
+  readonly initialFund: BN;
+}