@n1xyz/nord-ts 0.4.3 → 0.5.1

package/dist/actions.d.ts

@@ -2,7 +2,7 @@ import Decimal from "decimal.js";
 import * as proto from "./gen/nord_pb";
 import { paths } from "./gen/openapi";
 import { Client } from "openapi-fetch";
-import { FillMode, Side } from "./types";
+import { FillMode, Side, TriggerKind } from "./types";
 import { BigIntValue } from "./utils";
 import { PublicKey, Transaction } from "@solana/web3.js";
 type ReceiptKind = NonNullable<proto.Receipt["kind"]>;
@@ -13,6 +13,7 @@ export declare function formatReceiptError(receipt: proto.Receipt): string;
 export declare function expectReceiptKind<K extends ReceiptKind["case"]>(receipt: proto.Receipt, expected: K, action: string): asserts receipt is proto.Receipt & {
     kind: ExtractReceiptKind<K>;
 };
+export declare function buildLimits(marketPriceDecimals: number, marketSizeDecimals: number, limitPrice?: Decimal.Value, limitBaseSize?: Decimal.Value, limitQuoteSize?: Decimal.Value): proto.OrderLimit | undefined;
 export declare function createAction(currentTimestamp: bigint, nonce: number, kind: proto.Action["kind"]): proto.Action;
 export declare function sendAction(client: Client<paths>, makeSignedMessage: (message: Uint8Array) => Promise<Uint8Array>, action: proto.Action): Promise<proto.Receipt>;
 export declare function prepareAction(action: proto.Action, makeSignedMessage: (message: Uint8Array) => Promise<Uint8Array>): Promise<Uint8Array<ArrayBufferLike>>;
@@ -53,12 +54,42 @@ export type AtomicSubaction = {
     price?: Decimal.Value;
     quoteSize?: Decimal.Value;
     clientOrderId?: BigIntValue;
+    delegatorAccountId?: number;
 } | {
     kind: "cancel";
     orderId: BigIntValue;
+    delegatorAccountId?: number;
 } | {
     kind: "cancelByClientId";
     clientOrderId: BigIntValue;
+    delegatorAccountId?: number;
+} | {
+    kind: "addTrigger";
+    marketId: number;
+    side: Side;
+    triggerKind: TriggerKind;
+    triggerPrice: Decimal.Value;
+    priceDecimals: number;
+    sizeDecimals: number;
+    limitPrice?: Decimal.Value;
+    limitBaseSize?: Decimal.Value;
+    limitQuoteSize?: Decimal.Value;
+} | {
+    kind: "editTrigger";
+    triggerId: BigIntValue;
+    marketId: number;
+    side: Side;
+    triggerKind: TriggerKind;
+    triggerPrice: Decimal.Value;
+    priceDecimals: number;
+    sizeDecimals: number;
+    limitPrice?: Decimal.Value;
+    limitBaseSize?: Decimal.Value;
+    limitQuoteSize?: Decimal.Value;
+} | {
+    kind: "removeTrigger";
+    marketId: number;
+    triggerId: BigIntValue;
 };
 export declare function atomic(client: Client<paths>, signFn: (message: Uint8Array) => Promise<Uint8Array>, currentTimestamp: bigint, nonce: number, params: {
     sessionId: BigIntValue;

package/dist/client/Nord.d.ts

@@ -3,7 +3,7 @@ import { Connection, PublicKey } from "@solana/web3.js";
 import { EventEmitter } from "events";
 import { Client } from "openapi-fetch";
 import type { paths } from "../gen/openapi.ts";
-import { Account, AccountPnlInfoPage, AccountPnlSummaryResult, GetAccountPnlQuery, PagedQuery, ActionResponse, MarketsInfo, Market, MarketStats, NordConfig, OrderbookQuery, OrderbookResponse, FeeTierConfig, Token, TradesResponse, User, AccountTriggerInfo, TriggerHistoryPage, WithdrawalHistoryPage, FeeTierId, AccountFeeTierPage, PageResultStringOrderInfo, PageResultStringTrade, OrderInfoFromApi, TokenStats, FillRole, AdminInfo, AccountVolumeInfo, GetAccountVolumeQuery, CandleResolution, TakeAllInfo } from "../types";
+import { Account, AccountPnlInfoPage, AccountPositionInfoPage, AccountPnlSummaryResult, AtomicActionId, GetAccountPnlQuery, PagedQuery, ActionResponse, MarketsInfo, Market, MarketStats, NordConfig, OrderbookQuery, OrderbookResponse, FeeTierConfig, Token, TradesResponse, User, AccountTriggerInfo, TriggerPlaceHistoryPage, TriggerFinaliseHistoryPage, WithdrawalHistoryPage, FeeTierId, AccountFeeTierPage, PageResultStringOrderInfo, PageResultStringTrade, OrderInfoFromApi, TokenStats, FillRole, AdminInfo, AccountVolumeInfo, GetAccountVolumeQuery, CandleResolution, TakeAllInfo, MarketsLiveInfo, MarketLiveInfo } from "../types";
 import { NordWebSocketClient } from "../websocket/index";
 import { OrderbookSubscription, TradeSubscription, CandleSubscription } from "../websocket/Subscriber";
 /**
@@ -202,11 +202,12 @@ export declare class Nord {
      * @param pageSize - Maximum number of trades to return
      * @param since - RFC3339 timestamp to start from (inclusive)
      * @param until - RFC3339 timestamp to end at (exclusive)
-     * @param pageId - Pagination cursor returned from a prior call
+     * @param startInclusive - Pagination cursor returned from a prior call. Interpreted as a trade ID by default, or an action ID when paginationMode is "actionId".
+     * @param paginationMode - Selects whether pagination cursors are trade IDs or action IDs
      * @returns Trades response
      * @throws {NordError} If the request fails
      */
-    getTrades({ marketId, takerId, makerId, takerSide, pageSize, since, until, startInclusive, }: Readonly<{
+    getTrades({ marketId, takerId, makerId, takerSide, pageSize, since, until, startInclusive, paginationMode, }: Readonly<{
         marketId?: number;
         takerId?: number;
         makerId?: number;
@@ -215,6 +216,7 @@ export declare class Nord {
         since?: string;
         until?: string;
         startInclusive?: number;
+        paginationMode?: "tradeId" | "actionId";
     }>): Promise<TradesResponse>;
     /**
      * Get user account IDs
@@ -330,15 +332,26 @@ export declare class Nord {
      * @returns Per-market pnl totals for the requested window
      * @throws {NordError} If the request fails
      */
-    getAccountPnlSummary(accountId: number, { since, until, marketId }?: Readonly<Partial<GetAccountPnlQuery>>): Promise<AccountPnlSummaryResult>;
     /**
-     * Get market statistics (alias for marketsStats for backward compatibility)
-     *
-     *
-     * @param marketId - Market identifier
+     * Fetch full history of position updates for an account.
      *
-     * @returns Market statistics response
+     * @param accountId - Account ID to query
+     * @param since - RFC3339 timestamp to start from (inclusive)
+     * @param until - RFC3339 timestamp to end at (inclusive)
+     * @param marketId - Optional market identifier to scope the totals
+     * @param pageSize - Maximum number of entries to return
+     * @param startInclusive - Pagination cursor to resume from
+     * @returns History of position updates
+     * @throws {NordError} If the request fails
      */
+    getAccountPositionHistory(accountId: number, { since, until, marketId, pageSize, startInclusive, }?: Readonly<Partial<GetAccountPnlQuery & Omit<PagedQuery, "startInclusive">> & {
+        startInclusive?: string;
+    }>): Promise<AccountPositionInfoPage>;
+    getAccountPnlSummary(accountId: number, { since, until, marketId }?: Readonly<Partial<GetAccountPnlQuery>>): Promise<AccountPnlSummaryResult>;
+    getMarketsLive(): Promise<MarketsLiveInfo>;
+    getMarketLive({ marketId, }: Readonly<{
+        marketId: number;
+    }>): Promise<MarketLiveInfo>;
     getMarketStats({ marketId, }: Readonly<{
         marketId: number;
     }>): Promise<MarketStats>;
@@ -403,7 +416,21 @@ export declare class Nord {
         accountId?: number;
     }>): Promise<AccountTriggerInfo[]>;
     /**
-     * Fetch trigger history for an account.
+     * Fetch trigger placement history for an account.
+     *
+     * @param accountId - Account identifier owning the triggers
+     * @param since - RFC3339 timestamp to start from (inclusive)
+     * @param until - RFC3339 timestamp to end at (exclusive)
+     * @param pageSize - Maximum number of entries to return
+     * @param startInclusive - Pagination cursor to resume from
+     * @throws {NordError} If no account can be resolved or the request fails.
+     */
+    getAccountTriggerPlaceHistory({ accountId, since, until, pageSize, startInclusive, }: Readonly<Omit<PagedQuery, "startInclusive"> & {
+        accountId?: number;
+        startInclusive?: AtomicActionId;
+    }>): Promise<TriggerPlaceHistoryPage>;
+    /**
+     * Fetch trigger finalisation history for an account.
      *
      * @param accountId - Account identifier owning the triggers
      * @param since - RFC3339 timestamp to start from (inclusive)
@@ -412,9 +439,9 @@ export declare class Nord {
      * @param startInclusive - Pagination cursor to resume from
      * @throws {NordError} If no account can be resolved or the request fails.
      */
-    getAccountTriggerHistory({ accountId, since, until, pageSize, startInclusive, }: Readonly<PagedQuery & {
+    getAccountTriggerFinaliseHistory({ accountId, since, until, pageSize, startInclusive, }: Readonly<PagedQuery & {
         accountId?: number;
-    }>): Promise<TriggerHistoryPage>;
+    }>): Promise<TriggerFinaliseHistoryPage>;
     /**
      * Fetch withdrawal history for an account.
      *

package/dist/client/NordUser.d.ts

@@ -1,34 +1,52 @@
 import { PublicKey, Transaction, SendOptions } from "@solana/web3.js";
 import Decimal from "decimal.js";
-import { FillMode, Side, SPLTokenInfo, TriggerKind } from "../types";
+import { FillMode, Side, SPLTokenInfo, TriggerKind, SelfTradePrevention } from "../types";
 import * as proto from "../gen/nord_pb";
 import { BigIntValue } from "../utils";
 import { Nord } from "./Nord";
-/**
- * Parameters for individual atomic subactions (user-friendly version)
- */
-export interface UserAtomicSubaction {
-    /** The type of action to perform. */
-    kind: "place" | "cancel" | "cancelByClientId";
-    /** The market ID to place the order in. */
-    marketId?: number;
-    /** The order ID to cancel. */
-    orderId?: BigIntValue;
-    /** Order side (bid or ask) */
-    side?: Side;
-    /** Fill mode (limit, market, etc.) */
-    fillMode?: FillMode;
-    /** Whether the order is reduce-only. */
-    isReduceOnly?: boolean;
-    /** The size of the order. */
+export type UserAtomicSubaction = {
+    kind: "place";
+    marketId: number;
+    side: Side;
+    fillMode: FillMode;
+    isReduceOnly: boolean;
     size?: Decimal.Value;
-    /** Order price */
     price?: Decimal.Value;
-    /** Quote size in `base_decimals` + `price_decimals` (for market-style placement) */
     quoteSize?: Decimal.Value;
-    /** The client order ID of the order. */
     clientOrderId?: BigIntValue;
-}
+    delegatorAccountId?: number;
+} | {
+    kind: "cancel";
+    orderId: BigIntValue;
+    delegatorAccountId?: number;
+} | {
+    kind: "cancelByClientId";
+    clientOrderId: BigIntValue;
+    delegatorAccountId?: number;
+} | {
+    kind: "addTrigger";
+    marketId: number;
+    side: Side;
+    triggerKind: TriggerKind;
+    triggerPrice: Decimal.Value;
+    limitPrice?: Decimal.Value;
+    limitBaseSize?: Decimal.Value;
+    limitQuoteSize?: Decimal.Value;
+} | {
+    kind: "editTrigger";
+    triggerId: BigIntValue;
+    marketId: number;
+    side: Side;
+    triggerKind: TriggerKind;
+    triggerPrice: Decimal.Value;
+    limitPrice?: Decimal.Value;
+    limitBaseSize?: Decimal.Value;
+    limitQuoteSize?: Decimal.Value;
+} | {
+    kind: "removeTrigger";
+    marketId: number;
+    triggerId: BigIntValue;
+};
 export interface NormalizedReceiptTrade {
     orderId: bigint;
     price: number;
@@ -259,7 +277,7 @@ export declare class NordUser {
      * @returns Object containing actionId, orderId (if posted), fills, and reducedOrders (reduce-only orders fully or partially cancelled by maintenance)
      * @throws {NordError} If the operation fails
      */
-    placeOrder({ marketId, side, fillMode, isReduceOnly, size, price, quoteSize, accountId, clientOrderId, }: Readonly<{
+    placeOrder({ marketId, side, fillMode, isReduceOnly, size, price, quoteSize, selfTradePrevention, accountId, clientOrderId, }: Readonly<{
         marketId: number;
         side: Side;
         fillMode: FillMode;
@@ -267,6 +285,7 @@ export declare class NordUser {
         size?: Decimal.Value;
         price?: Decimal.Value;
         quoteSize?: Decimal.Value;
+        selfTradePrevention?: SelfTradePrevention;
         accountId?: number;
         clientOrderId?: BigIntValue;
     }>): Promise<{
@@ -279,6 +298,12 @@ export declare class NordUser {
             cancelledSize: number;
             price: number;
         }[];
+        selfTradeCancels: {
+            orderId: bigint;
+            remainingSize: number;
+            cancelledSize: number;
+            price: number;
+        }[];
     }>;
     /**
      * Cancel an order
@@ -328,8 +353,8 @@ export declare class NordUser {
      * @returns Object containing the actionId of the submitted trigger
      * @throws {NordError} If the operation fails
      *
-     * Trigger identity is exact: (marketId, side, kind, triggerPrice, limits).
-     * If you add multiple triggers at the same triggerPrice, they must differ by limits.
+     * Trigger identity is a unique triggerId assigned by engine.
+     * Multiple triggers can share the same triggerPrice and limits.
      * If both `limitBaseSize` and `limitQuoteSize` are omitted, trigger executes with max reduce size
      *
      * Max triggers per position: 16
@@ -345,27 +370,41 @@ export declare class NordUser {
         accountId?: number;
     }>): Promise<{
         actionId: bigint;
+        triggerId: bigint;
     }>;
     /**
      * Remove a trigger for the current session
      *
      * @param marketId - Market the trigger belongs to
-     * @param side - Order side for the trigger
-     * @param kind - Stop-loss or take-profit trigger type
-     * @param triggerPrice - Trigger price of the trigger to remove
-     * @param limitPrice - Optional limit price of the trigger to remove
-     * @param limitBaseSize - Optional base size limit of the trigger to remove
-     * @param limitQuoteSize - Optional quote size limit of the trigger to remove
+     * @param triggerId - Unique trigger identifier to remove
      * @param accountId - Account executing the trigger
      * @returns Object containing the actionId of the removal action
      * @throws {NordError} If the operation fails
+     */
+    removeTrigger({ marketId, triggerId, accountId, }: Readonly<{
+        marketId: number;
+        triggerId: bigint;
+        accountId?: number;
+    }>): Promise<{
+        actionId: bigint;
+    }>;
+    /**
+     * Edit an existing trigger for the current session
      *
-     * Removal is exact-match by (marketId, side, kind, triggerPrice, limits).
-     * If the trigger was created with any limits, pass the same limit fields here.
-     * If trigger size limits were omitted (`NULL`) on add, keep `limitBaseSize` and `limitQuoteSize`
-     * omitted here as well.
+     * @param triggerId - Unique trigger identifier to edit
+     * @param marketId - Market to watch
+     * @param side - Order side for the trigger
+     * @param kind - Stop-loss or take-profit trigger type
+     * @param triggerPrice - Price that activates the trigger
+     * @param limitPrice - Optional limit price used once the trigger fires
+     * @param limitBaseSize - Optional base size limit used once the trigger fires
+     * @param limitQuoteSize - Optional quote size limit used once the trigger fires
+     * @param accountId - Account executing the trigger
+     * @returns Object containing the actionId of the edit action
+     * @throws {NordError} If the operation fails
      */
-    removeTrigger({ marketId, side, kind, triggerPrice, limitPrice, limitBaseSize, limitQuoteSize, accountId, }: Readonly<{
+    editTrigger({ triggerId, marketId, side, kind, triggerPrice, limitPrice, limitBaseSize, limitQuoteSize, accountId, }: Readonly<{
+        triggerId: bigint;
         marketId: number;
         side: Side;
         kind: TriggerKind;
@@ -424,13 +463,25 @@ export declare class NordUser {
      */
     private transferToAccount;
     /**
-     * Execute up to four place/cancel operations atomically.
-     * Per Market:
-     * 1. cancels can only be in the start (one cannot predict future order ids)
+     * Execute up to ten supported subactions atomically.
+     *
+     * Supported subactions:
+     * - place
+     * - cancel
+     * - cancelByClientId
+     * - addTrigger
+     * - editTrigger
+     * - removeTrigger
+     *
+     * Per market, market-scoped subactions are phase-validated:
+     * 1. cancels and trigger removals can only be at the start
      * 2. intermediate trades can trade only
-     * 3. placements go last
+     * 3. placements and trigger adds/edits go last
+     *
+     * Across markets, market-scoped subactions can be in any order.
      *
-     * Across Markets, order action can be any
+     * Trigger subactions are account-scoped. In one atomic sequence, the same
+     * trigger target cannot be added, edited, or removed more than once.
      *
      * @param userActions array of user-friendly subactions
      * @param providedAccountId optional account performing the action (defaults to first account)
@@ -473,6 +524,4 @@ export declare class NordUser {
         };
     }>;
     protected submitSignedAction(kind: proto.Action["kind"], makeSignedMessage: (message: Uint8Array) => Promise<Uint8Array>): Promise<proto.Receipt>;
-    private buildTriggerKey;
-    private buildLimits;
 }