@n1xyz/nord-ts 0.1.12 → 0.2.0

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, AccountPnlPage, 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, PreviousMarketPrice } from "../types";
+import { Account, AccountPnlInfoPage, 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, PreviousMarketPrice } from "../types";
 import { NordWebSocketClient } from "../websocket/index";
 import { OrderbookSubscription, TradeSubscription } from "../websocket/Subscriber";
 /**
@@ -302,7 +302,7 @@ export declare class Nord {
      * @returns Page of PnL entries ordered from latest to oldest
      * @throws {NordError} If the request fails
      */
-    getAccountPnl(accountId: number, { since, until, startInclusive, pageSize, }?: Readonly<Partial<PagedQuery>>): Promise<AccountPnlPage>;
+    getAccountPnl(accountId: number, { since, until, startInclusive, pageSize, }?: Readonly<Partial<PagedQuery>>): Promise<AccountPnlInfoPage>;
     /**
      * Get market statistics (alias for marketsStats for backward compatibility)
      *

package/dist/client/Nord.js

@@ -265,7 +265,7 @@ export class Nord {
             deltas: [symbol],
         });
         const handleDelta = (update) => {
-            if (update.symbol !== symbol) {
+            if (update.market_symbol !== symbol) {
                 return;
             }
             subscription.emit("message", update);

package/dist/client/NordUser.d.ts

@@ -50,6 +50,17 @@ export declare class NordUser {
             symbol: string;
         }[];
     };
+    orders: {
+        [key: string]: {
+            orderId: string;
+            marketId: number;
+            side: "ask" | "bid";
+            size: number;
+            price: number;
+            originalOrderSize: number;
+            clientOrderId: number | null;
+        }[];
+    };
     /** User positions by account ID */
     positions: {
         [key: string]: {

package/dist/client/NordUser.js

@@ -4,7 +4,7 @@ import * as ed from "@noble/ed25519";
 import { floatToScaledBigIntLossy } from "@n1xyz/proton";
 import { Side, TriggerKind, fillModeToProtoFillMode, } from "../types";
 import * as proto from "../gen/nord_pb";
-import { checkedFetch, assert, findMarket, findToken, optExpect, keypairFromPrivateKey, toScaledU64, } from "../utils";
+import { assert, findMarket, findToken, optExpect, keypairFromPrivateKey, toScaledU64, } from "../utils";
 import { create } from "@bufbuild/protobuf";
 import { createSession, revokeSession, atomic, expectReceiptKind, createAction, sendAction, } from "../actions";
 import { NordError } from "../error";
@@ -23,6 +23,7 @@ export class NordUser {
     nonce = 0;
     /** User balances by token symbol */
     balances = {};
+    orders = {};
     /** User positions by account ID */
     positions = {};
     /** User margins by account ID */
@@ -93,10 +94,10 @@ export class NordUser {
                     return tx;
                 },
                 signMessageFn: async (xs) => {
-                    return ed.sign(xs, wallet.secretKey);
+                    return await ed.signAsync(xs, wallet.secretKey.slice(0, 32));
                 },
                 signSessionFn: async (xs) => {
-                    return ed.sign(xs, sessionKey.secretKey);
+                    return await ed.signAsync(xs, sessionKey.secretKey.slice(0, 32));
                 },
             });
         }
@@ -244,8 +245,7 @@ export class NordUser {
     async fetchInfo() {
         if (this.accountIds !== undefined) {
             const accountsData = await Promise.all(this.accountIds.map(async (accountId) => {
-                const response = await checkedFetch(`${this.nord.webServerUrl}/account/${accountId}`);
-                const accountData = (await response.json());
+                const accountData = await this.nord.getAccount(accountId);
                 // Ensure we have the correct accountId
                 return {
                     ...accountData,
@@ -253,6 +253,15 @@ export class NordUser {
                 };
             }));
             for (const accountData of accountsData) {
+                this.orders[accountData.accountId] = accountData.orders.map((o) => ({
+                    orderId: o.orderId,
+                    marketId: o.marketId,
+                    side: o.side,
+                    size: o.size,
+                    price: o.price,
+                    originalOrderSize: o.originalOrderSize,
+                    clientOrderId: o.clientOrderId ?? null,
+                }));
                 // Process balances
                 this.balances[accountData.accountId] = [];
                 for (const balance of accountData.balances) {
@@ -263,7 +272,12 @@ export class NordUser {
                     });
                 }
                 // Process positions
-                this.positions[accountData.accountId] = accountData.positions;
+                this.positions[accountData.accountId] = accountData.positions.map((p) => ({
+                    marketId: p.marketId,
+                    openOrders: p.openOrders,
+                    actionId: p.actionId,
+                    ...(p.perp != null ? { perp: p.perp } : {}),
+                }));
                 // Process margins
                 this.margins[accountData.accountId] = accountData.margins;
             }

package/dist/gen/nord_pb.d.ts

@@ -4238,6 +4238,9 @@ export declare enum Error {
     POSITION_STATE_ORDER_SIDE = 205,
     /**
      * 1100_1110
+     * Maximuma size of single position exceeded.
+     * See `POSITION_SIZE_LIMIT` constant default limit for exacat value and
+     * details.
      *
      * @generated from enum value: POSITION_SIZE_LIMIT = 206;
      */
@@ -4270,6 +4273,9 @@ export declare enum Error {
     SIGNATURE_VERIFICATION_INVALID_LENGTH = 219,
     /**
      * 11011_000
+     * Error prefix which indicates that some actions cannot to be executed,
+     * if they move account into unhealthy(liquidatable) state
+     * or if liquidaiton handling action as parameterized cannot be executed
      *
      * @generated from enum value: RISK = 224;
      */
@@ -4287,6 +4293,8 @@ export declare enum Error {
      */
     RISK_OMF_LESS_THAN_OR_EQUAL_CMF = 227,
     /**
+     * See `OMF < CMF` rule in MARKETS.md.
+     *
      * @generated from enum value: RISK_TRADE_OMF_LESS_THAN_OR_EQUAL_CMF = 229;
      */
     RISK_TRADE_OMF_LESS_THAN_OR_EQUAL_CMF = 229,

package/dist/gen/nord_pb.js

@@ -873,6 +873,9 @@ export var Error;
     Error[Error["POSITION_STATE_ORDER_SIDE"] = 205] = "POSITION_STATE_ORDER_SIDE";
     /**
      * 1100_1110
+     * Maximuma size of single position exceeded.
+     * See `POSITION_SIZE_LIMIT` constant default limit for exacat value and
+     * details.
      *
      * @generated from enum value: POSITION_SIZE_LIMIT = 206;
      */
@@ -905,6 +908,9 @@ export var Error;
     Error[Error["SIGNATURE_VERIFICATION_INVALID_LENGTH"] = 219] = "SIGNATURE_VERIFICATION_INVALID_LENGTH";
     /**
      * 11011_000
+     * Error prefix which indicates that some actions cannot to be executed,
+     * if they move account into unhealthy(liquidatable) state
+     * or if liquidaiton handling action as parameterized cannot be executed
      *
      * @generated from enum value: RISK = 224;
      */
@@ -922,6 +928,8 @@ export var Error;
      */
     Error[Error["RISK_OMF_LESS_THAN_OR_EQUAL_CMF"] = 227] = "RISK_OMF_LESS_THAN_OR_EQUAL_CMF";
     /**
+     * See `OMF < CMF` rule in MARKETS.md.
+     *
      * @generated from enum value: RISK_TRADE_OMF_LESS_THAN_OR_EQUAL_CMF = 229;
      */
     Error[Error["RISK_TRADE_OMF_LESS_THAN_OR_EQUAL_CMF"] = 229] = "RISK_TRADE_OMF_LESS_THAN_OR_EQUAL_CMF";

package/dist/gen/openapi.d.ts

@@ -725,7 +725,44 @@ export interface paths {
                         [name: string]: unknown;
                     };
                     content: {
-                        "application/json": components["schemas"]["PageResult_for_uint64_and_AccountPnl"];
+                        "application/json": components["schemas"]["PageResult_for_uint64_and_AccountPnlInfo"];
+                    };
+                };
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/account/{account_id}/pnl/history/PT1H": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Account for which to retrieve PnL history */
+                    account_id: number;
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["AccountPnlHistInfo"][];
                     };
                 };
             };
@@ -2656,24 +2693,62 @@ export interface components {
              */
             pageSize: number | null;
         };
-        PageResult_for_uint64_and_AccountPnl: {
+        PageResult_for_uint64_and_AccountPnlInfo: {
             /** @description Set of items for requested by query. */
-            items: components["schemas"]["AccountPnl"][];
+            items: components["schemas"]["AccountPnlInfo"][];
             /**
              * Format: uint64
              * @description If request contains more data, this is the id is set with which next request should be performed to get next page. If no more data, then it is undefined.
              */
             nextStartInclusive?: number | null;
         };
-        AccountPnl: {
+        AccountPnlInfo: {
             time: string;
             /** Format: uint64 */
             actionId: number;
             /** Format: uint32 */
             accountId: number;
             /** Format: double */
+            pricePnlDelta: number;
+            /** Format: double */
+            fundingPnlDelta: number;
+            /**
+             * Format: double
+             * @description Total PnL update
+             */
             pnl: number;
         };
+        AccountPnlHistInfo: {
+            /** @description Same time when funding is applied */
+            time: string;
+            /** Format: double */
+            fundingPnl: number;
+            /**
+             * Format: double
+             * @description in USDC, PnL from position price and price and trade price difference
+             */
+            tradedPnl: number;
+            /**
+             * Format: double
+             * @description Funding rate used to calculate this funding payment
+             */
+            fundingRate: number;
+            /**
+             * Format: double
+             * @description Size used to calculated funding payment
+             */
+            fundingSize: number;
+            /** @description Side on time of funding application. */
+            side?: components["schemas"]["Side"] | null;
+            /** Format: double */
+            positionSizeTraded: number;
+            market: components["schemas"]["MarketIdInfo"];
+        };
+        MarketIdInfo: {
+            /** Format: uint32 */
+            market_id: number;
+            market_symbol: string;
+        };
         PageResult_for_uint64_and_Trigger: {
             /** @description Set of items for requested by query. */
             items: components["schemas"]["Trigger"][];

package/dist/types.d.ts

@@ -60,8 +60,8 @@ export type FillModeFromApi = components["schemas"]["FillMode"];
 export type PlacementOrigin = components["schemas"]["PlacementOrigin"];
 export type FinalizationReason = components["schemas"]["FinalizationReason"];
 export type PagedQuery = components["schemas"]["PagedQuery"];
-export type AccountPnl = components["schemas"]["AccountPnl"];
-export type AccountPnlPage = components["schemas"]["PageResult_for_uint64_and_AccountPnl"];
+export type AccountPnlInfo = components["schemas"]["AccountPnlInfo"];
+export type AccountPnlInfoPage = components["schemas"]["PageResult_for_uint64_and_AccountPnlInfo"];
 export type AccountTriggerInfo = components["schemas"]["AccountTriggerInfo"];
 export type TriggerHistoryPage = components["schemas"]["PageResult_for_uint64_and_Trigger"];
 export type WithdrawalHistoryPage = components["schemas"]["PageResult_for_uint64_and_Withdrawal"];
@@ -217,16 +217,27 @@ export interface WebSocketDeltaUpdate {
     bids: OrderbookEntry[];
     timestamp: number;
 }
-/**
- * WebSocket user update message
- */
 export interface WebSocketAccountUpdate {
-    e: WebSocketMessageType.AccountUpdate;
-    accountId: number;
-    account: Account;
-    timestamp: number;
+    last_update_id: number;
+    update_id: number;
+    account_id: number;
+    fills: Record<string, unknown>;
+    places: Record<string, unknown>;
+    cancels: Record<string, {
+        side: "bid" | "ask";
+        current_size: number;
+        price: number;
+        market_id: number;
+    }>;
+    balances: Record<string, unknown>;
 }
-export type WebSocketMessage = WebSocketTradeUpdate | WebSocketDeltaUpdate | WebSocketAccountUpdate;
+export type WebSocketMessage = {
+    trades: WebSocketTradeUpdate;
+} | {
+    delta: WebSocketDeltaUpdate;
+} | {
+    account: WebSocketAccountUpdate;
+};
 export interface SPLTokenInfo {
     mint: string;
     precision: number;

package/dist/websocket/NordWebSocketClient.js

@@ -212,15 +212,15 @@ export class NordWebSocketClient extends EventEmitter {
         }
         const hasOwn = (k) => Object.prototype.hasOwnProperty.call(message, k);
         if (hasOwn("trades")) {
-            this.emit("trades", message);
+            this.emit("trades", message.trades);
             return;
         }
         if (hasOwn("delta")) {
-            this.emit("delta", message);
+            this.emit("delta", message.delta);
             return;
         }
         if (hasOwn("account")) {
-            this.emit("account", message);
+            this.emit("account", message.account);
             return;
         }
         this.emit("error", new Error(`Unexpected message type: ${message}`));

package/dist/websocket/Subscriber.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from "events";
-import { Account, DeltaEvent, OrderbookResponse, SubscriberConfig, StreamTrade, Trades } from "../types";
+import { Account, DeltaEvent, WebSocketDeltaUpdate, SubscriberConfig, StreamTrade, Trades } from "../types";
 /**
  * Subscriber class for handling WebSocket subscriptions
  */
@@ -21,7 +21,7 @@ export declare class Subscriber {
  * Interface for orderbook subscription
  */
 export interface OrderbookSubscription extends EventEmitter {
-    on(event: "message", listener: (data: OrderbookResponse) => void): this;
+    on(event: "message", listener: (data: WebSocketDeltaUpdate) => void): this;
     on(event: "error", listener: (error: Error) => void): this;
     close(): void;
     removeAllListeners(event?: string): this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n1xyz/nord-ts",
-  "version": "0.1.12",
+  "version": "0.2.0",
   "description": "Typescript for Nord",
   "keywords": [],
   "author": "",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bufbuild/protobuf": "^2.6.3",
-    "@n1xyz/proton": "0.0.7",
+    "@n1xyz/proton": "0.1.0",
     "@noble/curves": "^1.9.6",
     "@noble/ed25519": "^2.3.0",
     "@noble/hashes": "^1.8.0",