@n1xyz/nord-ts 0.1.6 → 0.1.8

package/dist/{nord/client → client}/NordUser.js

@@ -1,98 +1,53 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NordUser = void 0;
-const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-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 NordError_1 = require("../utils/NordError");
-const NordClient_1 = require("./NordClient");
+import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddress, TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, } from "@solana/spl-token";
+import { PublicKey, Transaction } from "@solana/web3.js";
+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 { create } from "@bufbuild/protobuf";
+import { createSession, revokeSession, atomic, expectReceiptKind, createAction, sendAction, } from "../actions";
+import { NordError } from "../error";
 /**
  * User class for interacting with the Nord protocol
  */
-class NordUser extends NordClient_1.NordClient {
+export class NordUser {
+    nord;
+    sessionSignFn;
+    transactionSignFn;
+    sessionId;
+    sessionPubKey;
+    publicKey;
+    lastTs = 0;
+    nonce = 0;
+    /** User balances by token symbol */
+    balances = {};
+    /** User positions by account ID */
+    positions = {};
+    /** User margins by account ID */
+    margins = {};
+    /** User's account IDs */
+    accountIds;
+    /** SPL token information */
+    splTokenInfos = [];
     /**
      * Create a new NordUser instance
      *
-     * @param params - Parameters for creating a NordUser
+     * @param nord - Nord client instance
+     * @param sessionSignFn - Function to sign messages with the user's session key
+     * @param transactionSignFn - Function to sign transactions with the user's wallet (optional)
+     * @param sessionId - Existing session identifier
+     * @param sessionPubKey - Session public key
+     * @param publicKey - Wallet public key
      * @throws {NordError} If required parameters are missing
      */
-    constructor({ address, nord, publicKey, sessionPubKey, sessionSignFn, transactionSignFn, walletSignFn, connection, sessionId, }) {
-        if (!walletSignFn) {
-            throw new NordError_1.NordError("Wallet sign function is required");
-        }
-        if (!sessionSignFn) {
-            throw new NordError_1.NordError("Session sign function is required");
-        }
-        if (!sessionPubKey) {
-            throw new NordError_1.NordError("Session public key is required");
-        }
-        let parsedAddress;
-        try {
-            parsedAddress = new web3_js_1.PublicKey(address);
-        }
-        catch (error) {
-            throw new NordError_1.NordError("Invalid Solana address", { cause: error });
-        }
-        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 = [];
+    constructor({ nord, sessionSignFn, transactionSignFn, sessionId, sessionPubKey, publicKey, }) {
+        this.nord = nord;
+        this.sessionSignFn = sessionSignFn;
+        this.transactionSignFn = transactionSignFn;
+        this.sessionId = sessionId;
+        this.sessionPubKey = new PublicKey(sessionPubKey);
+        this.publicKey = publicKey;
         // Convert tokens from info endpoint to SPLTokenInfo
         if (this.nord.tokens && this.nord.tokens.length > 0) {
             this.splTokenInfos = this.nord.tokens.map((token) => ({
@@ -103,85 +58,36 @@ class NordUser extends NordClient_1.NordClient {
             }));
         }
     }
-    /**
-     * Create a clone of this NordUser instance
-     *
-     * @returns A new NordUser instance with the same properties
-     */
-    clone() {
-        const cloned = new NordUser({
-            nord: this.nord,
-            address: this.address.toBase58(),
-            walletSignFn: this.walletSignFn,
-            sessionSignFn: this.sessionSignFn,
-            transactionSignFn: this.transactionSignFn,
-            connection: this.connection,
-            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.splTokenInfos = [...this.splTokenInfos];
-        this.cloneClientState(cloned);
-        return cloned;
-    }
     /**
      * Create a NordUser from a private key
      *
      * @param nord - Nord instance
      * @param privateKey - Private key as string or Uint8Array
-     * @param connection - Solana connection (optional)
      * @returns NordUser instance
      * @throws {NordError} If the private key is invalid
      */
-    static fromPrivateKey(nord, privateKey, connection) {
+    static fromPrivateKey(nord, privateKey) {
         try {
-            const keypair = (0, utils_1.keypairFromPrivateKey)(privateKey);
+            const keypair = keypairFromPrivateKey(privateKey);
             const publicKey = keypair.publicKey;
-            // Create a signing function that uses the keypair but doesn't expose it
-            const walletSignFn = async (message) => {
-                function toHex(buffer) {
-                    return Array.from(buffer)
-                        .map((byte) => byte.toString(16).padStart(2, "0"))
-                        .join("");
-                }
-                const messageBuffer = new TextEncoder().encode(toHex(message));
-                // Use ed25519 to sign the message
-                const signature = ed.sign(messageBuffer, keypair.secretKey.slice(0, 32));
-                return signature;
-            };
             const sessionSignFn = async (message) => {
                 // Use ed25519 to sign the message
                 return ed.sign(message, keypair.secretKey.slice(0, 32));
             };
-            // Create a transaction signing function
-            const transactionSignFn = async (transaction) => {
-                // This is a basic implementation - actual implementation would depend on the transaction type
-                if (transaction.sign) {
-                    // Solana transaction
-                    transaction.sign(keypair);
-                    return transaction;
-                }
-                // For other transaction types, would need specific implementation
-                throw new NordError_1.NordError("Unsupported transaction type for signing");
+            const transactionSignFn = async (tx) => {
+                tx.sign(keypair);
+                return tx;
             };
             return new NordUser({
                 nord,
-                address: publicKey.toBase58(),
-                walletSignFn,
                 sessionSignFn,
                 transactionSignFn,
-                connection,
                 publicKey,
-                sessionPubKey: publicKey.toBytes(), // Use the public key derived from the private key as the session public key
+                sessionPubKey: publicKey.toBytes(),
             });
         }
         catch (error) {
-            throw new NordError_1.NordError("Failed to create NordUser from private key", {
+            throw new NordError("Failed to create NordUser from private key", {
                 cause: error,
             });
         }
@@ -194,26 +100,23 @@ class NordUser extends NordClient_1.NordClient {
      * @throws {NordError} If required parameters are missing or operation fails
      */
     async getAssociatedTokenAccount(mint) {
-        if (!this.getSolanaPublicKey()) {
-            throw new NordError_1.NordError("Solana public key is required to get associated token account");
-        }
         try {
             // Get the token program ID from the mint account
-            const mintAccount = await this.connection.getAccountInfo(mint);
+            const mintAccount = await this.nord.solanaConnection.getAccountInfo(mint);
             if (!mintAccount) {
-                throw new NordError_1.NordError("Mint account not found");
+                throw new NordError("Mint account not found");
             }
             const tokenProgramId = mintAccount.owner;
             // Validate that the mint is owned by a supported SPL token program
-            if (!tokenProgramId.equals(spl_token_1.TOKEN_PROGRAM_ID) &&
-                !tokenProgramId.equals(spl_token_1.TOKEN_2022_PROGRAM_ID)) {
-                throw new NordError_1.NordError("Mint Account is not owned by a supported SPL token program");
+            if (!tokenProgramId.equals(TOKEN_PROGRAM_ID) &&
+                !tokenProgramId.equals(TOKEN_2022_PROGRAM_ID)) {
+                throw new NordError("Mint Account is not owned by a supported SPL token program");
             }
-            const associatedTokenAddress = await (0, spl_token_1.getAssociatedTokenAddress)(mint, this.getSolanaPublicKey(), false, tokenProgramId, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
+            const associatedTokenAddress = await getAssociatedTokenAddress(mint, this.publicKey, false, tokenProgramId, ASSOCIATED_TOKEN_PROGRAM_ID);
             return associatedTokenAddress;
         }
         catch (error) {
-            throw new NordError_1.NordError("Failed to get associated token account", {
+            throw new NordError("Failed to get associated token account", {
                 cause: error,
             });
         }
@@ -246,30 +149,30 @@ class NordUser extends NordClient_1.NordClient {
             // Find the token info
             const tokenInfo = this.splTokenInfos.find((t) => t.tokenId === tokenId);
             if (!tokenInfo) {
-                throw new NordError_1.NordError(`Token with ID ${tokenId} not found`);
+                throw new NordError(`Token with ID ${tokenId} not found`);
             }
-            const mint = new web3_js_1.PublicKey(tokenInfo.mint);
+            const mint = new PublicKey(tokenInfo.mint);
             const fromAccount = await this.getAssociatedTokenAccount(mint);
-            const payer = this.getSolanaPublicKey();
+            const payer = this.publicKey;
             const { ix, extraSigner } = await this.nord.protonClient.buildDepositIx({
                 payer,
                 recipient: recipient ?? payer,
-                quantAmount: (0, proton_1.floatToScaledBigIntLossy)(amount, tokenInfo.precision),
+                quantAmount: floatToScaledBigIntLossy(amount, tokenInfo.precision),
                 mint,
                 sourceTokenAccount: fromAccount,
             });
-            const { blockhash } = await this.connection.getLatestBlockhash();
-            const tx = new web3_js_1.Transaction();
+            const { blockhash } = await this.nord.solanaConnection.getLatestBlockhash();
+            const tx = new Transaction();
             tx.add(ix);
             tx.recentBlockhash = blockhash;
             tx.feePayer = payer;
             const signedTx = await this.transactionSignFn(tx);
             signedTx.partialSign(extraSigner);
-            const signature = await this.connection.sendRawTransaction(signedTx.serialize(), sendOptions);
+            const signature = await this.nord.solanaConnection.sendRawTransaction(signedTx.serialize(), sendOptions);
             return signature;
         }
         catch (error) {
-            throw new NordError_1.NordError(`Failed to deposit ${amount} of token ID ${tokenId}`, { cause: error });
+            throw new NordError(`Failed to deposit ${amount} of token ID ${tokenId}`, { cause: error });
         }
     }
     /**
@@ -278,7 +181,7 @@ class NordUser extends NordClient_1.NordClient {
      * @returns Nonce as number
      */
     getNonce() {
-        return this.nextActionNonce();
+        return ++this.nonce;
     }
     async submitSessionAction(kind) {
         return this.submitSignedAction(kind, async (message) => {
@@ -297,18 +200,18 @@ class NordUser extends NordClient_1.NordClient {
     async updateAccountId() {
         try {
             if (!this.publicKey) {
-                throw new NordError_1.NordError("Public key is required to update account ID");
+                throw new NordError("Public key is required to update account ID");
             }
             const resp = await this.nord.getUser({
                 pubkey: this.publicKey.toBase58(),
             });
             if (!resp) {
-                throw new NordError_1.NordError(`User ${this.publicKey.toBase58()} not found`);
+                throw new NordError(`User ${this.publicKey.toBase58()} not found`);
             }
             this.accountIds = resp.accountIds;
         }
         catch (error) {
-            throw new NordError_1.NordError("Failed to update account ID", { cause: error });
+            throw new NordError("Failed to update account ID", { cause: error });
         }
     }
     /**
@@ -319,7 +222,7 @@ class NordUser extends NordClient_1.NordClient {
     async fetchInfo() {
         if (this.accountIds !== undefined) {
             const accountsData = await Promise.all(this.accountIds.map(async (accountId) => {
-                const response = await (0, utils_1.checkedFetch)(`${this.nord.webServerUrl}/account/${accountId}`);
+                const response = await checkedFetch(`${this.nord.webServerUrl}/account/${accountId}`);
                 const accountData = (await response.json());
                 // Ensure we have the correct accountId
                 return {
@@ -350,8 +253,8 @@ class NordUser extends NordClient_1.NordClient {
      * @throws {NordError} If the operation fails
      */
     async refreshSession() {
-        const result = await (0, actions_1.createSession)(this.nord.webServerUrl, this.walletSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-            userPubkey: (0, utils_1.optExpect)(this.publicKey.toBytes(), "No user's public key"),
+        const result = await createSession(this.nord.httpClient, this.transactionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
+            userPubkey: this.publicKey,
             sessionPubkey: this.sessionPubKey,
         });
         this.sessionId = result.sessionId;
@@ -364,12 +267,13 @@ class NordUser extends NordClient_1.NordClient {
      */
     async revokeSession(sessionId) {
         try {
-            await (0, actions_1.revokeSession)(this.nord.webServerUrl, this.walletSignFn, await this.nord.getTimestamp(), this.getNonce(), {
+            await revokeSession(this.nord.httpClient, this.transactionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
+                userPubkey: this.publicKey,
                 sessionId,
             });
         }
         catch (error) {
-            throw new NordError_1.NordError(`Failed to revoke session ${sessionId}`, {
+            throw new NordError(`Failed to revoke session ${sessionId}`, {
                 cause: error,
             });
         }
@@ -381,7 +285,7 @@ class NordUser extends NordClient_1.NordClient {
      */
     checkSessionValidity() {
         if (this.sessionId === undefined || this.sessionId === BigInt(0)) {
-            throw new NordError_1.NordError("Invalid or empty session ID. Please create or refresh your session.");
+            throw new NordError("Invalid or empty session ID. Please create or refresh your session.");
         }
     }
     /**
@@ -394,70 +298,76 @@ class NordUser extends NordClient_1.NordClient {
     async withdraw({ amount, tokenId, }) {
         try {
             this.checkSessionValidity();
-            const token = (0, utils_1.findToken)(this.nord.tokens, tokenId);
-            const scaledAmount = (0, utils_1.toScaledU64)(amount, token.decimals);
+            const token = findToken(this.nord.tokens, tokenId);
+            const scaledAmount = toScaledU64(amount, token.decimals);
             if (scaledAmount <= 0n) {
-                throw new NordError_1.NordError("Withdraw amount must be positive");
+                throw new 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")),
+                value: create(proto.Action_WithdrawSchema, {
+                    sessionId: BigInt(optExpect(this.sessionId, "No session")),
                     tokenId,
                     amount: scaledAmount,
                 }),
             });
-            (0, actions_1.expectReceiptKind)(receipt, "withdrawResult", "withdraw");
+            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 });
+            throw new NordError(`Failed to withdraw ${amount} of token ID ${tokenId}`, { cause: error });
         }
     }
     /**
      * Place an order on the exchange
      *
-     * @param params - Order parameters
+     * @param marketId - Target market identifier
+     * @param side - Order side
+     * @param fillMode - Fill mode (limit, market, etc.)
+     * @param isReduceOnly - Reduce-only flag
+     * @param size - Base size to place
+     * @param price - Limit price
+     * @param quoteSize - Quote-sized order representation
+     * @param accountId - Account executing the order
+     * @param clientOrderId - Optional client-specified identifier
      * @returns Object containing actionId, orderId (if posted), fills, and clientOrderId
      * @throws {NordError} If the operation fails
      */
-    async placeOrder(params) {
+    async placeOrder({ marketId, side, fillMode, isReduceOnly, size, price, quoteSize, accountId, clientOrderId, }) {
         try {
             this.checkSessionValidity();
-            const market = (0, utils_1.findMarket)(this.nord.markets, params.marketId);
+            const market = findMarket(this.nord.markets, marketId);
             if (!market) {
-                throw new NordError_1.NordError(`Market with ID ${params.marketId} not found`);
+                throw new NordError(`Market with ID ${marketId} not found`);
             }
-            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)
+            const sessionId = optExpect(this.sessionId, "No session");
+            const scaledPrice = toScaledU64(price ?? 0, market.priceDecimals);
+            const scaledSize = toScaledU64(size ?? 0, market.sizeDecimals);
+            const scaledQuote = quoteSize
+                ? 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");
+            assert(scaledPrice > 0n || scaledSize > 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, {
+                value: 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,
+                    senderAccountId: accountId,
+                    marketId,
+                    side: side === Side.Bid ? proto.Side.BID : proto.Side.ASK,
+                    fillMode: fillModeToProtoFillMode(fillMode),
+                    isReduceOnly,
+                    price: scaledPrice,
+                    size: scaledSize,
                     quoteSize: scaledQuote === undefined
                         ? undefined
-                        : (0, protobuf_1.create)(proto.QuoteSizeSchema, {
+                        : create(proto.QuoteSizeSchema, {
                             size: scaledQuote.size,
                             price: scaledQuote.price,
                         }),
-                    clientOrderId: params.clientOrderId === undefined
-                        ? undefined
-                        : BigInt(params.clientOrderId),
+                    clientOrderId: clientOrderId === undefined ? undefined : BigInt(clientOrderId),
                 }),
             });
-            (0, actions_1.expectReceiptKind)(receipt, "placeOrderResult", "place order");
+            expectReceiptKind(receipt, "placeOrderResult", "place order");
             const result = receipt.kind.value;
             return {
                 actionId: receipt.actionId,
@@ -466,7 +376,7 @@ class NordUser extends NordClient_1.NordClient {
             };
         }
         catch (error) {
-            throw new NordError_1.NordError("Failed to place order", { cause: error });
+            throw new NordError("Failed to place order", { cause: error });
         }
     }
     /**
@@ -483,13 +393,13 @@ class NordUser extends NordClient_1.NordClient {
             this.checkSessionValidity();
             const receipt = await this.submitSessionAction({
                 case: "cancelOrderById",
-                value: (0, protobuf_1.create)(proto.Action_CancelOrderByIdSchema, {
+                value: create(proto.Action_CancelOrderByIdSchema, {
                     orderId: BigInt(orderId),
-                    sessionId: BigInt((0, utils_1.optExpect)(this.sessionId, "No session")),
+                    sessionId: BigInt(optExpect(this.sessionId, "No session")),
                     senderAccountId: accountId,
                 }),
             });
-            (0, actions_1.expectReceiptKind)(receipt, "cancelOrderResult", "cancel order");
+            expectReceiptKind(receipt, "cancelOrderResult", "cancel order");
             return {
                 actionId: receipt.actionId,
                 orderId: receipt.kind.value.orderId,
@@ -497,7 +407,7 @@ class NordUser extends NordClient_1.NordClient {
             };
         }
         catch (error) {
-            throw new NordError_1.NordError(`Failed to cancel order ${orderId}`, {
+            throw new NordError(`Failed to cancel order ${orderId}`, {
                 cause: error,
             });
         }
@@ -505,116 +415,137 @@ class NordUser extends NordClient_1.NordClient {
     /**
      * Add a trigger for the current session
      *
-     * @param params - Trigger parameters including market, side, and prices
+     * @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 - Limit price placed once the trigger fires
+     * @param accountId - Account executing the trigger
      * @returns Object containing the actionId of the submitted trigger
      * @throws {NordError} If the operation fails
      */
-    async addTrigger(params) {
+    async addTrigger({ marketId, side, kind, triggerPrice, limitPrice, accountId, }) {
         try {
             this.checkSessionValidity();
-            const market = (0, utils_1.findMarket)(this.nord.markets, params.marketId);
+            const market = findMarket(this.nord.markets, marketId);
             if (!market) {
-                throw new NordError_1.NordError(`Market with ID ${params.marketId} not found`);
+                throw new NordError(`Market with ID ${marketId} not found`);
             }
-            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
+            const scaledTriggerPrice = toScaledU64(triggerPrice, market.priceDecimals);
+            assert(scaledTriggerPrice > 0n, "Trigger price must be positive");
+            const scaledLimitPrice = 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");
+                : toScaledU64(limitPrice, market.priceDecimals);
+            if (scaledLimitPrice !== undefined) {
+                assert(scaledLimitPrice > 0n, "Limit price must be positive");
             }
-            const key = (0, protobuf_1.create)(proto.TriggerKeySchema, {
-                kind: params.kind === types_1.TriggerKind.StopLoss
+            const key = create(proto.TriggerKeySchema, {
+                kind: kind === TriggerKind.StopLoss
                     ? proto.TriggerKind.STOP_LOSS
                     : proto.TriggerKind.TAKE_PROFIT,
-                side: params.side === types_1.Side.Bid ? proto.Side.BID : proto.Side.ASK,
+                side: side === Side.Bid ? proto.Side.BID : proto.Side.ASK,
             });
-            const prices = (0, protobuf_1.create)(proto.Action_TriggerPricesSchema, {
-                triggerPrice,
-                limitPrice,
+            const prices = create(proto.Action_TriggerPricesSchema, {
+                triggerPrice: scaledTriggerPrice,
+                limitPrice: scaledLimitPrice,
             });
             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,
+                value: create(proto.Action_AddTriggerSchema, {
+                    sessionId: BigInt(optExpect(this.sessionId, "No session")),
+                    marketId,
                     key,
                     prices,
-                    accountId: params.accountId,
+                    accountId,
                 }),
             });
-            (0, actions_1.expectReceiptKind)(receipt, "triggerAdded", "add trigger");
+            expectReceiptKind(receipt, "triggerAdded", "add trigger");
             return { actionId: receipt.actionId };
         }
         catch (error) {
-            throw new NordError_1.NordError("Failed to add trigger", { cause: error });
+            throw new NordError("Failed to add trigger", { cause: error });
         }
     }
     /**
      * Remove a trigger for the current session
      *
-     * @param params - Trigger parameters identifying the trigger to remove
+     * @param marketId - Market the trigger belongs to
+     * @param side - Order side for the trigger
+     * @param kind - Stop-loss or take-profit trigger type
+     * @param accountId - Account executing the trigger
      * @returns Object containing the actionId of the removal action
      * @throws {NordError} If the operation fails
      */
-    async removeTrigger(params) {
+    async removeTrigger({ marketId, side, kind, accountId, }) {
         try {
             this.checkSessionValidity();
-            const market = (0, utils_1.findMarket)(this.nord.markets, params.marketId);
+            const market = findMarket(this.nord.markets, marketId);
             if (!market) {
-                throw new NordError_1.NordError(`Market with ID ${params.marketId} not found`);
+                throw new NordError(`Market with ID ${marketId} not found`);
             }
-            const key = (0, protobuf_1.create)(proto.TriggerKeySchema, {
-                kind: params.kind === types_1.TriggerKind.StopLoss
+            const key = create(proto.TriggerKeySchema, {
+                kind: kind === TriggerKind.StopLoss
                     ? proto.TriggerKind.STOP_LOSS
                     : proto.TriggerKind.TAKE_PROFIT,
-                side: params.side === types_1.Side.Bid ? proto.Side.BID : proto.Side.ASK,
+                side: side === Side.Bid ? proto.Side.BID : proto.Side.ASK,
             });
             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,
+                value: create(proto.Action_RemoveTriggerSchema, {
+                    sessionId: BigInt(optExpect(this.sessionId, "No session")),
+                    marketId,
                     key,
-                    accountId: params.accountId,
+                    accountId,
                 }),
             });
-            (0, actions_1.expectReceiptKind)(receipt, "triggerRemoved", "remove trigger");
+            expectReceiptKind(receipt, "triggerRemoved", "remove trigger");
             return { actionId: receipt.actionId };
         }
         catch (error) {
-            throw new NordError_1.NordError("Failed to remove trigger", { cause: error });
+            throw new NordError("Failed to remove trigger", { cause: error });
         }
     }
     /**
      * Transfer tokens to another account
      *
-     * @param params - Transfer parameters
+     * @param tokenId - Token identifier to move
+     * @param amount - Amount to transfer
+     * @param fromAccountId - Source account id
+     * @param toAccountId - Destination account id
      * @throws {NordError} If the operation fails
      */
-    async transferToAccount(params) {
+    async transferToAccount({ tokenId, amount, fromAccountId, toAccountId, }) {
         try {
             this.checkSessionValidity();
-            const token = (0, utils_1.findToken)(this.nord.tokens, params.tokenId);
-            const amount = (0, utils_1.toScaledU64)(params.amount, token.decimals);
-            if (amount <= 0n) {
-                throw new NordError_1.NordError("Transfer amount must be positive");
+            const token = findToken(this.nord.tokens, tokenId);
+            const scaledAmount = toScaledU64(amount, token.decimals);
+            if (scaledAmount <= 0n) {
+                throw new 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,
+                value: create(proto.Action_TransferSchema, {
+                    sessionId: BigInt(optExpect(this.sessionId, "No session")),
+                    fromAccountId: optExpect(fromAccountId, "No source account"),
+                    toAccountId: optExpect(toAccountId, "No target account"),
+                    tokenId,
+                    amount: scaledAmount,
                 }),
             });
-            (0, actions_1.expectReceiptKind)(receipt, "transferred", "transfer tokens");
+            expectReceiptKind(receipt, "transferred", "transfer tokens");
+            if (receipt.kind.value.accountCreated) {
+                assert(receipt.kind.value.toUserAccount !== undefined, `toAccount must be defined on new account on ${receipt.kind.value}`);
+                return {
+                    actionId: receipt.actionId,
+                    newAccountId: receipt.kind.value.toUserAccount,
+                };
+            }
+            else {
+                return { actionId: receipt.actionId };
+            }
         }
         catch (error) {
-            throw new NordError_1.NordError("Failed to transfer tokens", { cause: error });
+            throw new NordError("Failed to transfer tokens", { cause: error });
         }
     }
     /**
@@ -634,13 +565,13 @@ class NordUser extends NordClient_1.NordClient {
             this.checkSessionValidity();
             const accountId = providedAccountId != null ? providedAccountId : this.accountIds?.[0];
             if (accountId == null) {
-                throw new NordError_1.NordError("Account ID is undefined. Make sure to call updateAccountId() before atomic operations.");
+                throw new NordError("Account ID is undefined. Make sure to call updateAccountId() before atomic operations.");
             }
             const apiActions = userActions.map((act) => {
                 if (act.kind === "place") {
-                    const market = (0, utils_1.findMarket)(this.nord.markets, act.marketId);
+                    const market = findMarket(this.nord.markets, act.marketId);
                     if (!market) {
-                        throw new NordError_1.NordError(`Market ${act.marketId} not found`);
+                        throw new NordError(`Market ${act.marketId} not found`);
                     }
                     return {
                         kind: "place",
@@ -661,15 +592,15 @@ class NordUser extends NordClient_1.NordClient {
                     orderId: act.orderId,
                 };
             });
-            const result = await (0, actions_1.atomic)(this.nord.webServerUrl, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-                sessionId: (0, utils_1.optExpect)(this.sessionId, "No session"),
+            const result = await atomic(this.nord.httpClient, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
+                sessionId: optExpect(this.sessionId, "No session"),
                 accountId: accountId,
                 actions: apiActions,
             });
             return result;
         }
         catch (error) {
-            throw new NordError_1.NordError("Atomic operation failed", { cause: error });
+            throw new NordError("Atomic operation failed", { cause: error });
         }
     }
     /**
@@ -718,17 +649,14 @@ class NordUser extends NordClient_1.NordClient {
      */
     async getSolanaBalances(options = {}) {
         const { includeZeroBalances = true, includeTokenAccounts = false, maxConcurrent = 5, maxRetries = 3, } = options;
-        if (!this.connection || !this.getSolanaPublicKey()) {
-            throw new NordError_1.NordError("Connection and Solana public key are required to get Solana balances");
-        }
         const balances = {};
         const tokenAccounts = {};
         try {
             // Get SOL balance (native token)
-            const solBalance = await this.retryWithBackoff(() => this.connection.getBalance(this.getSolanaPublicKey()), maxRetries);
+            const solBalance = await this.retryWithBackoff(() => this.nord.solanaConnection.getBalance(this.publicKey), maxRetries);
             balances["SOL"] = solBalance / 1e9; // Convert lamports to SOL
             if (includeTokenAccounts) {
-                tokenAccounts["SOL"] = this.getSolanaPublicKey().toString();
+                tokenAccounts["SOL"] = this.publicKey.toString();
             }
             // Get SPL token balances using mintAddr from Nord tokens
             if (this.nord.tokens && this.nord.tokens.length > 0) {
@@ -739,13 +667,13 @@ class NordUser extends NordClient_1.NordClient {
                     // Process batch in parallel
                     const batchPromises = batch.map(async (token) => {
                         try {
-                            const mint = new web3_js_1.PublicKey(token.mintAddr);
-                            const associatedTokenAddress = await this.retryWithBackoff(() => (0, spl_token_1.getAssociatedTokenAddress)(mint, this.getSolanaPublicKey()), maxRetries);
+                            const mint = new PublicKey(token.mintAddr);
+                            const associatedTokenAddress = await this.retryWithBackoff(() => getAssociatedTokenAddress(mint, this.publicKey), maxRetries);
                             if (includeTokenAccounts) {
                                 tokenAccounts[token.symbol] = associatedTokenAddress.toString();
                             }
                             try {
-                                const tokenBalance = await this.retryWithBackoff(() => this.connection.getTokenAccountBalance(associatedTokenAddress), maxRetries);
+                                const tokenBalance = await this.retryWithBackoff(() => this.nord.solanaConnection.getTokenAccountBalance(associatedTokenAddress), maxRetries);
                                 const balance = Number(tokenBalance.value.uiAmount);
                                 if (balance > 0 || includeZeroBalances) {
                                     balances[token.symbol] = balance;
@@ -772,10 +700,15 @@ class NordUser extends NordClient_1.NordClient {
             return includeTokenAccounts ? { balances, tokenAccounts } : { balances };
         }
         catch (error) {
-            throw new NordError_1.NordError("Failed to get Solana token balances", {
+            throw new NordError("Failed to get Solana token balances", {
                 cause: error,
             });
         }
     }
+    async submitSignedAction(kind, makeSignedMessage) {
+        const nonce = this.getNonce();
+        const currentTimestamp = await this.nord.getTimestamp();
+        const action = createAction(currentTimestamp, nonce, kind);
+        return sendAction(this.nord.httpClient, makeSignedMessage, action);
+    }
 }
-exports.NordUser = NordUser;