@n1xyz/nord-ts 0.1.3 → 0.1.5

package/dist/nord/client/NordUser.js

@@ -40,14 +40,17 @@ const ed = __importStar(require("@noble/ed25519"));
 const sha512_1 = require("@noble/hashes/sha512");
 ed.etc.sha512Sync = sha512_1.sha512;
 const proton_1 = require("@n1xyz/proton");
+const types_1 = require("../../types");
+const proto = __importStar(require("../../gen/nord_pb"));
 const utils_1 = require("../../utils");
+const protobuf_1 = require("@bufbuild/protobuf");
 const actions_1 = require("../api/actions");
-const triggers_1 = require("../api/triggers");
 const NordError_1 = require("../utils/NordError");
+const NordClient_1 = require("./NordClient");
 /**
  * User class for interacting with the Nord protocol
  */
-class NordUser {
+class NordUser extends NordClient_1.NordClient {
     /**
      * Create a new NordUser instance
      *
@@ -55,18 +58,6 @@ class NordUser {
      * @throws {NordError} If required parameters are missing
      */
     constructor({ address, nord, publicKey, sessionPubKey, sessionSignFn, transactionSignFn, walletSignFn, connection, sessionId, }) {
-        /** User balances by token symbol */
-        this.balances = {};
-        /** User positions by account ID */
-        this.positions = {};
-        /** User margins by account ID */
-        this.margins = {};
-        /** Last timestamp used */
-        this.lastTs = 0;
-        /** Last nonce used */
-        this.lastNonce = 0;
-        /** SPL token information */
-        this.splTokenInfos = [];
         if (!walletSignFn) {
             throw new NordError_1.NordError("Wallet sign function is required");
         }
@@ -76,27 +67,32 @@ class NordUser {
         if (!sessionPubKey) {
             throw new NordError_1.NordError("Session public key is required");
         }
+        let parsedAddress;
         try {
-            this.address = new web3_js_1.PublicKey(address);
+            parsedAddress = new web3_js_1.PublicKey(address);
         }
         catch (error) {
             throw new NordError_1.NordError("Invalid Solana address", { cause: error });
         }
-        this.nord = nord;
-        this.walletSignFn = walletSignFn;
-        this.sessionSignFn = sessionSignFn;
-        this.transactionSignFn = transactionSignFn;
-        this.sessionPubKey = sessionPubKey;
-        this.publicKey = publicKey;
-        this.connection =
-            connection ||
-                new web3_js_1.Connection(nord.solanaUrl, {
-                    commitment: "confirmed",
-                });
-        // Set sessionId if provided
-        if (sessionId !== undefined) {
-            this.sessionId = sessionId;
-        }
+        super({
+            nord,
+            address: parsedAddress,
+            walletSignFn,
+            sessionSignFn,
+            transactionSignFn,
+            connection,
+            sessionId,
+            sessionPubKey,
+            publicKey,
+        });
+        /** User balances by token symbol */
+        this.balances = {};
+        /** User positions by account ID */
+        this.positions = {};
+        /** User margins by account ID */
+        this.margins = {};
+        /** SPL token information */
+        this.splTokenInfos = [];
         // Convert tokens from info endpoint to SPLTokenInfo
         if (this.nord.tokens && this.nord.tokens.length > 0) {
             this.splTokenInfos = this.nord.tokens.map((token) => ({
@@ -120,19 +116,17 @@ class NordUser {
             sessionSignFn: this.sessionSignFn,
             transactionSignFn: this.transactionSignFn,
             connection: this.connection,
-            sessionPubKey: this.sessionPubKey,
+            sessionPubKey: new Uint8Array(this.sessionPubKey),
             publicKey: this.publicKey,
+            sessionId: this.sessionId,
         });
         // Copy other properties
         cloned.balances = { ...this.balances };
         cloned.positions = { ...this.positions };
         cloned.margins = { ...this.margins };
         cloned.accountIds = this.accountIds ? [...this.accountIds] : undefined;
-        cloned.sessionId = this.sessionId;
-        cloned.publicKey = this.publicKey;
-        cloned.lastTs = this.lastTs;
-        cloned.lastNonce = this.lastNonce;
         cloned.splTokenInfos = [...this.splTokenInfos];
+        this.cloneClientState(cloned);
         return cloned;
     }
     /**
@@ -225,7 +219,7 @@ class NordUser {
         }
     }
     /**
-     * Deposit SPL tokens to the bridge
+     * Deposit SPL tokens to the app
      *
      * @param amount - Amount to deposit
      * @param tokenId - Token ID
@@ -238,7 +232,7 @@ class NordUser {
         return this.deposit({ amount, tokenId, recipient });
     }
     /**
-     * Deposit SPL tokens to the bridge
+     * Deposit SPL tokens to the app
      *
      * @param amount - Amount to deposit
      * @param tokenId - Token ID
@@ -284,7 +278,16 @@ class NordUser {
      * @returns Nonce as number
      */
     getNonce() {
-        return ++this.lastNonce;
+        return this.nextActionNonce();
+    }
+    async submitSessionAction(kind) {
+        return this.submitSignedAction(kind, async (message) => {
+            const signature = await this.sessionSignFn(message);
+            const signed = new Uint8Array(message.length + signature.length);
+            signed.set(message);
+            signed.set(signature, message.length);
+            return signed;
+        });
     }
     /**
      * Update account IDs for this user
@@ -391,13 +394,21 @@ class NordUser {
     async withdraw({ amount, tokenId, }) {
         try {
             this.checkSessionValidity();
-            const { actionId } = await (0, actions_1.withdraw)(this.nord.webServerUrl, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-                sizeDecimals: (0, utils_1.findToken)(this.nord.tokens, tokenId).decimals,
-                sessionId: (0, utils_1.optExpect)(this.sessionId, "No session"),
-                tokenId: tokenId,
-                amount,
+            const token = (0, utils_1.findToken)(this.nord.tokens, tokenId);
+            const scaledAmount = (0, utils_1.toScaledU64)(amount, token.decimals);
+            if (scaledAmount <= 0n) {
+                throw new NordError_1.NordError("Withdraw amount must be positive");
+            }
+            const receipt = await this.submitSessionAction({
+                case: "withdraw",
+                value: (0, protobuf_1.create)(proto.Action_WithdrawSchema, {
+                    sessionId: BigInt((0, utils_1.optExpect)(this.sessionId, "No session")),
+                    tokenId,
+                    amount: scaledAmount,
+                }),
             });
-            return { actionId };
+            (0, actions_1.expectReceiptKind)(receipt, "withdrawResult", "withdraw");
+            return { actionId: receipt.actionId };
         }
         catch (error) {
             throw new NordError_1.NordError(`Failed to withdraw ${amount} of token ID ${tokenId}`, { cause: error });
@@ -417,20 +428,42 @@ class NordUser {
             if (!market) {
                 throw new NordError_1.NordError(`Market with ID ${params.marketId} not found`);
             }
-            const result = await (0, actions_1.placeOrder)(this.nord.webServerUrl, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-                sessionId: (0, utils_1.optExpect)(this.sessionId, "No session"),
-                senderId: params.accountId,
-                sizeDecimals: market.sizeDecimals,
-                priceDecimals: market.priceDecimals,
-                marketId: params.marketId,
-                side: params.side,
-                fillMode: params.fillMode,
-                isReduceOnly: params.isReduceOnly,
-                size: params.size,
-                price: params.price,
-                quoteSize: params.quoteSize,
+            const sessionId = (0, utils_1.optExpect)(this.sessionId, "No session");
+            const price = (0, utils_1.toScaledU64)(params.price ?? 0, market.priceDecimals);
+            const size = (0, utils_1.toScaledU64)(params.size ?? 0, market.sizeDecimals);
+            const scaledQuote = params.quoteSize
+                ? params.quoteSize.toWire(market.priceDecimals, market.sizeDecimals)
+                : undefined;
+            (0, utils_1.assert)(price > 0n || size > 0n || scaledQuote !== undefined, "OrderLimit must include at least one of: size, price, or quoteSize");
+            const receipt = await this.submitSessionAction({
+                case: "placeOrder",
+                value: (0, protobuf_1.create)(proto.Action_PlaceOrderSchema, {
+                    sessionId: BigInt(sessionId),
+                    senderAccountId: params.accountId,
+                    marketId: params.marketId,
+                    side: params.side === types_1.Side.Bid ? proto.Side.BID : proto.Side.ASK,
+                    fillMode: (0, types_1.fillModeToProtoFillMode)(params.fillMode),
+                    isReduceOnly: params.isReduceOnly,
+                    price,
+                    size,
+                    quoteSize: scaledQuote === undefined
+                        ? undefined
+                        : (0, protobuf_1.create)(proto.QuoteSizeSchema, {
+                            size: scaledQuote.size,
+                            price: scaledQuote.price,
+                        }),
+                    clientOrderId: params.clientOrderId === undefined
+                        ? undefined
+                        : BigInt(params.clientOrderId),
+                }),
             });
-            return result;
+            (0, actions_1.expectReceiptKind)(receipt, "placeOrderResult", "place order");
+            const result = receipt.kind.value;
+            return {
+                actionId: receipt.actionId,
+                orderId: result.posted?.orderId,
+                fills: result.fills,
+            };
         }
         catch (error) {
             throw new NordError_1.NordError("Failed to place order", { cause: error });
@@ -448,12 +481,20 @@ class NordUser {
         const accountId = providedAccountId != null ? providedAccountId : this.accountIds?.[0];
         try {
             this.checkSessionValidity();
-            const result = await (0, actions_1.cancelOrder)(this.nord.webServerUrl, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-                sessionId: (0, utils_1.optExpect)(this.sessionId, "No session"),
-                senderId: accountId,
-                orderId,
+            const receipt = await this.submitSessionAction({
+                case: "cancelOrderById",
+                value: (0, protobuf_1.create)(proto.Action_CancelOrderByIdSchema, {
+                    orderId: BigInt(orderId),
+                    sessionId: BigInt((0, utils_1.optExpect)(this.sessionId, "No session")),
+                    senderAccountId: accountId,
+                }),
             });
-            return result;
+            (0, actions_1.expectReceiptKind)(receipt, "cancelOrderResult", "cancel order");
+            return {
+                actionId: receipt.actionId,
+                orderId: receipt.kind.value.orderId,
+                accountId: receipt.kind.value.accountId,
+            };
         }
         catch (error) {
             throw new NordError_1.NordError(`Failed to cancel order ${orderId}`, {
@@ -475,17 +516,36 @@ class NordUser {
             if (!market) {
                 throw new NordError_1.NordError(`Market with ID ${params.marketId} not found`);
             }
-            const result = await (0, actions_1.addTrigger)(this.nord.webServerUrl, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-                sessionId: (0, utils_1.optExpect)(this.sessionId, "No session"),
-                marketId: params.marketId,
-                side: params.side,
-                kind: params.kind,
-                priceDecimals: market.priceDecimals,
-                triggerPrice: params.triggerPrice,
-                limitPrice: params.limitPrice,
-                accountId: params.accountId,
+            const triggerPrice = (0, utils_1.toScaledU64)(params.triggerPrice, market.priceDecimals);
+            (0, utils_1.assert)(triggerPrice > 0n, "Trigger price must be positive");
+            const limitPrice = params.limitPrice === undefined
+                ? undefined
+                : (0, utils_1.toScaledU64)(params.limitPrice, market.priceDecimals);
+            if (limitPrice !== undefined) {
+                (0, utils_1.assert)(limitPrice > 0n, "Limit price must be positive");
+            }
+            const key = (0, protobuf_1.create)(proto.TriggerKeySchema, {
+                kind: params.kind === types_1.TriggerKind.StopLoss
+                    ? proto.TriggerKind.STOP_LOSS
+                    : proto.TriggerKind.TAKE_PROFIT,
+                side: params.side === types_1.Side.Bid ? proto.Side.BID : proto.Side.ASK,
             });
-            return result;
+            const prices = (0, protobuf_1.create)(proto.Action_TriggerPricesSchema, {
+                triggerPrice,
+                limitPrice,
+            });
+            const receipt = await this.submitSessionAction({
+                case: "addTrigger",
+                value: (0, protobuf_1.create)(proto.Action_AddTriggerSchema, {
+                    sessionId: BigInt((0, utils_1.optExpect)(this.sessionId, "No session")),
+                    marketId: params.marketId,
+                    key,
+                    prices,
+                    accountId: params.accountId,
+                }),
+            });
+            (0, actions_1.expectReceiptKind)(receipt, "triggerAdded", "add trigger");
+            return { actionId: receipt.actionId };
         }
         catch (error) {
             throw new NordError_1.NordError("Failed to add trigger", { cause: error });
@@ -505,58 +565,28 @@ class NordUser {
             if (!market) {
                 throw new NordError_1.NordError(`Market with ID ${params.marketId} not found`);
             }
-            const result = await (0, actions_1.removeTrigger)(this.nord.webServerUrl, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-                sessionId: (0, utils_1.optExpect)(this.sessionId, "No session"),
-                marketId: params.marketId,
-                side: params.side,
-                kind: params.kind,
-                accountId: params.accountId,
+            const key = (0, protobuf_1.create)(proto.TriggerKeySchema, {
+                kind: params.kind === types_1.TriggerKind.StopLoss
+                    ? proto.TriggerKind.STOP_LOSS
+                    : proto.TriggerKind.TAKE_PROFIT,
+                side: params.side === types_1.Side.Bid ? proto.Side.BID : proto.Side.ASK,
             });
-            return result;
+            const receipt = await this.submitSessionAction({
+                case: "removeTrigger",
+                value: (0, protobuf_1.create)(proto.Action_RemoveTriggerSchema, {
+                    sessionId: BigInt((0, utils_1.optExpect)(this.sessionId, "No session")),
+                    marketId: params.marketId,
+                    key,
+                    accountId: params.accountId,
+                }),
+            });
+            (0, actions_1.expectReceiptKind)(receipt, "triggerRemoved", "remove trigger");
+            return { actionId: receipt.actionId };
         }
         catch (error) {
             throw new NordError_1.NordError("Failed to remove trigger", { cause: error });
         }
     }
-    /**
-     * Fetch active triggers for an account.
-     *
-     * @param params Optional parameters containing an explicit account id.
-     * @throws {NordError} If no account can be resolved or the request fails.
-     */
-    async getAccountTriggers(params) {
-        const accountId = params?.accountId ?? this.accountIds?.[0];
-        if (accountId == null) {
-            throw new NordError_1.NordError("Account ID is undefined. Make sure to call updateAccountId() before requesting triggers.");
-        }
-        try {
-            return await (0, triggers_1.getAccountTriggers)(this.nord.webServerUrl, accountId);
-        }
-        catch (error) {
-            throw new NordError_1.NordError("Failed to fetch account triggers", { cause: error });
-        }
-    }
-    /**
-     * Fetch trigger history for an account.
-     *
-     * @param params Optional parameters with account id and history query filters.
-     * @throws {NordError} If no account can be resolved or the request fails.
-     */
-    async getAccountTriggerHistory(params) {
-        const { accountId: providedAccountId, ...query } = params;
-        const accountId = providedAccountId ?? this.accountIds?.[0];
-        if (accountId == null) {
-            throw new NordError_1.NordError("Account ID is undefined. Make sure to call updateAccountId() before requesting trigger history.");
-        }
-        try {
-            return await (0, triggers_1.getAccountTriggerHistory)(this.nord.webServerUrl, accountId, query);
-        }
-        catch (error) {
-            throw new NordError_1.NordError("Failed to fetch account trigger history", {
-                cause: error,
-            });
-        }
-    }
     /**
      * Transfer tokens to another account
      *
@@ -567,14 +597,21 @@ class NordUser {
         try {
             this.checkSessionValidity();
             const token = (0, utils_1.findToken)(this.nord.tokens, params.tokenId);
-            await (0, actions_1.transfer)(this.nord.webServerUrl, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-                sessionId: (0, utils_1.optExpect)(this.sessionId, "No session"),
-                fromAccountId: (0, utils_1.optExpect)(params.fromAccountId, "No source account"),
-                toAccountId: (0, utils_1.optExpect)(params.toAccountId, "No target account"),
-                tokenId: params.tokenId,
-                tokenDecimals: token.decimals,
-                amount: params.amount,
+            const amount = (0, utils_1.toScaledU64)(params.amount, token.decimals);
+            if (amount <= 0n) {
+                throw new NordError_1.NordError("Transfer amount must be positive");
+            }
+            const receipt = await this.submitSessionAction({
+                case: "transfer",
+                value: (0, protobuf_1.create)(proto.Action_TransferSchema, {
+                    sessionId: BigInt((0, utils_1.optExpect)(this.sessionId, "No session")),
+                    fromAccountId: (0, utils_1.optExpect)(params.fromAccountId, "No source account"),
+                    toAccountId: (0, utils_1.optExpect)(params.toAccountId, "No target account"),
+                    tokenId: params.tokenId,
+                    amount,
+                }),
             });
+            (0, actions_1.expectReceiptKind)(receipt, "transferred", "transfer tokens");
         }
         catch (error) {
             throw new NordError_1.NordError("Failed to transfer tokens", { cause: error });
@@ -740,13 +777,5 @@ class NordUser {
             });
         }
     }
-    /**
-     * Get the Solana public key derived from the address
-     *
-     * @returns The Solana public key
-     */
-    getSolanaPublicKey() {
-        return this.address;
-    }
 }
 exports.NordUser = NordUser;

package/dist/nord/index.d.ts

@@ -1,5 +1,9 @@
 export { Nord } from "./client/Nord";
 export { NordUser } from "./client/NordUser";
+export { NordAdmin } from "./client/NordAdmin";
+export { NordClient } from "./client/NordClient";
+export type { NordClientParams } from "./client/NordClient";
+export type { CreateTokenParams, CreateMarketParams, PythSetWormholeGuardiansParams, PythSetSymbolFeedParams, FreezeMarketParams, UnfreezeMarketParams, } from "./client/NordAdmin";
 export { NordError } from "./utils/NordError";
 export * from "./api/core";
 export * from "./api/metrics";

package/dist/nord/index.js

@@ -14,12 +14,16 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NordError = exports.NordUser = exports.Nord = void 0;
+exports.NordError = exports.NordClient = exports.NordAdmin = exports.NordUser = exports.Nord = void 0;
 // Export main client classes
 var Nord_1 = require("./client/Nord");
 Object.defineProperty(exports, "Nord", { enumerable: true, get: function () { return Nord_1.Nord; } });
 var NordUser_1 = require("./client/NordUser");
 Object.defineProperty(exports, "NordUser", { enumerable: true, get: function () { return NordUser_1.NordUser; } });
+var NordAdmin_1 = require("./client/NordAdmin");
+Object.defineProperty(exports, "NordAdmin", { enumerable: true, get: function () { return NordAdmin_1.NordAdmin; } });
+var NordClient_1 = require("./client/NordClient");
+Object.defineProperty(exports, "NordClient", { enumerable: true, get: function () { return NordClient_1.NordClient; } });
 // Export utility classes
 var NordError_1 = require("./utils/NordError");
 Object.defineProperty(exports, "NordError", { enumerable: true, get: function () { return NordError_1.NordError; } });

package/dist/types.d.ts

@@ -33,8 +33,8 @@ export type SubscriptionPattern = `${SubscriptionType}@${string}` | string;
 export interface NordConfig {
     /** Base URL for the Nord web server */
     webServerUrl: string;
-    /** Bridge verification key */
-    bridgeVk: string;
+    /** App address */
+    app: string;
     /** Solana cluster URL */
     solanaUrl: string;
     /**
@@ -43,9 +43,9 @@ export interface NordConfig {
      */
     initWebSockets?: boolean;
 }
-export type Info = components["schemas"]["Info2"];
-export type Market = Info["markets"][number];
-export type Token = Info["tokens"][number];
+export type MarketsInfo = components["schemas"]["MarketsInfo"];
+export type Market = MarketsInfo["markets"][number];
+export type Token = MarketsInfo["tokens"][number];
 export type Account = components["schemas"]["Account"];
 export type TradesResponse = components["schemas"]["PageResult_for_String_and_Trade"];
 export type User = components["schemas"]["User"];
@@ -75,6 +75,14 @@ export type FinalizationReason = components["schemas"]["FinalizationReason"];
 export type AccountPnlQuery = components["schemas"]["AccountPnlQuery"];
 export type AccountPnl = components["schemas"]["AccountPnl"];
 export type AccountPnlPage = components["schemas"]["PageResult_for_uint64_and_AccountPnl"];
+export type AccountTriggerInfo = components["schemas"]["AccountTriggerInfo"];
+export type TriggerHistoryPage = components["schemas"]["PageResult_for_uint64_and_HistoryTriggerInfo"];
+export type HistoryTriggerQuery = components["schemas"]["AccountTriggersQuery"];
+export type FeeTierConfig = components["schemas"]["FeeTierConfig"];
+export type FeeTierId = components["schemas"]["FeeTierId"];
+export type TokenStats = components["schemas"]["TokenStats"];
+export type AccountFeeTier = components["schemas"]["AccountFeeTier"];
+export type AccountFeeTierPage = components["schemas"]["PageResult_for_uint32_and_AccountFeeTier"];
 /**
  * Configuration options for the Nord client
  */

package/dist/utils.d.ts

@@ -79,6 +79,7 @@ export declare const toScaledU128: (x: Decimal.Value, decimals: number) => bigin
  */
 export declare function decodeLengthDelimited<T extends Message>(bytes: Uint8Array, schema: GenMessage<T>): T;
 export declare function checkPubKeyLength(keyType: KeyType, len: number): void;
+export declare function decodeHex(value: string): Uint8Array;
 export declare function findMarket(markets: Market[], marketId: number): Market;
 export declare function findToken(tokens: Token[], tokenId: number): Token;
 export declare function keypairFromPrivateKey(privateKey: string | Uint8Array): Keypair;

package/dist/utils.js

@@ -13,6 +13,7 @@ exports.signAction = signAction;
 exports.makeWalletSignFn = makeWalletSignFn;
 exports.decodeLengthDelimited = decodeLengthDelimited;
 exports.checkPubKeyLength = checkPubKeyLength;
+exports.decodeHex = decodeHex;
 exports.findMarket = findMarket;
 exports.findToken = findToken;
 exports.keypairFromPrivateKey = keypairFromPrivateKey;
@@ -195,6 +196,10 @@ function checkPubKeyLength(keyType, len) {
         throw new Error("Secp256k1 pubkeys must be 33 length.");
     }
 }
+function decodeHex(value) {
+    const hex = value.startsWith("0x") ? value.slice(2) : value;
+    return Uint8Array.from(Buffer.from(hex, "hex"));
+}
 function findMarket(markets, marketId) {
     if (marketId < 0 || markets.length - 1 < marketId) {
         throw new Error(`The market with marketId=${marketId} not found`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n1xyz/nord-ts",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Typescript for Nord",
   "keywords": [],
   "author": "",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@bufbuild/protobuf": "^2.6.3",
-    "@n1xyz/proton": "0.0.4",
+    "@n1xyz/proton": "0.0.6",
     "@noble/curves": "^1.9.6",
     "@noble/ed25519": "^2.3.0",
     "@noble/hashes": "^1.8.0",