@n1xyz/nord-ts 0.0.16 → 0.0.18-8121ed05.0

package/dist/idl/bridge.json

@@ -317,11 +317,6 @@
                 177
             ],
             "accounts": [
-                {
-                    "name": "payer",
-                    "writable": true,
-                    "signer": true
-                },
                 {
                     "name": "bridge",
                     "writable": true
@@ -633,7 +628,39 @@
                     }
                 },
                 {
-                    "name": "da_fact_state"
+                    "name": "da_fact_state",
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    100,
+                                    97,
+                                    95,
+                                    102,
+                                    97,
+                                    99,
+                                    116,
+                                    95,
+                                    115,
+                                    116,
+                                    111,
+                                    114,
+                                    97,
+                                    103,
+                                    101
+                                ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "bridge"
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "facts.da_commitment"
+                            }
+                        ]
+                    }
                 },
                 {
                     "name": "crumb_authority",
@@ -737,12 +764,15 @@
                                 "path": "bridge"
                             },
                             {
-                                "kind": "arg",
-                                "path": "asset"
+                                "kind": "account",
+                                "path": "mint"
                             }
                         ]
                     }
                 },
+                {
+                    "name": "mint"
+                },
                 {
                     "name": "crumb_authority",
                     "pda": {
@@ -779,10 +809,6 @@
                 }
             ],
             "args": [
-                {
-                    "name": "asset",
-                    "type": "pubkey"
-                },
                 {
                     "name": "min_deposit",
                     "type": "u64"
@@ -842,12 +868,15 @@
                                 "path": "bridge"
                             },
                             {
-                                "kind": "arg",
-                                "path": "asset"
+                                "kind": "account",
+                                "path": "mint"
                             }
                         ]
                     }
                 },
+                {
+                    "name": "mint"
+                },
                 {
                     "name": "crumb_authority",
                     "pda": {
@@ -888,10 +917,6 @@
                 }
             ],
             "args": [
-                {
-                    "name": "asset",
-                    "type": "pubkey"
-                },
                 {
                     "name": "min_deposit",
                     "type": "u64"
@@ -1192,19 +1217,6 @@
                 227
             ]
         },
-        {
-            "name": "EffectNullifier",
-            "discriminator": [
-                138,
-                66,
-                66,
-                124,
-                33,
-                209,
-                105,
-                159
-            ]
-        },
         {
             "name": "FactStateStorage",
             "discriminator": [
@@ -1280,19 +1292,17 @@
                     {
                         "name": "da_commitment",
                         "type": {
-                            "array": [
-                                "u8",
-                                32
-                            ]
+                            "defined": {
+                                "name": "Commitment"
+                            }
                         }
                     },
                     {
                         "name": "effects_root",
                         "type": {
-                            "array": [
-                                "u8",
-                                32
-                            ]
+                            "defined": {
+                                "name": "Commitment"
+                            }
                         }
                     }
                 ]
@@ -1334,6 +1344,20 @@
                 ]
             }
         },
+        {
+            "name": "Commitment",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "array": [
+                            "u8",
+                            32
+                        ]
+                    }
+                ]
+            }
+        },
         {
             "name": "Deposit",
             "type": {
@@ -1350,22 +1374,14 @@
                     {
                         "name": "prev_deposit_root",
                         "type": {
-                            "array": [
-                                "u8",
-                                32
-                            ]
+                            "defined": {
+                                "name": "Commitment"
+                            }
                         }
                     }
                 ]
             }
         },
-        {
-            "name": "EffectNullifier",
-            "type": {
-                "kind": "struct",
-                "fields": []
-            }
-        },
         {
             "name": "FactState",
             "type": {
@@ -1404,19 +1420,17 @@
                     {
                         "name": "app_state_commitment",
                         "type": {
-                            "array": [
-                                "u8",
-                                32
-                            ]
+                            "defined": {
+                                "name": "Commitment"
+                            }
                         }
                     },
                     {
                         "name": "deposit_root",
                         "type": {
-                            "array": [
-                                "u8",
-                                32
-                            ]
+                            "defined": {
+                                "name": "Commitment"
+                            }
                         }
                     },
                     {
@@ -1471,10 +1485,9 @@
                         "name": "proof",
                         "type": {
                             "vec": {
-                                "array": [
-                                    "u8",
-                                    32
-                                ]
+                                "defined": {
+                                    "name": "Commitment"
+                                }
                             }
                         }
                     },

package/dist/idl/index.d.ts

@@ -132,13 +132,6 @@ export declare const BRIDGE_IDL: {
         accounts: ({
             name: string;
             writable: boolean;
-            signer: boolean;
-            pda?: undefined;
-            address?: undefined;
-        } | {
-            name: string;
-            writable: boolean;
-            signer?: undefined;
             pda?: undefined;
             address?: undefined;
         } | {
@@ -155,7 +148,6 @@ export declare const BRIDGE_IDL: {
                     value?: undefined;
                 })[];
             };
-            signer?: undefined;
             address?: undefined;
         } | {
             name: string;
@@ -171,19 +163,16 @@ export declare const BRIDGE_IDL: {
                 })[];
             };
             writable?: undefined;
-            signer?: undefined;
             address?: undefined;
         } | {
             name: string;
             writable?: undefined;
-            signer?: undefined;
             pda?: undefined;
             address?: undefined;
         } | {
             name: string;
             address: string;
             writable?: undefined;
-            signer?: undefined;
             pda?: undefined;
         })[];
         args: {
@@ -319,13 +308,6 @@ export declare const BRIDGE_IDL: {
             writable?: undefined;
             signer?: undefined;
             address?: undefined;
-        } | {
-            name: string;
-            writable?: undefined;
-            signer?: undefined;
-            optional?: undefined;
-            pda?: undefined;
-            address?: undefined;
         } | {
             name: string;
             pda: {
@@ -343,6 +325,13 @@ export declare const BRIDGE_IDL: {
             signer?: undefined;
             optional?: undefined;
             address?: undefined;
+        } | {
+            name: string;
+            writable?: undefined;
+            signer?: undefined;
+            optional?: undefined;
+            pda?: undefined;
+            address?: undefined;
         } | {
             name: string;
             address: string;
@@ -412,6 +401,64 @@ export declare const BRIDGE_IDL: {
             name: string;
             type: string;
         }[];
+    } | {
+        name: string;
+        discriminator: number[];
+        accounts: ({
+            name: string;
+            writable: boolean;
+            signer: boolean;
+            pda?: undefined;
+            address?: undefined;
+        } | {
+            name: string;
+            writable?: undefined;
+            signer?: undefined;
+            pda?: undefined;
+            address?: undefined;
+        } | {
+            name: string;
+            writable: boolean;
+            pda: {
+                seeds: ({
+                    kind: string;
+                    value: number[];
+                    path?: undefined;
+                } | {
+                    kind: string;
+                    path: string;
+                    value?: undefined;
+                })[];
+            };
+            signer?: undefined;
+            address?: undefined;
+        } | {
+            name: string;
+            pda: {
+                seeds: ({
+                    kind: string;
+                    value: number[];
+                    path?: undefined;
+                } | {
+                    kind: string;
+                    path: string;
+                    value?: undefined;
+                })[];
+            };
+            writable?: undefined;
+            signer?: undefined;
+            address?: undefined;
+        } | {
+            name: string;
+            address: string;
+            writable?: undefined;
+            signer?: undefined;
+            pda?: undefined;
+        })[];
+        args: {
+            name: string;
+            type: string;
+        }[];
     } | {
         name: string;
         discriminator: number[];
@@ -523,21 +570,9 @@ export declare const BRIDGE_IDL: {
         name: string;
         type: {
             kind: string;
-            fields: ({
-                name: string;
-                type: {
-                    defined: {
-                        name: string;
-                    };
-                    array?: undefined;
-                };
-            } | {
-                name: string;
-                type: {
-                    array: (string | number)[];
-                    defined?: undefined;
-                };
-            })[];
+            fields: {
+                array: (string | number)[];
+            }[];
             variants?: undefined;
         };
     } | {
@@ -549,21 +584,6 @@ export declare const BRIDGE_IDL: {
             }[];
             fields?: undefined;
         };
-    } | {
-        name: string;
-        type: {
-            kind: string;
-            fields: ({
-                name: string;
-                type: {
-                    array: (string | number)[];
-                };
-            } | {
-                name: string;
-                type: string;
-            })[];
-            variants?: undefined;
-        };
     } | {
         name: string;
         type: {
@@ -575,7 +595,9 @@ export declare const BRIDGE_IDL: {
                 name: string;
                 type: {
                     vec: {
-                        array: (string | number)[];
+                        defined: {
+                            name: string;
+                        };
                     };
                 };
             })[];

package/dist/index.d.ts

@@ -3,6 +3,4 @@ export * from "./utils";
 export * from "./const";
 export * from "./nord";
 export * from "./websocket/index";
-export * from "./bridge/client";
-export * from "./bridge/types";
-export { bridgeToBN, fromBN, keypairFromPrivateKey, makeSigningFunction, findPda, bufferToHex, hexToBuffer, shortenPublicKey, } from "./bridge/utils";
+export { ProtonClient, buildDepositTx, createTokenAccountIfNeeded, type DepositSplParams, type WithdrawalParams, type WithdrawalClaim, type SPLTokenInfo, } from "@n1xyz/proton";

package/dist/index.js

@@ -14,7 +14,7 @@ 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.shortenPublicKey = exports.hexToBuffer = exports.bufferToHex = exports.findPda = exports.makeSigningFunction = exports.keypairFromPrivateKey = exports.fromBN = exports.bridgeToBN = void 0;
+exports.createTokenAccountIfNeeded = exports.buildDepositTx = exports.ProtonClient = void 0;
 // Export types
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
@@ -23,15 +23,8 @@ __exportStar(require("./const"), exports);
 __exportStar(require("./nord"), exports);
 // Export WebSocket modules
 __exportStar(require("./websocket/index"), exports);
-// Export bridge modules
-__exportStar(require("./bridge/client"), exports);
-__exportStar(require("./bridge/types"), exports);
-var utils_1 = require("./bridge/utils");
-Object.defineProperty(exports, "bridgeToBN", { enumerable: true, get: function () { return utils_1.bridgeToBN; } });
-Object.defineProperty(exports, "fromBN", { enumerable: true, get: function () { return utils_1.fromBN; } });
-Object.defineProperty(exports, "keypairFromPrivateKey", { enumerable: true, get: function () { return utils_1.keypairFromPrivateKey; } });
-Object.defineProperty(exports, "makeSigningFunction", { enumerable: true, get: function () { return utils_1.makeSigningFunction; } });
-Object.defineProperty(exports, "findPda", { enumerable: true, get: function () { return utils_1.findPda; } });
-Object.defineProperty(exports, "bufferToHex", { enumerable: true, get: function () { return utils_1.bufferToHex; } });
-Object.defineProperty(exports, "hexToBuffer", { enumerable: true, get: function () { return utils_1.hexToBuffer; } });
-Object.defineProperty(exports, "shortenPublicKey", { enumerable: true, get: function () { return utils_1.shortenPublicKey; } });
+// Re-export proton bridge functionality for backward compatibility
+var proton_1 = require("@n1xyz/proton");
+Object.defineProperty(exports, "ProtonClient", { enumerable: true, get: function () { return proton_1.ProtonClient; } });
+Object.defineProperty(exports, "buildDepositTx", { enumerable: true, get: function () { return proton_1.buildDepositTx; } });
+Object.defineProperty(exports, "createTokenAccountIfNeeded", { enumerable: true, get: function () { return proton_1.createTokenAccountIfNeeded; } });

package/dist/nord/api/actions.d.ts

@@ -1,4 +1,5 @@
 import Decimal from "decimal.js";
+import * as proto from "../../gen/nord";
 import { FillMode, Side } from "../../types";
 import { BigIntValue } from "../../utils";
 declare function createSessionImpl(sendFn: (encoded: Uint8Array) => Promise<Uint8Array>, walletSignFn: (message: string | Uint8Array) => Promise<Uint8Array>, currentTimestamp: bigint, nonce: number, params: {
@@ -22,13 +23,17 @@ declare function withdrawImpl(sendFn: (encoded: Uint8Array) => Promise<Uint8Arra
     sessionId: BigIntValue;
     tokenId: number;
     amount: Decimal.Value;
-}): Promise<void>;
+}): Promise<{
+    actionId: bigint;
+} & proto.Receipt_WithdrawResult>;
 export declare function withdraw(serverUrl: string, signFn: (message: Uint8Array) => Promise<Uint8Array>, currentTimestamp: bigint, nonce: number, params: {
     sizeDecimals: number;
     sessionId: BigIntValue;
     tokenId: number;
     amount: number;
-}): Promise<void>;
+}): Promise<{
+    actionId: bigint;
+} & proto.Receipt_WithdrawResult>;
 declare function placeOrderImpl(sendFn: (encoded: Uint8Array) => Promise<Uint8Array>, signFn: (message: Uint8Array) => Promise<Uint8Array>, currentTimestamp: bigint, nonce: number, params: {
     sessionId: BigIntValue;
     senderId?: number;

package/dist/nord/api/actions.js

@@ -140,7 +140,13 @@ async function withdrawImpl(sendFn, signFn, currentTimestamp, nonce, params) {
             },
         },
     };
-    await sendAction(sendFn, (m) => sessionSign(signFn, m), action, "withdraw");
+    const resp = await sendAction(sendFn, (m) => sessionSign(signFn, m), action, "withdraw");
+    if (resp.kind?.$case === "withdrawResult") {
+        return { actionId: resp.actionId, ...resp.kind.value };
+    }
+    else {
+        throw new Error(`Unexpected receipt kind ${resp.kind?.$case}`);
+    }
 }
 async function withdraw(serverUrl, signFn, currentTimestamp, nonce, params) {
     return withdrawImpl(makeSendHttp(serverUrl), signFn, currentTimestamp, nonce, params);

package/dist/nord/api/core.d.ts

@@ -15,7 +15,7 @@ export declare function getTimestamp(webServerUrl: string): Promise<bigint>;
  * @returns Next action nonce
  * @throws {NordError} If the request fails
  */
-export declare function getActionNonce(webServerUrl: string): Promise<number>;
+export declare function getLastEventNonce(webServerUrl: string): Promise<number>;
 /**
  * Get information about the Nord server
  *

package/dist/nord/api/core.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTimestamp = getTimestamp;
-exports.getActionNonce = getActionNonce;
+exports.getLastEventNonce = getLastEventNonce;
 exports.getInfo = getInfo;
 exports.getAccount = getAccount;
 exports.initWebSocketClient = initWebSocketClient;
@@ -31,9 +31,9 @@ async function getTimestamp(webServerUrl) {
  * @returns Next action nonce
  * @throws {NordError} If the request fails
  */
-async function getActionNonce(webServerUrl) {
+async function getLastEventNonce(webServerUrl) {
     try {
-        const response = await (0, utils_1.checkedFetch)(`${webServerUrl}/action_nonce`);
+        const response = await (0, utils_1.checkedFetch)(`${webServerUrl}/event/last-acked-nonce`);
         const data = await response.json();
         return data.nonce;
     }

package/dist/nord/api/market.js

@@ -60,9 +60,7 @@ async function getTrades(webServerUrl, query) {
  */
 async function getUserAccountIds(webServerUrl, query) {
     try {
-        const params = new URLSearchParams();
-        params.append("pubkey", query.pubkey);
-        const response = await (0, utils_1.checkedFetch)(`${webServerUrl}/user?${params.toString()}`);
+        const response = await (0, utils_1.checkedFetch)(`${webServerUrl}/user/${query.pubkey.toString()}`);
         return await response.json();
     }
     catch (error) {

package/dist/nord/api/queries.js

@@ -57,9 +57,9 @@ async function queryRecentActions(webServerUrl, from, to) {
  */
 async function getLastActionId(webServerUrl) {
     try {
-        const response = await (0, utils_1.checkedFetch)(`${webServerUrl}/last_actionid`);
+        const response = await (0, utils_1.checkedFetch)(`${webServerUrl}/actions/last-id`);
         const data = await response.json();
-        return data.last_actionid;
+        return data;
     }
     catch (error) {
         throw new NordError_1.NordError("Failed to get last action ID", {

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

@@ -1,7 +1,9 @@
 import { EventEmitter } from "events";
 import { Account, ActionQuery, ActionResponse, ActionsResponse, AggregateMetrics, Info, Market, MarketsStatsResponse, NordConfig, OrderbookQuery, OrderbookResponse, PeakTpsPeriodUnit, RollmanActionResponse, RollmanActionsResponse, Token, TradesQuery, TradesResponse, UserAccountIdsQuery, UserAccountIdsResponse } from "../../types";
+import { ProtonClient } from "@n1xyz/proton";
 import { NordWebSocketClient } from "../../websocket/index";
 import { OrderbookSubscription, TradeSubscription } from "../models/Subscriber";
+import { PublicKey } from "@solana/web3.js";
 /**
  * User subscription interface
  */
@@ -26,9 +28,7 @@ export declare class Nord {
     /** Base URL for the Nord web server */
     readonly webServerUrl: string;
     /** Bridge verification key */
-    readonly bridgeVk: string;
-    /** Optional Solana program ID (will be derived from bridgeVk) */
-    private _solanaProgramId;
+    readonly bridgeVk: PublicKey;
     /** Solana RPC URL */
     readonly solanaUrl: string;
     /** Available markets */
@@ -37,6 +37,8 @@ export declare class Nord {
     tokens: Token[];
     /** Map of symbol to market_id */
     private symbolToMarketId;
+    /** Proton client for bridge and indexd operations */
+    protonClient: ProtonClient;
     /**
      * Create a new Nord client
      *
@@ -46,7 +48,7 @@ export declare class Nord {
      * @param config.solanaUrl - Solana cluster URL
      * @throws {Error} If required configuration is missing
      */
-    constructor(config: NordConfig);
+    private constructor();
     /**
      * Create a WebSocket client with specific subscriptions
      *
@@ -77,7 +79,7 @@ export declare class Nord {
      */
     getTimestamp(): Promise<bigint>;
     /**
-     * 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
@@ -99,19 +101,12 @@ export declare class Nord {
      * @returns Initialized Nord client
      * @throws {NordError} If initialization fails
      */
-    static initNord(nordConfig: NordConfig): Promise<Nord>;
+    static initNord({ bridgeVk: bridgeVk_, solanaUrl, webServerUrl, }: Readonly<NordConfig>): Promise<Nord>;
     /**
-     * Initialize the Nord client by deriving program ID and fetching info
+     * Initialize the Nord client
      * @private
      */
     private init;
-    /**
-     * Get the Solana program ID derived from bridge VK
-     *
-     * @returns Program ID string
-     * @throws {NordError} If program ID hasn't been initialized
-     */
-    getSolanaProgramId(): string;
     /**
      * Get market statistics
      *