@n1xyz/nord-ts 0.0.16 → 0.0.17

package/dist/nord/client/Nord.js

@@ -35,13 +35,14 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Nord = void 0;
 const events_1 = require("events");
-const web3_js_1 = require("@solana/web3.js");
 const types_1 = require("../../types");
+const proton_1 = require("@n1xyz/proton");
 const core = __importStar(require("../api/core"));
 const market = __importStar(require("../api/market"));
 const metrics = __importStar(require("../api/metrics"));
 const queries = __importStar(require("../api/queries"));
 const NordError_1 = require("../utils/NordError");
+const web3_js_1 = require("@solana/web3.js");
 /**
  * Main Nord client class for interacting with the Nord API
  */
@@ -55,25 +56,17 @@ class Nord {
      * @param config.solanaUrl - Solana cluster URL
      * @throws {Error} If required configuration is missing
      */
-    constructor(config) {
+    constructor({ bridgeVk, solanaUrl, webServerUrl, protonClient, }) {
         /** Available markets */
         this.markets = [];
         /** Available tokens */
         this.tokens = [];
         /** Map of symbol to market_id */
         this.symbolToMarketId = new Map();
-        if (!config.webServerUrl) {
-            throw new NordError_1.NordError("webServerUrl is required");
-        }
-        if (!config.bridgeVk) {
-            throw new NordError_1.NordError("bridgeVk is required");
-        }
-        if (!config.solanaUrl) {
-            throw new NordError_1.NordError("solanaUrl is required");
-        }
-        this.webServerUrl = config.webServerUrl;
-        this.bridgeVk = config.bridgeVk;
-        this.solanaUrl = config.solanaUrl;
+        this.webServerUrl = webServerUrl;
+        this.bridgeVk = bridgeVk;
+        this.solanaUrl = solanaUrl;
+        this.protonClient = protonClient;
     }
     /**
      * Create a WebSocket client with specific subscriptions
@@ -136,13 +129,13 @@ class Nord {
         return core.getTimestamp(this.webServerUrl);
     }
     /**
-     * Get the next action nonce from the Nord server
+     * Get the last event nonce from the Nord server
      *
      * @returns Next action nonce
      * @throws {NordError} If the request fails
      */
     async getActionNonce() {
-        return core.getActionNonce(this.webServerUrl);
+        return core.getLastEventNonce(this.webServerUrl);
     }
     /**
      * Fetch information about Nord markets and tokens
@@ -174,37 +167,33 @@ class Nord {
      * @returns Initialized Nord client
      * @throws {NordError} If initialization fails
      */
-    static async initNord(nordConfig) {
-        const nord = new Nord(nordConfig);
+    static async initNord({ bridgeVk: bridgeVk_, solanaUrl, webServerUrl, }) {
+        // TODO: we should parametrize the connectionn not have it done here.
+        // this is a dogshit api, only here to be compatible with the shitty
+        // vibecoded code and not break zero one team's workflow.
+        const connection = new web3_js_1.Connection(solanaUrl, { commitment: "confirmed" });
+        const bridgeVk = new web3_js_1.PublicKey(bridgeVk_);
+        const protonClient = await proton_1.ProtonClient.init({
+            protonUrl: webServerUrl,
+            bridgeVk,
+            solConn: connection,
+        });
+        const nord = new Nord({
+            bridgeVk,
+            protonClient,
+            solanaUrl,
+            webServerUrl,
+        });
         await nord.init();
         return nord;
     }
     /**
-     * Initialize the Nord client by deriving program ID and fetching info
+     * Initialize the Nord client
      * @private
      */
     async init() {
-        const connection = new web3_js_1.Connection(this.solanaUrl);
-        const bridgeVkPubkey = new web3_js_1.PublicKey(this.bridgeVk);
-        const bridgeAccount = await connection.getAccountInfo(bridgeVkPubkey);
-        if (!bridgeAccount) {
-            throw new NordError_1.NordError(`Bridge account ${this.bridgeVk} not found`);
-        }
-        this._solanaProgramId = bridgeAccount.owner.toString();
         await this.fetchNordInfo();
     }
-    /**
-     * Get the Solana program ID derived from bridge VK
-     *
-     * @returns Program ID string
-     * @throws {NordError} If program ID hasn't been initialized
-     */
-    getSolanaProgramId() {
-        if (!this._solanaProgramId) {
-            throw new NordError_1.NordError("Solana program ID not initialized. Have you called Nord.initNord()?");
-        }
-        return this._solanaProgramId;
-    }
     /**
      * Get market statistics
      *

package/dist/nord/client/NordUser.d.ts

@@ -1,7 +1,6 @@
 import { Connection, PublicKey } from "@solana/web3.js";
 import Decimal from "decimal.js";
-import { SolanaBridgeClient } from "../../bridge/client";
-import { SPLTokenInfo } from "../../bridge/types";
+import { SPLTokenInfo } from "@n1xyz/proton";
 import { FillMode, Order, Side } from "../../types";
 import { BigIntValue } from "../../utils";
 import { Nord } from "./Nord";
@@ -71,7 +70,7 @@ export declare class NordUser {
     /** Nord client instance */
     readonly nord: Nord;
     /** User's blockchain address */
-    readonly address: string;
+    readonly address: PublicKey;
     /** Function to sign messages with the user's wallet */
     readonly walletSignFn: (message: Uint8Array | string) => Promise<Uint8Array>;
     /** Function to sign messages with the user's session key */
@@ -131,8 +130,6 @@ export declare class NordUser {
     lastTs: number;
     /** Last nonce used */
     lastNonce: number;
-    /** Solana bridge client */
-    bridgeClient?: SolanaBridgeClient;
     /** Solana connection */
     connection: Connection;
     /** SPL token information */
@@ -143,20 +140,13 @@ export declare class NordUser {
      * @param params - Parameters for creating a NordUser
      * @throws {NordError} If required parameters are missing
      */
-    constructor(params: NordUserParams);
+    constructor({ address, nord, publicKey, sessionPubKey, sessionSignFn, transactionSignFn, walletSignFn, connection, sessionId, }: NordUserParams);
     /**
      * Create a clone of this NordUser instance
      *
      * @returns A new NordUser instance with the same properties
      */
     clone(): NordUser;
-    /**
-     * Initialize the Solana bridge client
-     *
-     * @private
-     * @throws {NordError} If required parameters are missing
-     */
-    private initBridgeClient;
     /**
      * Create a NordUser from a private key
      *
@@ -184,14 +174,6 @@ export declare class NordUser {
      * @throws {NordError} If required parameters are missing or operation fails
      */
     depositSpl(amount: number, tokenId: number): Promise<string>;
-    /**
-     * Withdraw SPL tokens from the bridge
-     *
-     * @param claim - Claim data
-     * @returns Transaction signature
-     * @throws {NordError} If required parameters are missing or operation fails
-     */
-    withdrawSpl(claim: any): Promise<string>;
     /**
      * Get a new nonce for actions
      *
@@ -236,7 +218,9 @@ export declare class NordUser {
      * @param amount - Amount to withdraw
      * @throws {NordError} If the operation fails
      */
-    withdraw(tokenId: number, amount: number): Promise<void>;
+    withdraw(tokenId: number, amount: number): Promise<{
+        actionId: bigint;
+    }>;
     /**
      * Place an order on the exchange
      *
@@ -249,7 +233,7 @@ export declare class NordUser {
      * Cancel an order
      *
      * @param orderId - Order ID to cancel
-     * @param accountId - Account ID that placed the order
+     * @param providedAccountId - Account ID that placed the order
      * @returns Action ID if successful
      * @throws {NordError} If the operation fails
      */

package/dist/nord/client/NordUser.js

@@ -39,9 +39,7 @@ 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 client_1 = require("../../bridge/client");
-const utils_1 = require("../../bridge/utils");
-const utils_2 = require("../../utils");
+const utils_1 = require("../../utils");
 const actions_1 = require("../api/actions");
 const NordError_1 = require("../utils/NordError");
 /**
@@ -54,7 +52,7 @@ class NordUser {
      * @param params - Parameters for creating a NordUser
      * @throws {NordError} If required parameters are missing
      */
-    constructor(params) {
+    constructor({ address, nord, publicKey, sessionPubKey, sessionSignFn, transactionSignFn, walletSignFn, connection, sessionId, }) {
         /** User balances by token symbol */
         this.balances = {};
         /** User orders by market symbol */
@@ -69,43 +67,35 @@ class NordUser {
         this.lastNonce = 0;
         /** SPL token information */
         this.splTokenInfos = [];
-        if (!params.nord) {
-            throw new NordError_1.NordError("Nord instance is required");
-        }
-        if (!params.address) {
-            throw new NordError_1.NordError("Address is required");
-        }
-        if (!params.walletSignFn) {
+        if (!walletSignFn) {
             throw new NordError_1.NordError("Wallet sign function is required");
         }
-        if (!params.sessionSignFn) {
+        if (!sessionSignFn) {
             throw new NordError_1.NordError("Session sign function is required");
         }
-        if (!params.sessionPubKey) {
+        if (!sessionPubKey) {
             throw new NordError_1.NordError("Session public key is required");
         }
-        this.nord = params.nord;
-        this.address = params.address;
-        this.walletSignFn = params.walletSignFn;
-        this.sessionSignFn = params.sessionSignFn;
-        this.transactionSignFn = params.transactionSignFn;
-        this.sessionPubKey = params.sessionPubKey;
-        this.publicKey = params.publicKey;
+        try {
+            this.address = 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 =
-            params.connection ||
-                new web3_js_1.Connection(params.nord.solanaUrl, {
+            connection ||
+                new web3_js_1.Connection(nord.solanaUrl, {
                     commitment: "confirmed",
                 });
         // Set sessionId if provided
-        if (params.sessionId !== undefined) {
-            this.sessionId = params.sessionId;
-        }
-        // Initialize bridge client if needed
-        try {
-            this.initBridgeClient();
-        }
-        catch (error) {
-            console.warn("Failed to initialize bridge client:", error);
+        if (sessionId !== undefined) {
+            this.sessionId = sessionId;
         }
         // Convert tokens from info endpoint to SPLTokenInfo
         if (this.nord.tokens && this.nord.tokens.length > 0) {
@@ -125,7 +115,7 @@ class NordUser {
     clone() {
         const cloned = new NordUser({
             nord: this.nord,
-            address: this.address,
+            address: this.address.toBase58(),
             walletSignFn: this.walletSignFn,
             sessionSignFn: this.sessionSignFn,
             transactionSignFn: this.transactionSignFn,
@@ -146,44 +136,6 @@ class NordUser {
         cloned.splTokenInfos = [...this.splTokenInfos];
         return cloned;
     }
-    /**
-     * Initialize the Solana bridge client
-     *
-     * @private
-     * @throws {NordError} If required parameters are missing
-     */
-    initBridgeClient() {
-        if (!this.getSolanaPublicKey() ||
-            !this.connection ||
-            !this.nord.getSolanaProgramId()) {
-            throw new NordError_1.NordError("Solana public key, connection, and program ID are required to initialize bridge client");
-        }
-        // Create an Anchor wallet that uses walletSignFn for signing
-        const wallet = {
-            publicKey: this.getSolanaPublicKey(),
-            signTransaction: async (tx) => {
-                return await this.transactionSignFn(tx);
-            },
-            signAllTransactions: async (txs) => {
-                return Promise.all(txs.map(async (tx) => {
-                    return await this.transactionSignFn(tx);
-                }));
-            },
-            // Create a keypair-like object with just the public key
-            payer: {
-                publicKey: this.getSolanaPublicKey(),
-                secretKey: new Uint8Array(64), // Dummy secret key to satisfy the type
-            },
-        };
-        // Initialize the bridge client
-        this.bridgeClient = new client_1.SolanaBridgeClient({
-            rpcUrl: this.connection.rpcEndpoint,
-            programId: this.nord.getSolanaProgramId(),
-            commitment: "confirmed",
-            tokenInfos: this.splTokenInfos,
-            bridgeVk: this.nord.bridgeVk,
-        }, wallet);
-    }
     /**
      * Create a NordUser from a private key
      *
@@ -216,9 +168,9 @@ class NordUser {
             // Create a transaction signing function
             const transactionSignFn = async (transaction) => {
                 // This is a basic implementation - actual implementation would depend on the transaction type
-                if (transaction.serializeMessage) {
+                if (transaction.sign) {
                     // Solana transaction
-                    transaction.sign([keypair]);
+                    transaction.sign(keypair);
                     return transaction;
                 }
                 // For other transaction types, would need specific implementation
@@ -253,7 +205,19 @@ class NordUser {
             throw new NordError_1.NordError("Solana public key is required to get associated token account");
         }
         try {
-            return await (0, spl_token_1.getAssociatedTokenAddress)(mint, this.getSolanaPublicKey(), false, spl_token_1.TOKEN_2022_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
+            // Get the token program ID from the mint account
+            const mintAccount = await this.connection.getAccountInfo(mint);
+            if (!mintAccount) {
+                throw new NordError_1.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");
+            }
+            const associatedTokenAddress = await (0, spl_token_1.getAssociatedTokenAddress)(mint, this.getSolanaPublicKey(), false, tokenProgramId, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
+            return associatedTokenAddress;
         }
         catch (error) {
             throw new NordError_1.NordError("Failed to get associated token account", {
@@ -270,9 +234,6 @@ class NordUser {
      * @throws {NordError} If required parameters are missing or operation fails
      */
     async depositSpl(amount, tokenId) {
-        if (!this.bridgeClient || !this.getSolanaPublicKey() || !this.connection) {
-            throw new NordError_1.NordError("Bridge client, Solana public key, and connection are required for deposit");
-        }
         try {
             // Find the token info
             const tokenInfo = this.splTokenInfos.find((t) => t.tokenId === tokenId);
@@ -283,60 +244,26 @@ class NordUser {
             // Get the user's token account
             const fromAccount = await this.getAssociatedTokenAccount(mint);
             // Convert amount to BN with proper decimals
-            const amountBN = (0, utils_2.toBN)(amount, tokenInfo.precision);
-            // Deposit tokens
-            return await this.bridgeClient.depositSpl({
+            const amountBN = (0, utils_1.toBN)(amount, tokenInfo.precision);
+            // Create deposit parameters
+            const depositParams = {
                 amount: amountBN,
                 mint,
                 fromAccount,
-            });
-        }
-        catch (error) {
-            throw new NordError_1.NordError(`Failed to deposit ${amount} of token ID ${tokenId}`, { cause: error });
-        }
-    }
-    /**
-     * Withdraw SPL tokens from the bridge
-     *
-     * @param claim - Claim data
-     * @returns Transaction signature
-     * @throws {NordError} If required parameters are missing or operation fails
-     */
-    async withdrawSpl(claim) {
-        if (!this.bridgeClient || !this.getSolanaPublicKey() || !this.connection) {
-            throw new NordError_1.NordError("Bridge client, Solana public key, and connection are required for withdrawal");
-        }
-        try {
-            // Find the token info
-            const tokenInfo = this.splTokenInfos.find((t) => t.tokenId === claim.tokenId);
-            if (!tokenInfo) {
-                throw new NordError_1.NordError(`Token with ID ${claim.tokenId} not found`);
-            }
-            const mint = new web3_js_1.PublicKey(tokenInfo.mint);
-            // Get the user's token account
-            const toAccount = await this.getAssociatedTokenAccount(mint);
-            // Get the bridge's token account
-            const [authority] = await this.bridgeClient.findAuthorityPda();
-            const fromAccount = await (0, spl_token_1.getAssociatedTokenAddress)(mint, authority, true, spl_token_1.TOKEN_2022_PROGRAM_ID);
-            // Create a transaction signer that uses walletSignFn
-            const transactionSigner = {
-                publicKey: this.getSolanaPublicKey(),
-                secretKey: new Uint8Array(64), // Dummy secret key, not actually used
-                sign: async (tx) => {
-                    const message = tx.serializeMessage();
-                    await this.walletSignFn(message);
-                    return tx;
-                },
             };
-            // Withdraw tokens
-            return await this.bridgeClient.withdraw({
-                claim,
-                fromAccount,
-                toAccount,
-            }, transactionSigner);
+            // Build the deposit transaction using proton client
+            const depositTx = await this.nord.protonClient.buildDepositTx(depositParams, this.getSolanaPublicKey(), this.connection);
+            const { blockhash } = await this.connection.getLatestBlockhash();
+            depositTx.recentBlockhash = blockhash;
+            depositTx.feePayer = this.getSolanaPublicKey();
+            const signedTx = await this.transactionSignFn(depositTx);
+            // TODO: should use `VersionedTransaction` and remove any for `transactionSignFn`,
+            // this is incredibly annoying to debug and i could've saved 30 mins.
+            const signature = await this.connection.sendRawTransaction(signedTx.serialize());
+            return signature;
         }
         catch (error) {
-            throw new NordError_1.NordError("Failed to withdraw SPL tokens", { cause: error });
+            throw new NordError_1.NordError(`Failed to deposit ${amount} of token ID ${tokenId}`, { cause: error });
         }
     }
     /**
@@ -374,7 +301,7 @@ class NordUser {
     async fetchInfo() {
         if (this.accountIds !== undefined) {
             const accountsData = await Promise.all(this.accountIds.map(async (accountId) => {
-                const response = await (0, utils_2.checkedFetch)(`${this.nord.webServerUrl}/account/${accountId}`);
+                const response = await (0, utils_1.checkedFetch)(`${this.nord.webServerUrl}/account/${accountId}`);
                 const accountData = (await response.json());
                 // Ensure we have the correct accountId
                 return {
@@ -417,7 +344,7 @@ class NordUser {
     async refreshSession() {
         console.log(this.publicKey);
         this.sessionId = await (0, actions_1.createSession)(this.nord.webServerUrl, this.walletSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-            userPubkey: (0, utils_2.optExpect)(this.publicKey.toBytes(), "No user's public key"),
+            userPubkey: (0, utils_1.optExpect)(this.publicKey.toBytes(), "No user's public key"),
             sessionPubkey: this.sessionPubKey,
         });
     }
@@ -459,12 +386,13 @@ class NordUser {
     async withdraw(tokenId, amount) {
         try {
             this.checkSessionValidity();
-            await (0, actions_1.withdraw)(this.nord.webServerUrl, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-                sizeDecimals: (0, utils_2.findToken)(this.nord.tokens, tokenId).decimals,
-                sessionId: (0, utils_2.optExpect)(this.sessionId, "No session"),
+            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,
             });
+            return { actionId };
         }
         catch (error) {
             throw new NordError_1.NordError(`Failed to withdraw ${amount} of token ID ${tokenId}`, { cause: error });
@@ -480,12 +408,12 @@ class NordUser {
     async placeOrder(params) {
         try {
             this.checkSessionValidity();
-            const market = (0, utils_2.findMarket)(this.nord.markets, params.marketId);
+            const market = (0, utils_1.findMarket)(this.nord.markets, params.marketId);
             if (!market) {
                 throw new NordError_1.NordError(`Market with ID ${params.marketId} not found`);
             }
             return (0, actions_1.placeOrder)(this.nord.webServerUrl, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-                sessionId: (0, utils_2.optExpect)(this.sessionId, "No session"),
+                sessionId: (0, utils_1.optExpect)(this.sessionId, "No session"),
                 senderId: params.accountId,
                 sizeDecimals: market.sizeDecimals,
                 priceDecimals: market.priceDecimals,
@@ -506,7 +434,7 @@ class NordUser {
      * Cancel an order
      *
      * @param orderId - Order ID to cancel
-     * @param accountId - Account ID that placed the order
+     * @param providedAccountId - Account ID that placed the order
      * @returns Action ID if successful
      * @throws {NordError} If the operation fails
      */
@@ -515,7 +443,7 @@ class NordUser {
         try {
             this.checkSessionValidity();
             return (0, actions_1.cancelOrder)(this.nord.webServerUrl, this.sessionSignFn, await this.nord.getTimestamp(), this.getNonce(), {
-                sessionId: (0, utils_2.optExpect)(this.sessionId, "No session"),
+                sessionId: (0, utils_1.optExpect)(this.sessionId, "No session"),
                 senderId: accountId,
                 orderId,
             });
@@ -535,11 +463,11 @@ class NordUser {
     async transferToAccount(params) {
         try {
             this.checkSessionValidity();
-            const token = (0, utils_2.findToken)(this.nord.tokens, params.tokenId);
+            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_2.optExpect)(this.sessionId, "No session"),
-                fromAccountId: (0, utils_2.optExpect)(params.fromAccountId, "No source account"),
-                toAccountId: (0, utils_2.optExpect)(params.toAccountId, "No target account"),
+                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,
@@ -660,12 +588,7 @@ class NordUser {
      * @returns The Solana public key
      */
     getSolanaPublicKey() {
-        try {
-            return new web3_js_1.PublicKey(this.address);
-        }
-        catch (error) {
-            throw new NordError_1.NordError("Invalid Solana address", { cause: error });
-        }
+        return this.address;
     }
 }
 exports.NordUser = NordUser;

package/dist/nord/utils/NordError.js

@@ -35,10 +35,13 @@ class NordError extends Error {
     toString() {
         let result = `${this.name}: ${this.message}`;
         if (this.statusCode) {
-            result += ` (Status: ${this.statusCode})`;
+            result += `  \nstatus: ${this.statusCode}`;
         }
         if (this.details && Object.keys(this.details).length > 0) {
-            result += `\nDetails: ${JSON.stringify(this.details, null, 2)}`;
+            result += `  \ndetails: ${JSON.stringify(this.details, null, 2)}`;
+        }
+        if (this.cause) {
+            result += `  \ncause: ${this.cause.toString()}`;
         }
         return result;
     }