@acta-markets/ts-sdk 0.0.18-beta → 0.0.20-beta

package/dist/generated/instructions/depositFundsToPosition.js

@@ -38,12 +38,8 @@ export function getDepositFundsToPositionInstruction(input, config) {
             value: input.posSettlementAta ?? null,
             isWritable: true,
         },
-        underlyingTokenProgram: {
-            value: input.underlyingTokenProgram ?? null,
-            isWritable: false,
-        },
-        quoteTokenProgram: {
-            value: input.quoteTokenProgram ?? null,
+        settlementTokenProgram: {
+            value: input.settlementTokenProgram ?? null,
             isWritable: false,
         },
     };
@@ -57,15 +53,14 @@ export function getDepositFundsToPositionInstruction(input, config) {
             getAccountMeta(accounts.marketPda),
             getAccountMeta(accounts.makerFundingAta),
             getAccountMeta(accounts.posSettlementAta),
-            getAccountMeta(accounts.underlyingTokenProgram),
-            getAccountMeta(accounts.quoteTokenProgram),
+            getAccountMeta(accounts.settlementTokenProgram),
         ],
         data: getDepositFundsToPositionInstructionDataEncoder().encode({}),
         programAddress,
     });
 }
 export function parseDepositFundsToPositionInstruction(instruction) {
-    if (instruction.accounts.length < 8) {
+    if (instruction.accounts.length < 7) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -84,8 +79,7 @@ export function parseDepositFundsToPositionInstruction(instruction) {
             marketPda: getNextAccount(),
             makerFundingAta: getNextAccount(),
             posSettlementAta: getNextAccount(),
-            underlyingTokenProgram: getNextAccount(),
-            quoteTokenProgram: getNextAccount(),
+            settlementTokenProgram: getNextAccount(),
         },
         data: getDepositFundsToPositionInstructionDataDecoder().decode(instruction.data),
     };

package/dist/generated/instructions/finalizeMarket.d.ts

@@ -9,13 +9,12 @@ import { type AccountMeta, type AccountSignerMeta, type Address, type FixedSizeC
 import { ACTA_CONTRACT_PROGRAM_ADDRESS } from "../programs";
 export declare const FINALIZE_MARKET_DISCRIMINATOR = 8;
 export declare function getFinalizeMarketDiscriminatorBytes(): ReadonlyUint8Array;
-export type FinalizeMarketInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAdmin extends string | AccountMeta<string> = string, TAccountMarketPda extends string | AccountMeta<string> = string, TAccountConfigPda extends string | AccountMeta<string> = string, TAccountOracleUnderlying extends string | AccountMeta<string> = string, TAccountOracleQuote extends string | AccountMeta<string> = string, TAccountClockSysvar extends string | AccountMeta<string> = "SysvarC1ock11111111111111111111111111111111", TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
+export type FinalizeMarketInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAdmin extends string | AccountMeta<string> = string, TAccountMarketPda extends string | AccountMeta<string> = string, TAccountConfigPda extends string | AccountMeta<string> = string, TAccountOracleUnderlying extends string | AccountMeta<string> = string, TAccountOracleQuote extends string | AccountMeta<string> = string, TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
     TAccountAdmin extends string ? ReadonlySignerAccount<TAccountAdmin> & AccountSignerMeta<TAccountAdmin> : TAccountAdmin,
     TAccountMarketPda extends string ? WritableAccount<TAccountMarketPda> : TAccountMarketPda,
     TAccountConfigPda extends string ? ReadonlyAccount<TAccountConfigPda> : TAccountConfigPda,
     TAccountOracleUnderlying extends string ? ReadonlyAccount<TAccountOracleUnderlying> : TAccountOracleUnderlying,
     TAccountOracleQuote extends string ? ReadonlyAccount<TAccountOracleQuote> : TAccountOracleQuote,
-    TAccountClockSysvar extends string ? ReadonlyAccount<TAccountClockSysvar> : TAccountClockSysvar,
     ...TRemainingAccounts
 ]>;
 export type FinalizeMarketInstructionData = {
@@ -25,7 +24,7 @@ export type FinalizeMarketInstructionDataArgs = {};
 export declare function getFinalizeMarketInstructionDataEncoder(): FixedSizeEncoder<FinalizeMarketInstructionDataArgs>;
 export declare function getFinalizeMarketInstructionDataDecoder(): FixedSizeDecoder<FinalizeMarketInstructionData>;
 export declare function getFinalizeMarketInstructionDataCodec(): FixedSizeCodec<FinalizeMarketInstructionDataArgs, FinalizeMarketInstructionData>;
-export type FinalizeMarketInput<TAccountAdmin extends string = string, TAccountMarketPda extends string = string, TAccountConfigPda extends string = string, TAccountOracleUnderlying extends string = string, TAccountOracleQuote extends string = string, TAccountClockSysvar extends string = string> = {
+export type FinalizeMarketInput<TAccountAdmin extends string = string, TAccountMarketPda extends string = string, TAccountConfigPda extends string = string, TAccountOracleUnderlying extends string = string, TAccountOracleQuote extends string = string> = {
     /** Protocol admin authority */
     admin: TransactionSigner<TAccountAdmin>;
     /** Market PDA to finalize */
@@ -36,12 +35,10 @@ export type FinalizeMarketInput<TAccountAdmin extends string = string, TAccountM
     oracleUnderlying: Address<TAccountOracleUnderlying>;
     /** Quote oracle PDA */
     oracleQuote: Address<TAccountOracleQuote>;
-    /** Clock sysvar account */
-    clockSysvar?: Address<TAccountClockSysvar>;
 };
-export declare function getFinalizeMarketInstruction<TAccountAdmin extends string, TAccountMarketPda extends string, TAccountConfigPda extends string, TAccountOracleUnderlying extends string, TAccountOracleQuote extends string, TAccountClockSysvar extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: FinalizeMarketInput<TAccountAdmin, TAccountMarketPda, TAccountConfigPda, TAccountOracleUnderlying, TAccountOracleQuote, TAccountClockSysvar>, config?: {
+export declare function getFinalizeMarketInstruction<TAccountAdmin extends string, TAccountMarketPda extends string, TAccountConfigPda extends string, TAccountOracleUnderlying extends string, TAccountOracleQuote extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: FinalizeMarketInput<TAccountAdmin, TAccountMarketPda, TAccountConfigPda, TAccountOracleUnderlying, TAccountOracleQuote>, config?: {
     programAddress?: TProgramAddress;
-}): FinalizeMarketInstruction<TProgramAddress, TAccountAdmin, TAccountMarketPda, TAccountConfigPda, TAccountOracleUnderlying, TAccountOracleQuote, TAccountClockSysvar>;
+}): FinalizeMarketInstruction<TProgramAddress, TAccountAdmin, TAccountMarketPda, TAccountConfigPda, TAccountOracleUnderlying, TAccountOracleQuote>;
 export type ParsedFinalizeMarketInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -55,8 +52,6 @@ export type ParsedFinalizeMarketInstruction<TProgram extends string = typeof ACT
         oracleUnderlying: TAccountMetas[3];
         /** Quote oracle PDA */
         oracleQuote: TAccountMetas[4];
-        /** Clock sysvar account */
-        clockSysvar: TAccountMetas[5];
     };
     data: FinalizeMarketInstructionData;
 };

package/dist/generated/instructions/finalizeMarket.js

@@ -34,14 +34,8 @@ export function getFinalizeMarketInstruction(input, config) {
             isWritable: false,
         },
         oracleQuote: { value: input.oracleQuote ?? null, isWritable: false },
-        clockSysvar: { value: input.clockSysvar ?? null, isWritable: false },
     };
     const accounts = originalAccounts;
-    // Resolve default values.
-    if (!accounts.clockSysvar.value) {
-        accounts.clockSysvar.value =
-            "SysvarC1ock11111111111111111111111111111111";
-    }
     const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
     return Object.freeze({
         accounts: [
@@ -50,14 +44,13 @@ export function getFinalizeMarketInstruction(input, config) {
             getAccountMeta(accounts.configPda),
             getAccountMeta(accounts.oracleUnderlying),
             getAccountMeta(accounts.oracleQuote),
-            getAccountMeta(accounts.clockSysvar),
         ],
         data: getFinalizeMarketInstructionDataEncoder().encode({}),
         programAddress,
     });
 }
 export function parseFinalizeMarketInstruction(instruction) {
-    if (instruction.accounts.length < 6) {
+    if (instruction.accounts.length < 5) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -75,7 +68,6 @@ export function parseFinalizeMarketInstruction(instruction) {
             configPda: getNextAccount(),
             oracleUnderlying: getNextAccount(),
             oracleQuote: getNextAccount(),
-            clockSysvar: getNextAccount(),
         },
         data: getFinalizeMarketInstructionDataDecoder().decode(instruction.data),
     };

package/dist/generated/instructions/updateOraclePrice.d.ts

@@ -5,14 +5,13 @@
  *
  * @see https://github.com/codama-idl/codama
  */
-import { type AccountMeta, type AccountSignerMeta, type Address, type FixedSizeCodec, type FixedSizeDecoder, type FixedSizeEncoder, type Instruction, type InstructionWithAccounts, type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, type ReadonlyUint8Array, type TransactionSigner, type WritableAccount } from "@solana/kit";
+import { type AccountMeta, type AccountSignerMeta, type Address, type FixedSizeCodec, type FixedSizeDecoder, type FixedSizeEncoder, type Instruction, type InstructionWithAccounts, type InstructionWithData, type ReadonlySignerAccount, type ReadonlyUint8Array, type TransactionSigner, type WritableAccount } from "@solana/kit";
 import { ACTA_CONTRACT_PROGRAM_ADDRESS } from "../programs";
 export declare const UPDATE_ORACLE_PRICE_DISCRIMINATOR = 16;
 export declare function getUpdateOraclePriceDiscriminatorBytes(): ReadonlyUint8Array;
-export type UpdateOraclePriceInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAuthority extends string | AccountMeta<string> = string, TAccountOraclePda extends string | AccountMeta<string> = string, TAccountClockSysvar extends string | AccountMeta<string> = "SysvarC1ock11111111111111111111111111111111", TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
+export type UpdateOraclePriceInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAuthority extends string | AccountMeta<string> = string, TAccountOraclePda extends string | AccountMeta<string> = string, TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
     TAccountAuthority extends string ? ReadonlySignerAccount<TAccountAuthority> & AccountSignerMeta<TAccountAuthority> : TAccountAuthority,
     TAccountOraclePda extends string ? WritableAccount<TAccountOraclePda> : TAccountOraclePda,
-    TAccountClockSysvar extends string ? ReadonlyAccount<TAccountClockSysvar> : TAccountClockSysvar,
     ...TRemainingAccounts
 ]>;
 export type UpdateOraclePriceInstructionData = {
@@ -27,19 +26,17 @@ export type UpdateOraclePriceInstructionDataArgs = {
 export declare function getUpdateOraclePriceInstructionDataEncoder(): FixedSizeEncoder<UpdateOraclePriceInstructionDataArgs>;
 export declare function getUpdateOraclePriceInstructionDataDecoder(): FixedSizeDecoder<UpdateOraclePriceInstructionData>;
 export declare function getUpdateOraclePriceInstructionDataCodec(): FixedSizeCodec<UpdateOraclePriceInstructionDataArgs, UpdateOraclePriceInstructionData>;
-export type UpdateOraclePriceInput<TAccountAuthority extends string = string, TAccountOraclePda extends string = string, TAccountClockSysvar extends string = string> = {
+export type UpdateOraclePriceInput<TAccountAuthority extends string = string, TAccountOraclePda extends string = string> = {
     /** Oracle authority signer (or protocol admin) */
     authority: TransactionSigner<TAccountAuthority>;
     /** Oracle PDA to update */
     oraclePda: Address<TAccountOraclePda>;
-    /** Clock sysvar account */
-    clockSysvar?: Address<TAccountClockSysvar>;
     price: UpdateOraclePriceInstructionDataArgs["price"];
     settledExpiryTs: UpdateOraclePriceInstructionDataArgs["settledExpiryTs"];
 };
-export declare function getUpdateOraclePriceInstruction<TAccountAuthority extends string, TAccountOraclePda extends string, TAccountClockSysvar extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: UpdateOraclePriceInput<TAccountAuthority, TAccountOraclePda, TAccountClockSysvar>, config?: {
+export declare function getUpdateOraclePriceInstruction<TAccountAuthority extends string, TAccountOraclePda extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: UpdateOraclePriceInput<TAccountAuthority, TAccountOraclePda>, config?: {
     programAddress?: TProgramAddress;
-}): UpdateOraclePriceInstruction<TProgramAddress, TAccountAuthority, TAccountOraclePda, TAccountClockSysvar>;
+}): UpdateOraclePriceInstruction<TProgramAddress, TAccountAuthority, TAccountOraclePda>;
 export type ParsedUpdateOraclePriceInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -47,8 +44,6 @@ export type ParsedUpdateOraclePriceInstruction<TProgram extends string = typeof
         authority: TAccountMetas[0];
         /** Oracle PDA to update */
         oraclePda: TAccountMetas[1];
-        /** Clock sysvar account */
-        clockSysvar: TAccountMetas[2];
     };
     data: UpdateOraclePriceInstructionData;
 };

package/dist/generated/instructions/updateOraclePrice.js

@@ -36,29 +36,22 @@ export function getUpdateOraclePriceInstruction(input, config) {
     const originalAccounts = {
         authority: { value: input.authority ?? null, isWritable: false },
         oraclePda: { value: input.oraclePda ?? null, isWritable: true },
-        clockSysvar: { value: input.clockSysvar ?? null, isWritable: false },
     };
     const accounts = originalAccounts;
     // Original args.
     const args = { ...input };
-    // Resolve default values.
-    if (!accounts.clockSysvar.value) {
-        accounts.clockSysvar.value =
-            "SysvarC1ock11111111111111111111111111111111";
-    }
     const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
     return Object.freeze({
         accounts: [
             getAccountMeta(accounts.authority),
             getAccountMeta(accounts.oraclePda),
-            getAccountMeta(accounts.clockSysvar),
         ],
         data: getUpdateOraclePriceInstructionDataEncoder().encode(args),
         programAddress,
     });
 }
 export function parseUpdateOraclePriceInstruction(instruction) {
-    if (instruction.accounts.length < 3) {
+    if (instruction.accounts.length < 2) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -70,11 +63,7 @@ export function parseUpdateOraclePriceInstruction(instruction) {
     };
     return {
         programAddress: instruction.programAddress,
-        accounts: {
-            authority: getNextAccount(),
-            oraclePda: getNextAccount(),
-            clockSysvar: getNextAccount(),
-        },
+        accounts: { authority: getNextAccount(), oraclePda: getNextAccount() },
         data: getUpdateOraclePriceInstructionDataDecoder().decode(instruction.data),
     };
 }

package/dist/idl/acta_contract.json

@@ -344,7 +344,7 @@
                     "isMut": false,
                     "isSigner": false,
                     "docs": [
-                        "Underlying SPL mint"
+                        "Underlying SPL mint (used for PDA seed and decimals)"
                     ]
                 },
                 {
@@ -352,23 +352,7 @@
                     "isMut": false,
                     "isSigner": false,
                     "docs": [
-                        "Quote SPL mint"
-                    ]
-                },
-                {
-                    "name": "underlyingMintAcc",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Underlying mint account (for decimals)"
-                    ]
-                },
-                {
-                    "name": "quoteMintAcc",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Quote mint account (for decimals)"
+                        "Quote SPL mint (used for PDA seed and decimals)"
                     ]
                 },
                 {
@@ -617,14 +601,6 @@
                     "docs": [
                         "Quote oracle PDA"
                     ]
-                },
-                {
-                    "name": "clockSysvar",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Clock sysvar account"
-                    ]
                 }
             ],
             "args": [],
@@ -685,19 +661,11 @@
                     ]
                 },
                 {
-                    "name": "underlyingTokenProgram",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Token program for underlying mint"
-                    ]
-                },
-                {
-                    "name": "quoteTokenProgram",
+                    "name": "settlementTokenProgram",
                     "isMut": false,
                     "isSigner": false,
                     "docs": [
-                        "Token program for quote mint"
+                        "Token program for the settlement mint"
                     ]
                 }
             ],
@@ -1063,15 +1031,7 @@
                     "isMut": false,
                     "isSigner": false,
                     "docs": [
-                        "SPL mint this oracle prices"
-                    ]
-                },
-                {
-                    "name": "mintAcc",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Mint account (for decimals + token program owner)"
+                        "SPL mint this oracle prices (also used for decimals + token program owner)"
                     ]
                 },
                 {
@@ -1129,14 +1089,6 @@
                     "docs": [
                         "Oracle PDA to update"
                     ]
-                },
-                {
-                    "name": "clockSysvar",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Clock sysvar account"
-                    ]
                 }
             ],
             "args": [
@@ -1251,14 +1203,6 @@
                     "docs": [
                         "Oracle PDA to close"
                     ]
-                },
-                {
-                    "name": "clockSysvar",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Clock sysvar account"
-                    ]
                 }
             ],
             "args": [],

package/dist/idl/hash.d.ts

@@ -1 +1 @@
-export declare const ACTA_IDL_SHA256 = "8072bc43541635b8c359d8c0209c3ab63f6a264d6843997d20c9d6c9473130c9";
+export declare const ACTA_IDL_SHA256 = "34f93515df3ceed9854715fb73e9fe0de615383e5ff3f0d627ecd029e65e5688";

package/dist/idl/hash.js

@@ -1 +1 @@
-export const ACTA_IDL_SHA256 = "8072bc43541635b8c359d8c0209c3ab63f6a264d6843997d20c9d6c9473130c9";
+export const ACTA_IDL_SHA256 = "34f93515df3ceed9854715fb73e9fe0de615383e5ff3f0d627ecd029e65e5688";

package/dist/ws/apy.d.ts

@@ -42,7 +42,7 @@ export declare function computeApyFromAmounts(args: {
     premiumPerUnderlying: number;
     /** for puts: strike price per 1 underlying (quote units) */
     strikePrice: number;
-    /** for calls: current spot price per 1 underlying (quote units) */
+    /** current spot price per 1 underlying (quote units), required for both calls and puts */
     spotPrice?: number;
     /** seconds to option expiry (market expiry, not RFQ TTL) */
     secondsToExpiry: number;

package/dist/ws/apy.js

@@ -50,17 +50,11 @@ export function computeApyFromAmounts(args) {
     if (!Number.isFinite(premPU) || premPU < 0)
         throw new Error("invalid premiumPerUnderlying");
     const premiumNotional = qty * premPU;
-    let collateralPerUnderlying;
-    if (args.positionType === "cash_secured_put") {
-        collateralPerUnderlying = args.strikePrice;
-    }
-    else {
-        collateralPerUnderlying = args.spotPrice ?? NaN;
-    }
+    // Collateral always valued at spot so APR is monotonic across strikes.
+    // On-chain collateral requirements are unchanged — display metric only.
+    const collateralPerUnderlying = args.spotPrice ?? NaN;
     if (!Number.isFinite(collateralPerUnderlying) || collateralPerUnderlying <= 0) {
-        throw new Error(args.positionType === "covered_call"
-            ? "spotPrice is required for covered_call yield"
-            : "invalid strikePrice");
+        throw new Error("spotPrice is required for yield calculation");
     }
     const collateralNotional = qty * collateralPerUnderlying;
     const termYield = termYieldFromNotionals({ premiumNotional, collateralNotional });

package/dist/ws/apy.test.js

@@ -5,7 +5,7 @@ describe("ws apy helpers", () => {
             positionType: "covered_call",
             underlyingAmount: 10,
             spotPrice: 150,
-            strikePrice: 150, // not used for calls
+            strikePrice: 150, // not used for collateral, kept for API compat
             premiumPerUnderlying: 1.5,
             secondsToExpiry: 7 * 24 * 60 * 60,
         });
@@ -20,8 +20,44 @@ describe("ws apy helpers", () => {
             underlyingAmount: 10,
             grossPremiumPerUnit1e9: 1_500_000_000, // 1.5
             strike1e9: 150_000_000_000, // 150
+            spotPrice1e9: 150_000_000_000, // 150 (ATM)
             secondsToExpiry: 7 * 24 * 60 * 60,
         });
         expect(res.premiumNotional).toBeCloseTo(15, 10);
     });
+    it("put APR uses spot as collateral (not strike)", () => {
+        const spot = 150;
+        const strike = 120; // OTM put
+        const res = computeApyFromAmounts({
+            positionType: "cash_secured_put",
+            underlyingAmount: 1,
+            spotPrice: spot,
+            strikePrice: strike,
+            premiumPerUnderlying: 1.5,
+            secondsToExpiry: 30 * 24 * 60 * 60,
+        });
+        // collateral should be spot-based, not strike-based
+        expect(res.collateralNotional).toBeCloseTo(spot, 10);
+    });
+    it("put APR is monotonically decreasing for OTM strikes", () => {
+        const spot1e9 = 150_000_000_000; // 150
+        const strikes = [140, 130, 120, 110].map(s => s * 1_000_000_000);
+        // Premiums decrease with OTM (roughly realistic)
+        const premiums = [5, 2.5, 1, 0.3].map(p => p * 1_000_000_000);
+        const aprs = strikes.map((strike, i) => {
+            const res = computeApyFromScaledPrices({
+                positionType: "cash_secured_put",
+                underlyingAmount: 1,
+                grossPremiumPerUnit1e9: premiums[i],
+                strike1e9: strike,
+                spotPrice1e9: spot1e9,
+                secondsToExpiry: 30 * 24 * 60 * 60,
+            });
+            return res.apr;
+        });
+        // Each APR should be less than the previous
+        for (let i = 1; i < aprs.length; i++) {
+            expect(aprs[i]).toBeLessThan(aprs[i - 1]);
+        }
+    });
 });

package/dist/ws/client.d.ts

@@ -2,7 +2,7 @@
 import type { AuthProvider } from "./auth";
 import type { SignerLike } from "../chain/orders";
 import type { Address } from "@solana/addresses";
-import type { ActiveRfqInfo, ChainEventMessage, EarnSummaryData, TokenMarketsInfoData, GlobalStats, MarketDescriptorInfo, MarketInfo, MyActiveRfqInfo, MyActiveRfqsMessage, OrderStatusMessage, PositionInfo, QuoteAcknowledgedMessage, QuoteBestStatusMessage, QuoteCancelledMessage, QuoteMessage, QuoteRefreshRequestedMessage, QuoteOutbidMessage, QuoteReceivedMessage, QuoteSelectedMessage, QuotesUpdateMessage, RfqBroadcastMessage, RfqClosedMessage, RfqCreatedMessage, RfqSkippedMessage, RfqRequestMessage, RfqAvailableAgainMessage, QuoteExpiredMessage, QuoteFilledMessage, IndicativePricesMessage, IndicativePricesRequestMessage, IndicativePricesResponseMessage, GetIndicativePricesMessage, RequestId, ServerMessage, SnapshotMessage, StatsDelta, SubscriptionsMessage, TokenInfo, TradeInfo, UuidString, VersionMismatchMessage, WelcomeMessage, WsChannel } from "./types";
+import type { ActiveRfqInfo, ChainEventMessage, EarnSummaryData, TokenMarketsInfoData, GlobalStats, MarketDescriptorInfo, MarketInfo, MyActiveRfqInfo, MyActiveRfqsMessage, OrderStatusMessage, PositionInfo, QuoteAcknowledgedMessage, QuoteBestStatusMessage, QuoteCancelledMessage, QuoteMessage, QuoteRefreshRequestedMessage, QuoteOutbidMessage, QuoteReceivedMessage, QuoteSelectedMessage, QuotesUpdateMessage, RfqBroadcastMessage, RfqClosedMessage, RfqCreatedMessage, RfqSkippedMessage, RfqRequestMessage, RfqAvailableAgainMessage, QuoteExpiredMessage, QuoteFilledMessage, IndicativePricesMessage, IndicativePricesRequestMessage, IndicativePricesResponseMessage, GetIndicativePricesMessage, RequestId, ServerError, ServerMessage, SnapshotMessage, StatsDelta, SubscriptionsMessage, TokenInfo, TradeInfo, UuidString, VersionMismatchMessage, WelcomeMessage, WsChannel } from "./types";
 export type ConnectionState = "disconnected" | "connecting" | "authenticating" | "authenticated" | "error";
 export type ClientRole = "taker" | "maker";
 export type PendingMessagesOverflowPolicy = "drop_oldest" | "drop_newest" | "throw";
@@ -60,7 +60,19 @@ export type ActaWsClientEvents = {
     authError: (reason: string, message?: string) => void;
     logoutSuccess: () => void;
     disconnected: (code: number, reason: string) => void;
-    error: (error: Error) => void;
+    error: (error: ServerError) => void;
+    requestError: (data: {
+        request_id: RequestId;
+        error: ServerError;
+    }) => void;
+    subscribeAck: (data: {
+        request_id: RequestId;
+        subscribed: WsChannel[];
+    }) => void;
+    unsubscribeAck: (data: {
+        request_id: RequestId;
+        unsubscribed: WsChannel[];
+    }) => void;
     stateChange: (state: ConnectionState) => void;
     message: (message: ServerMessage) => void;
     snapshot: (snapshot: SnapshotMessage) => void;
@@ -241,8 +253,8 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
         makerSigner: SignerLike;
     }): Promise<void>;
     cancelQuote(rfqId: string): RequestId;
-    subscribe(channels: WsChannel[], markets?: string[]): void;
-    unsubscribe(channels: WsChannel[]): void;
+    subscribe(channels: WsChannel[], markets?: string[]): RequestId;
+    unsubscribe(channels: WsChannel[]): RequestId;
     ping(): void;
     resumeAuth(sessionId: string): void;
     private doConnect;

package/dist/ws/client.handshake.integration.test.js

@@ -50,7 +50,8 @@ describeIfWsUrl("ws handshake integration (real backend)", () => {
             });
             client.on("error", (err) => {
                 if (!welcomeReceived) {
-                    finish(err);
+                    const msg = err.type === "generic" ? err.data.message : err.type;
+                    finish(new Error(msg));
                 }
             });
             client.on("disconnected", (code, reason) => {

package/dist/ws/client.js

@@ -1,6 +1,10 @@
 /** Acta WebSocket client (rfq-server). */
 import { buildSignedQuoteMessage, buildAcceptQuoteMessage } from "./flows";
 import { assertWsU64Safe, validateQuantityBySizeRule } from "./wirePolicy";
+function toGenericServerError(err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { type: "generic", data: { code: "client_error", message } };
+}
 function formatServerError(error) {
     if (error.type === "generic") {
         return `${error.data.code}: ${error.data.message}`;
@@ -157,7 +161,7 @@ export class ActaWsClient extends TypedEventEmitter {
         if (this.ws?.readyState === WS_OPEN) {
             if (this.welcomeReceived && !this.startAuthSent) {
                 void this.beginAuthHandshake().catch((err) => {
-                    this.emit("error", err);
+                    this.emit("error", toGenericServerError(err));
                     this.setConnectionState("error");
                 });
             }
@@ -390,6 +394,7 @@ export class ActaWsClient extends TypedEventEmitter {
     }
     subscribe(channels, markets) {
         this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
         for (const c of channels)
             this.subscribedChannels.add(c);
         if (markets) {
@@ -399,18 +404,21 @@ export class ActaWsClient extends TypedEventEmitter {
         this.send({
             type: "Subscribe",
             data: this.hasMarketScope
-                ? { channels, markets: Array.from(this.subscribedMarkets) }
-                : { channels },
+                ? { request_id, channels, markets: Array.from(this.subscribedMarkets) }
+                : { request_id, channels },
         });
+        return request_id;
     }
     unsubscribe(channels) {
         this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
         for (const c of channels)
             this.subscribedChannels.delete(c);
         this.send({
             type: "Unsubscribe",
-            data: { channels },
+            data: { request_id, channels },
         });
+        return request_id;
     }
     ping() {
         if (this.ws?.readyState === WS_OPEN) {
@@ -465,7 +473,7 @@ export class ActaWsClient extends TypedEventEmitter {
         };
         ws.onerror = (ev) => {
             this.log("WebSocket error:", ev);
-            this.emit("error", new Error("WebSocket error"));
+            this.emit("error", toGenericServerError("WebSocket error"));
             if (this.shouldReconnect) {
                 this.cleanup();
                 this.scheduleReconnect();
@@ -482,7 +490,7 @@ export class ActaWsClient extends TypedEventEmitter {
                 this.flushPendingMessages();
                 if (this.authRequested && this.authProvider && !this.startAuthSent) {
                     void this.beginAuthHandshake().catch((err) => {
-                        this.emit("error", err);
+                        this.emit("error", toGenericServerError(err));
                         this.setConnectionState("error");
                     });
                 }
@@ -708,7 +716,16 @@ export class ActaWsClient extends TypedEventEmitter {
             case "Pong":
                 break;
             case "Error":
-                this.emit("error", new Error(formatServerError(message.data)));
+                this.emit("error", message.data);
+                break;
+            case "RequestError":
+                this.emit("requestError", message.data);
+                break;
+            case "SubscribeAck":
+                this.emit("subscribeAck", message.data);
+                break;
+            case "UnsubscribeAck":
+                this.emit("unsubscribeAck", message.data);
                 break;
         }
     }
@@ -729,7 +746,7 @@ export class ActaWsClient extends TypedEventEmitter {
     async handleAuthRequest(challenge) {
         this.setConnectionState("authenticating");
         if (!this.authProvider) {
-            this.emit("error", new Error("No auth provider configured"));
+            this.emit("error", toGenericServerError("No auth provider configured"));
             return;
         }
         try {
@@ -743,7 +760,7 @@ export class ActaWsClient extends TypedEventEmitter {
             });
         }
         catch (err) {
-            this.emit("error", err);
+            this.emit("error", toGenericServerError(err));
             this.setConnectionState("error");
         }
     }
@@ -794,9 +811,10 @@ export class ActaWsClient extends TypedEventEmitter {
         this.emit("authenticated", sessionId, expiresAt);
         if (this.subscribedChannels.size > 0) {
             const channels = Array.from(this.subscribedChannels);
+            const request_id = this.nextRequestId();
             const data = this.hasMarketScope
-                ? { channels, markets: Array.from(this.subscribedMarkets) }
-                : { channels };
+                ? { request_id, channels, markets: Array.from(this.subscribedMarkets) }
+                : { request_id, channels };
             this.send({ type: "Subscribe", data });
         }
     }
@@ -810,14 +828,14 @@ export class ActaWsClient extends TypedEventEmitter {
             this.lastAuthSessionId = null;
             this.startAuthSent = false;
             void this.sendStartAuth().catch((err) => {
-                this.emit("error", err);
+                this.emit("error", toGenericServerError(err));
                 this.setConnectionState("error");
             });
             return;
         }
         this.setConnectionState("error");
         const details = message ? `${reason}: ${message}` : reason;
-        this.emit("error", new Error(`Authentication failed: ${details}`));
+        this.emit("error", toGenericServerError(`Authentication failed: ${details}`));
     }
     handleSnapshot(snapshot) {
         this.state.markets.clear();
@@ -956,7 +974,7 @@ export class ActaWsClient extends TypedEventEmitter {
                 this.log("Pending queue full, dropping newest message:", message.type);
                 return false;
             case "throw":
-                this.emit("error", new Error(`Pending queue overflow (maxPendingMessages=${maxPending}) for message type=${message.type}`));
+                this.emit("error", toGenericServerError(`Pending queue overflow (maxPendingMessages=${maxPending}) for message type=${message.type}`));
                 return false;
         }
     }

package/dist/ws/client.test.js

@@ -418,7 +418,11 @@ describe("ActaWsClient", () => {
         client.getMarkets();
         client.getTokens();
         expect(errors).toHaveLength(1);
-        expect(errors[0].message).toContain("Pending queue overflow");
+        const err0 = errors[0];
+        expect(err0.type).toBe("generic");
+        if (err0.type === "generic") {
+            expect(err0.data.message).toContain("Pending queue overflow");
+        }
         ws.triggerMessage(WELCOME_MESSAGE);
         const flushedTypes = ws.sent
             .slice(1)