@acta-markets/ts-sdk 0.0.4-beta → 0.0.6-beta

package/dist/cjs/ws/wirePolicy.test.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const wirePolicy_1 = require("./wirePolicy");
+describe("validateQuantityBySizeRule", () => {
+    const rule = {
+        min_size: 2_000_000_000,
+        max_size: 10_000_000_000,
+        step: 1_000_000_000,
+    };
+    it("accepts a valid quantity", () => {
+        expect(() => (0, wirePolicy_1.validateQuantityBySizeRule)(6_000_000_000, rule)).not.toThrow();
+    });
+    it("rejects quantity below min", () => {
+        expect(() => (0, wirePolicy_1.validateQuantityBySizeRule)(1_000_000_000, rule)).toThrow("must be within");
+    });
+    it("rejects quantity above max", () => {
+        expect(() => (0, wirePolicy_1.validateQuantityBySizeRule)(11_000_000_000, rule)).toThrow("must be within");
+    });
+    it("rejects quantity with invalid step", () => {
+        expect(() => (0, wirePolicy_1.validateQuantityBySizeRule)(2_500_000_000, rule)).toThrow("(quantity - min_size) % step == 0");
+    });
+});

package/dist/events.test.js

@@ -182,6 +182,8 @@ describe("events parsing", () => {
                 Buffer.from(pk(3)),
                 u64(777),
                 Buffer.from([1]), // is_put
+                Buffer.from([6]), // underlying_decimals
+                Buffer.from([9]), // quote_decimals
             ]));
             const d = decodeActaEventLine(line);
             expect(d.kind).toBe(EventKind.CreateMarket);
@@ -192,6 +194,8 @@ describe("events parsing", () => {
                 expect(d.event.quoteMint).toBe(addr(3));
                 expect(d.event.expiryTs).toBe(777n);
                 expect(d.event.isPut).toBe(1);
+                expect(d.event.underlyingDecimals).toBe(6);
+                expect(d.event.quoteDecimals).toBe(9);
             }
         }
         // 9: FinalizeMarket
@@ -213,6 +217,7 @@ describe("events parsing", () => {
                 u64(222),
                 Buffer.from([1]),
                 Buffer.from(pk(3)),
+                Buffer.from(pk(9)),
             ]));
             const d = decodeActaEventLine(line);
             expect(d.kind).toBe(EventKind.CreateOracle);
@@ -223,6 +228,7 @@ describe("events parsing", () => {
                 expect(d.event.expiryTs).toBe(222n);
                 expect(d.event.oracleType).toBe(1);
                 expect(d.event.authority).toBe(addr(3));
+                expect(Buffer.from(d.event.feedId)).toEqual(Buffer.from(pk(9)));
             }
         }
         // 15: UpdateOraclePrice

package/dist/generated/types/actaEvent.d.ts

@@ -55,6 +55,8 @@ export type ActaEvent = {
     quoteMint: Address;
     expiryTs: bigint;
     isPut: number;
+    underlyingDecimals: number;
+    quoteDecimals: number;
 } | {
     __kind: "FinalizeMarket";
     marketPda: Address;
@@ -95,6 +97,7 @@ export type ActaEvent = {
     expiryTs: bigint;
     oracleType: number;
     authority: Address;
+    feedId: ReadonlyUint8Array;
 } | {
     __kind: "UpdateOraclePrice";
     oraclePda: Address;
@@ -163,6 +166,8 @@ export type ActaEventArgs = {
     quoteMint: Address;
     expiryTs: number | bigint;
     isPut: number;
+    underlyingDecimals: number;
+    quoteDecimals: number;
 } | {
     __kind: "FinalizeMarket";
     marketPda: Address;
@@ -203,6 +208,7 @@ export type ActaEventArgs = {
     expiryTs: number | bigint;
     oracleType: number;
     authority: Address;
+    feedId: ReadonlyUint8Array;
 } | {
     __kind: "UpdateOraclePrice";
     oraclePda: Address;

package/dist/generated/types/actaEvent.js

@@ -82,6 +82,8 @@ export function getActaEventEncoder() {
                 ["quoteMint", getAddressEncoder()],
                 ["expiryTs", getU64Encoder()],
                 ["isPut", getU8Encoder()],
+                ["underlyingDecimals", getU8Encoder()],
+                ["quoteDecimals", getU8Encoder()],
             ]),
         ],
         [
@@ -135,6 +137,7 @@ export function getActaEventEncoder() {
                 ["expiryTs", getU64Encoder()],
                 ["oracleType", getU8Encoder()],
                 ["authority", getAddressEncoder()],
+                ["feedId", fixEncoderSize(getBytesEncoder(), 32)],
             ]),
         ],
         [
@@ -240,6 +243,8 @@ export function getActaEventDecoder() {
                 ["quoteMint", getAddressDecoder()],
                 ["expiryTs", getU64Decoder()],
                 ["isPut", getU8Decoder()],
+                ["underlyingDecimals", getU8Decoder()],
+                ["quoteDecimals", getU8Decoder()],
             ]),
         ],
         [
@@ -293,6 +298,7 @@ export function getActaEventDecoder() {
                 ["expiryTs", getU64Decoder()],
                 ["oracleType", getU8Decoder()],
                 ["authority", getAddressDecoder()],
+                ["feedId", fixDecoderSize(getBytesDecoder(), 32)],
             ]),
         ],
         [

package/dist/idl/acta_contract.json

@@ -1883,6 +1883,14 @@
                             {
                                 "name": "is_put",
                                 "type": "u8"
+                            },
+                            {
+                                "name": "underlying_decimals",
+                                "type": "u8"
+                            },
+                            {
+                                "name": "quote_decimals",
+                                "type": "u8"
                             }
                         ]
                     },
@@ -2030,6 +2038,15 @@
                             {
                                 "name": "authority",
                                 "type": "publicKey"
+                            },
+                            {
+                                "name": "feed_id",
+                                "type": {
+                                    "array": [
+                                        "u8",
+                                        32
+                                    ]
+                                }
                             }
                         ]
                     },

package/dist/idl/hash.d.ts

@@ -1 +1 @@
-export declare const ACTA_IDL_SHA256 = "1466fbb647b4c33af315eefbb61e5e572ce14f22f16d050ac2894f8e017aaf66";
+export declare const ACTA_IDL_SHA256 = "704677f7071ecbe98f442fb62468d882329b906950a707fc47aad0f38683636f";

package/dist/idl/hash.js

@@ -1 +1 @@
-export const ACTA_IDL_SHA256 = "1466fbb647b4c33af315eefbb61e5e572ce14f22f16d050ac2894f8e017aaf66";
+export const ACTA_IDL_SHA256 = "704677f7071ecbe98f442fb62468d882329b906950a707fc47aad0f38683636f";

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, GlobalStats, MarketDescriptorInfo, MarketInfo, MyActiveRfqInfo, MyActiveRfqsMessage, OrderStatusMessage, PositionInfo, QuoteAcknowledgedMessage, QuoteBestStatusMessage, QuoteCancelledMessage, QuoteMessage, QuoteRefreshRequestedMessage, QuoteOutbidMessage, QuoteReceivedMessage, QuoteSelectedMessage, QuotesUpdateMessage, RfqBroadcastMessage, RfqClosedMessage, RfqCreatedMessage, RfqRequestMessage, RfqAvailableAgainMessage, QuoteExpiredMessage, QuoteFilledMessage, IndicativePricesMessage, IndicativePricesRequestMessage, IndicativePricesResponseMessage, GetIndicativePricesMessage, ServerMessage, SnapshotMessage, StatsDelta, SubscriptionsMessage, TokenInfo, TradeInfo, UuidString, VersionMismatchMessage, WelcomeMessage, WsChannel } from "./types";
+import type { ActiveRfqInfo, ChainEventMessage, GlobalStats, MarketDescriptorInfo, MarketInfo, MyActiveRfqInfo, MyActiveRfqsMessage, OrderStatusMessage, PositionInfo, QuoteAcknowledgedMessage, QuoteBestStatusMessage, QuoteCancelledMessage, QuoteMessage, QuoteRefreshRequestedMessage, QuoteOutbidMessage, QuoteReceivedMessage, QuoteSelectedMessage, QuotesUpdateMessage, RfqBroadcastMessage, RfqClosedMessage, RfqCreatedMessage, RfqRequestMessage, RfqAvailableAgainMessage, QuoteExpiredMessage, QuoteFilledMessage, IndicativePricesMessage, IndicativePricesRequestMessage, IndicativePricesResponseMessage, GetIndicativePricesMessage, RequestId, 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";
@@ -57,7 +57,8 @@ export type ActaWsClientEvents = {
     welcome: (msg: WelcomeMessage) => void;
     versionMismatch: (msg: VersionMismatchMessage) => void;
     authenticated: (sessionId: string, expiresAt: number | null) => void;
-    authError: (reason: string) => void;
+    authError: (reason: string, message?: string) => void;
+    logoutSuccess: () => void;
     disconnected: (code: number, reason: string) => void;
     error: (error: Error) => void;
     stateChange: (state: ConnectionState) => void;
@@ -151,6 +152,7 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
     private pendingResumeSessionId;
     private connectionState;
     private sessionId;
+    private lastAuthSessionId;
     private helloSent;
     private welcomeReceived;
     private pendingMessages;
@@ -161,6 +163,7 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
     private subscribedChannels;
     private subscribedMarkets;
     private hasMarketScope;
+    private marketDescriptorsByMarket;
     readonly state: ClientState;
     constructor(options: ActaWsClientOptions);
     connectAnonymous(): void;
@@ -195,23 +198,24 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
         orderIdHex: string;
         txBase64: string;
     }): Promise<void>;
-    getPositions(): void;
-    getMarkets(): void;
+    getPositions(): RequestId;
+    getMarkets(): RequestId;
     getMarketDescriptors(args?: {
         active_only?: boolean;
-    }): void;
+    }): RequestId;
     getExpiries(args?: {
         underlying_mint?: Address<string>;
         quote_mint?: Address<string>;
         is_put?: boolean | null;
-    }): void;
+    }): RequestId;
     getTokens(args?: {
         active_only?: boolean;
-    }): void;
-    getMyActiveRfqs(): void;
-    getActiveRfqs(): void;
-    getOrderStatus(orderIdHex: string): void;
-    cancelRfq(rfqId: string): void;
+    }): RequestId;
+    getMyActiveRfqs(): RequestId;
+    getActiveRfqs(): RequestId;
+    logout(): void;
+    getOrderStatus(orderIdHex: string): RequestId;
+    cancelRfq(rfqId: string): RequestId;
     submitQuote(quote: QuoteMessage): void;
     /**
      * Convenience: sign 32-byte `orderId` and send `Quote`.
@@ -228,7 +232,7 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
         orderId: Uint8Array;
         makerSigner: SignerLike;
     }): Promise<void>;
-    cancelQuote(rfqId: string): void;
+    cancelQuote(rfqId: string): RequestId;
     subscribe(channels: WsChannel[], markets?: string[]): void;
     unsubscribe(channels: WsChannel[]): void;
     ping(): void;
@@ -236,7 +240,7 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
     private doConnect;
     private handleMessage;
     /** Taker-only: request current indicative prices for a market + position_type. */
-    getIndicativePrices(req: GetIndicativePricesMessage): void;
+    getIndicativePrices(req: Omit<GetIndicativePricesMessage, "request_id">): RequestId;
     /** Maker-only: respond to an indicative request (unsigned, non-binding). */
     sendIndicativePricesResponse(resp: IndicativePricesResponseMessage): void;
     private handleAuthRequest;
@@ -257,6 +261,7 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
     private handlePositionUpdated;
     private handleChainEvent;
     private send;
+    private nextRequestId;
     private ensureAuthenticated;
     private setConnectionState;
     private startPingInterval;

package/dist/ws/client.js

@@ -1,6 +1,6 @@
 /** Acta WebSocket client (rfq-server). */
 import { buildSignedQuoteMessage, buildAcceptQuoteMessage } from "./flows";
-import { assertWsU64Safe } from "./wirePolicy";
+import { assertWsU64Safe, validateQuantityBySizeRule } from "./wirePolicy";
 function formatServerError(error) {
     if (error.type === "generic") {
         return `${error.data.code}: ${error.data.message}`;
@@ -70,6 +70,21 @@ function getCloseInfo(ev) {
         reason: typeof rec.reason === "string" ? rec.reason : undefined,
     };
 }
+function generateRequestId() {
+    const cryptoApi = globalThis.crypto;
+    if (cryptoApi?.randomUUID) {
+        return cryptoApi.randomUUID();
+    }
+    if (cryptoApi?.getRandomValues) {
+        const bytes = cryptoApi.getRandomValues(new Uint8Array(16));
+        // RFC4122 v4 bits: version=0100, variant=10xx.
+        bytes[6] = (bytes[6] & 0x0f) | 0x40;
+        bytes[8] = (bytes[8] & 0x3f) | 0x80;
+        const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
+        return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+    }
+    return `req-${Date.now()}-${Math.random().toString(16).slice(2, 10)}`;
+}
 export class ActaWsClient extends TypedEventEmitter {
     ws = null;
     options;
@@ -79,6 +94,7 @@ export class ActaWsClient extends TypedEventEmitter {
     pendingResumeSessionId = null;
     connectionState = "disconnected";
     sessionId = null;
+    lastAuthSessionId = null;
     helloSent = false;
     welcomeReceived = false;
     pendingMessages = [];
@@ -89,6 +105,7 @@ export class ActaWsClient extends TypedEventEmitter {
     subscribedChannels = new Set(["rfqs"]);
     subscribedMarkets = new Set();
     hasMarketScope = false;
+    marketDescriptorsByMarket = new Map();
     state = {
         stats: null,
         activeRfqs: new Map(),
@@ -121,6 +138,7 @@ export class ActaWsClient extends TypedEventEmitter {
         this.authProvider = null;
         this.authRequested = false;
         this.pendingResumeSessionId = null;
+        this.lastAuthSessionId = null;
         this.shouldReconnect = this.options.autoReconnect;
         this.doConnect();
     }
@@ -176,6 +194,13 @@ export class ActaWsClient extends TypedEventEmitter {
     }
     async createRfq(request) {
         this.ensureAuthenticated();
+        assertWsU64Safe(request.strike, "strike");
+        assertWsU64Safe(request.quantity, "quantity");
+        const marketDescriptor = this.marketDescriptorsByMarket.get(request.market);
+        if (!marketDescriptor) {
+            throw new Error(`Missing market descriptor for market=${request.market}; call getMarketDescriptors() before createRfq().`);
+        }
+        validateQuantityBySizeRule(request.quantity, marketDescriptor.size_rule);
         this.send({
             type: "RfqRequest",
             data: {
@@ -220,47 +245,89 @@ export class ActaWsClient extends TypedEventEmitter {
     }
     getPositions() {
         this.ensureAuthenticated();
-        this.send({ type: "GetPositions" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetPositions",
+            data: { request_id: requestId },
+        });
+        return requestId;
     }
     getMarkets() {
-        this.send({ type: "GetMarkets" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetMarkets",
+            data: { request_id: requestId },
+        });
+        return requestId;
     }
     getMarketDescriptors(args) {
+        const requestId = this.nextRequestId();
         const data = {
+            request_id: requestId,
             active_only: args?.active_only ?? true,
         };
         this.send({ type: "GetMarketDescriptors", data });
+        return requestId;
     }
     getExpiries(args) {
+        const requestId = this.nextRequestId();
         this.send({
             type: "GetExpiries",
             data: {
+                request_id: requestId,
                 underlying_mint: args?.underlying_mint,
                 quote_mint: args?.quote_mint,
                 is_put: args?.is_put ?? null,
             },
         });
+        return requestId;
     }
     getTokens(args) {
+        const requestId = this.nextRequestId();
         const data = {
+            request_id: requestId,
             active_only: args?.active_only ?? true,
         };
         this.send({ type: "GetTokens", data });
+        return requestId;
     }
     getMyActiveRfqs() {
         this.ensureAuthenticated();
-        this.send({ type: "GetMyActiveRfqs" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetMyActiveRfqs",
+            data: { request_id: requestId },
+        });
+        return requestId;
     }
     getActiveRfqs() {
-        this.send({ type: "GetActiveRfqs" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetActiveRfqs",
+            data: { request_id: requestId },
+        });
+        return requestId;
+    }
+    logout() {
+        this.send({ type: "Logout" });
     }
     getOrderStatus(orderIdHex) {
         this.ensureAuthenticated();
-        this.send({ type: "GetOrderStatus", data: { order_id: orderIdHex } });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetOrderStatus",
+            data: { request_id: requestId, order_id: orderIdHex },
+        });
+        return requestId;
     }
     cancelRfq(rfqId) {
         this.ensureAuthenticated();
-        this.send({ type: "CancelRfq", data: { rfq_id: rfqId } });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "CancelRfq",
+            data: { rfq_id: rfqId, request_id: requestId },
+        });
+        return requestId;
     }
     submitQuote(quote) {
         this.ensureAuthenticated();
@@ -290,7 +357,12 @@ export class ActaWsClient extends TypedEventEmitter {
     }
     cancelQuote(rfqId) {
         this.ensureAuthenticated();
-        this.send({ type: "CancelQuote", data: { rfq_id: rfqId } });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "CancelQuote",
+            data: { rfq_id: rfqId, request_id: requestId },
+        });
+        return requestId;
     }
     subscribe(channels, markets) {
         this.ensureAuthenticated();
@@ -415,6 +487,14 @@ export class ActaWsClient extends TypedEventEmitter {
             case "AuthError":
                 this.handleAuthError(message.data.reason, message.data.message);
                 break;
+            case "LogoutSuccess":
+                this.sessionId = null;
+                this.pendingResumeSessionId = null;
+                this.lastAuthSessionId = null;
+                this.startAuthSent = false;
+                this.setConnectionState("connecting");
+                this.emit("logoutSuccess");
+                break;
             case "Snapshot":
                 this.handleSnapshot(message.data);
                 break;
@@ -425,7 +505,13 @@ export class ActaWsClient extends TypedEventEmitter {
                 this.handleMarkets(message.data.markets ?? []);
                 break;
             case "MarketDescriptors":
-                this.emit("marketDescriptors", message.data.markets ?? []);
+                {
+                    const marketDescriptors = message.data.markets ?? [];
+                    for (const marketDescriptor of marketDescriptors) {
+                        this.marketDescriptorsByMarket.set(marketDescriptor.market.market_pda, marketDescriptor);
+                    }
+                    this.emit("marketDescriptors", marketDescriptors);
+                }
                 break;
             case "Expiries":
                 this.emit("expiries", message.data.expiries_ts ?? []);
@@ -584,10 +670,12 @@ export class ActaWsClient extends TypedEventEmitter {
     }
     /** Taker-only: request current indicative prices for a market + position_type. */
     getIndicativePrices(req) {
+        const requestId = this.nextRequestId();
         this.send({
             type: "GetIndicativePrices",
-            data: req,
+            data: { ...req, request_id: requestId },
         });
+        return requestId;
     }
     /** Maker-only: respond to an indicative request (unsigned, non-binding). */
     sendIndicativePricesResponse(resp) {
@@ -616,8 +704,9 @@ export class ActaWsClient extends TypedEventEmitter {
         }
     }
     async beginAuthHandshake() {
-        if (this.pendingResumeSessionId) {
-            this.sendResumeAuth(this.pendingResumeSessionId);
+        const resumeSessionId = this.pendingResumeSessionId ?? this.lastAuthSessionId;
+        if (resumeSessionId) {
+            this.sendResumeAuth(resumeSessionId);
             return;
         }
         await this.sendStartAuth();
@@ -654,6 +743,9 @@ export class ActaWsClient extends TypedEventEmitter {
     handleAuthSuccess(sessionId, expiresAt) {
         this.sessionId = sessionId;
         this.pendingResumeSessionId = null;
+        if (expiresAt !== null) {
+            this.lastAuthSessionId = sessionId;
+        }
         this.setConnectionState("authenticated");
         this.emit("authenticated", sessionId, expiresAt);
         if (this.subscribedChannels.size > 0) {
@@ -665,12 +757,13 @@ export class ActaWsClient extends TypedEventEmitter {
         }
     }
     handleAuthError(reason, message) {
-        this.emit("authError", reason);
+        this.emit("authError", reason, message);
         if (reason === "session_expired" &&
             this.authRequested &&
             this.authProvider &&
-            this.pendingResumeSessionId) {
+            (this.pendingResumeSessionId || this.lastAuthSessionId)) {
             this.pendingResumeSessionId = null;
+            this.lastAuthSessionId = null;
             this.startAuthSent = false;
             void this.sendStartAuth().catch((err) => {
                 this.emit("error", err);
@@ -786,6 +879,9 @@ export class ActaWsClient extends TypedEventEmitter {
             this.log("Cannot send, WebSocket not open");
         }
     }
+    nextRequestId() {
+        return generateRequestId();
+    }
     ensureAuthenticated() {
         if (this.connectionState !== "authenticated") {
             throw new Error("Client is not authenticated");
@@ -880,7 +976,6 @@ export class ActaWsClient extends TypedEventEmitter {
         this.helloSent = false;
         this.welcomeReceived = false;
         this.startAuthSent = false;
-        this.pendingResumeSessionId = null;
         this.pendingMessages = [];
         this.setConnectionState("disconnected");
     }