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

package/dist/types.d.ts

@@ -35,22 +35,11 @@ export interface NordConfig {
     bridgeVk: string;
     /** Solana cluster URL */
     solanaUrl: string;
-    /** Whether to initialize WebSockets on creation, defaults to true */
-    initWebSockets?: boolean;
-    /**
-     * Initial subscriptions for the trades WebSocket
-     * Supports both formats:
-     * - Legacy format: ["BTCUSDC", "ETHUSDC"]
-     * - New format: ["trades@BTCUSDC", "trades@ETHUSDC"]
-     */
-    tradesSubscriptions?: SubscriptionPattern[];
     /**
-     * Initial subscriptions for the deltas WebSocket
-     * Supports both formats:
-     * - Legacy format: ["BTCUSDC", "ETHUSDC"]
-     * - New format: ["deltas@BTCUSDC", "deltas@ETHUSDC"]
+     * Whether to initialize WebSockets on creation, defaults to true
+     * @deprecated this is a funky api we're gonna be removing it
      */
-    deltasSubscriptions?: SubscriptionPattern[];
+    initWebSockets?: boolean;
 }
 /**
  * Configuration options for the Nord client
@@ -132,7 +121,7 @@ export interface OrderInfo {
     size: number;
     account_id: number;
 }
-interface HashMap<T> {
+export interface HashMap<T> {
     [key: number]: T;
 }
 export interface Account {
@@ -146,17 +135,16 @@ export interface Account {
 }
 /**
  * Query the transactions in the specified L2 block.
- * @field {number} block_number specifies the block number to query.
- *                 If not specified, transactions from latest block
- *                 are returned.
+ * block_number specifies the block number to query.
+ * If not specified, transactions from latest block are returned.
  */
 export interface BlockQuery {
     block_number?: number;
 }
 /**
  * Response for BlockQuery.
- * @field {number} block_number specifies the block number being returned.
- * @field {BlockActions} actions are the list of transactions from the block.
+ * block_number specifies the block number being returned.
+ * actions are the list of transactions from the block.
  */
 export interface BlockResponse {
     block_number: number;
@@ -164,26 +152,25 @@ export interface BlockResponse {
 }
 /**
  * Response for BlockSummaryQuery.
- * @field {BlockSummary} block_summary is the summary of upto the last N blocks.
- *                       The server can return fewer than last_n block summary if
- *                       fewer blocks are available or if it exceeds a max cap.
+ * block_summary is the summary of upto the last N blocks.
+ * The server can return fewer than last_n block summary if
+ * fewer blocks are available or if it exceeds a max cap.
  */
 export interface BlockSummaryResponse {
     block_summary: BlockSummary[];
 }
 /**
  * Query the action for the specified action id.
- * @field {number} action_id specifies the action to query.
+ * action_id specifies the action to query.
  */
 export interface ActionQuery {
     action_id: number;
 }
 /**
  * Response for ActionQuery.
- * @field {number} block_number the block the action is part of.
- *                 If the action is not yet included in any block,
- *                 null is returned.
- * @field {Action} the transaction.
+ * block_number the block the action is part of.
+ * If the action is not yet included in any block, null is returned.
+ * action the transaction.
  */
 export interface ActionResponse {
     block_number?: number;
@@ -191,26 +178,25 @@ export interface ActionResponse {
 }
 /**
  * Query the recent actions
- * @field {number} last_n requests last N actions.
- * @field {number} action_id specifies the action to query.
+ * last_n requests last N actions.
  */
 export interface ActionsQuery {
     last_n: number;
 }
 /**
  * Response for ActionsQuery.
- * @field {ActionsExtendedInfo} actions returns upto the last N actions.
- *                       The server can return fewer than last_n actions if
- *                       fewer actions are available or if it exceeds a max cap.
+ * actions returns upto the last N actions.
+ * The server can return fewer than last_n actions if
+ * fewer actions are available or if it exceeds a max cap.
  */
 export interface ActionsResponse {
     actions: ActionsExtendedInfo[];
 }
 /**
  * Block summary.
- * @field {number} block_number Block number.
- * @field {Action} from First action_id in the block.
- * @field {Action} to Last action_id in the block.
+ * block_number Block number.
+ * from_action_id First action_id in the block.
+ * to_action_id Last action_id in the block.
  */
 export interface BlockSummary {
     block_number: number;
@@ -219,9 +205,9 @@ export interface BlockSummary {
 }
 /**
  * Info about the block transaction.
- * @field {number} action_id is the action identifier.
- * @field {Action} action in protobuf format.
- * @field {number} exec_timestamp is the execution timestamp.
+ * action_id is the action identifier.
+ * action in protobuf format.
+ * exec_timestamp is the execution timestamp.
  */
 export interface ActionInfo {
     action_id: number;
@@ -230,11 +216,10 @@ export interface ActionInfo {
 }
 /**
  * Extended info about the block transaction.
- * @field {number} block_number the block the action is part of.
- *                 If the action is not yet included in any block,
- *                 null is returned.
- * @field {number} action_id of the action.
- * @field {Action} action the transaction.
+ * block_number the block the action is part of.
+ * If the action is not yet included in any block, null is returned.
+ * action_id of the action.
+ * action the transaction.
  */
 export interface ActionsExtendedInfo {
     block_number?: number;
@@ -243,11 +228,11 @@ export interface ActionsExtendedInfo {
 }
 /**
  * Aggregate metrics
- * @field {number} blocks_total: Total number of L2 blocks.
- * @field {number} tx_total: Total number of transactions.
- * @field {number} tx_tps: Transaction throughput.
- * @field {number} tx_tps_peak: Peak transaction throughput.
- * @field {number} request_latency_average: Average request latency.
+ * blocks_total: Total number of L2 blocks.
+ * tx_total: Total number of transactions.
+ * tx_tps: Transaction throughput.
+ * tx_tps_peak: Peak transaction throughput.
+ * request_latency_average: Average request latency.
  */
 export interface AggregateMetrics {
     blocks_total: number;
@@ -420,4 +405,3 @@ export interface WebSocketAccountUpdate {
     timestamp: number;
 }
 export type WebSocketMessage = WebSocketSubscription | WebSocketTradeUpdate | WebSocketDeltaUpdate | WebSocketAccountUpdate;
-export {};

package/dist/utils.d.ts

@@ -3,7 +3,7 @@ import { KeyType, type Market, type Token } from "./types";
 import * as proto from "./gen/nord";
 import { ethers } from "ethers";
 import { RequestInfo, RequestInit, Response } from "node-fetch";
-import { BN } from "@coral-xyz/anchor";
+import { Keypair } from "@solana/web3.js";
 export declare const SESSION_TTL: bigint;
 export declare const ZERO_DECIMAL: Decimal;
 export declare const MAX_BUFFER_LEN = 10000;
@@ -113,11 +113,4 @@ export declare function decodeLengthDelimited<T, M extends proto.MessageFns<T>>(
 export declare function checkPubKeyLength(keyType: KeyType, len: number): void;
 export declare function findMarket(markets: Market[], marketId: number): Market;
 export declare function findToken(tokens: Token[], tokenId: number): Token;
-/**
- * Convert a number to a BN with the specified number of decimals
- *
- * @param amount Amount as a number
- * @param decimals Number of decimal places
- * @returns Amount as a BN
- */
-export declare function toBN(amount: number, decimals: number): BN;
+export declare function keypairFromPrivateKey(privateKey: string | Uint8Array): Keypair;

package/dist/utils.js

@@ -18,7 +18,7 @@ exports.decodeLengthDelimited = decodeLengthDelimited;
 exports.checkPubKeyLength = checkPubKeyLength;
 exports.findMarket = findMarket;
 exports.findToken = findToken;
-exports.toBN = toBN;
+exports.keypairFromPrivateKey = keypairFromPrivateKey;
 const decimal_js_1 = require("decimal.js");
 const ed25519_1 = require("@noble/curves/ed25519");
 const bls12_381_1 = require("@noble/curves/bls12-381");
@@ -28,7 +28,8 @@ const types_1 = require("./types");
 const wire_1 = require("@bufbuild/protobuf/wire");
 const ethers_1 = require("ethers");
 const node_fetch_1 = __importDefault(require("node-fetch"));
-const anchor_1 = require("@coral-xyz/anchor");
+const web3_js_1 = require("@solana/web3.js");
+const bs58_1 = __importDefault(require("bs58"));
 exports.SESSION_TTL = 60n * 60n * 24n * 30n;
 exports.ZERO_DECIMAL = new decimal_js_1.Decimal(0);
 exports.MAX_BUFFER_LEN = 10000;
@@ -257,20 +258,14 @@ function findToken(tokens, tokenId) {
     }
     return tokens[tokenId];
 }
-/**
- * Convert a number to a BN with the specified number of decimals
- *
- * @param amount Amount as a number
- * @param decimals Number of decimal places
- * @returns Amount as a BN
- */
-function toBN(amount, decimals) {
-    const amountString = amount.toFixed(decimals);
-    const [whole, fraction] = amountString.split(".");
-    // Convert to smallest units (no decimals)
-    const wholeBN = new anchor_1.BN(whole).mul(new anchor_1.BN(10).pow(new anchor_1.BN(decimals)));
-    const fractionBN = fraction
-        ? new anchor_1.BN(fraction.padEnd(decimals, "0").slice(0, decimals))
-        : new anchor_1.BN(0);
-    return wholeBN.add(fractionBN);
+function keypairFromPrivateKey(privateKey) {
+    if (typeof privateKey === "string") {
+        if (!privateKey.startsWith("0x")) {
+            return web3_js_1.Keypair.fromSecretKey(bs58_1.default.decode(privateKey));
+        }
+        const hex = privateKey.startsWith("0x") ? privateKey.slice(2) : privateKey;
+        const bytes = new Uint8Array(hex.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)));
+        return web3_js_1.Keypair.fromSecretKey(bytes);
+    }
+    return web3_js_1.Keypair.fromSecretKey(privateKey);
 }

package/package.json

@@ -1,21 +1,9 @@
 {
   "name": "@n1xyz/nord-ts",
-  "version": "0.0.16",
+  "version": "0.0.18-8121ed05.0",
   "description": "Typescript for Nord",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "scripts": {
-    "dev": "nodemon --exec npx tsc",
-    "build:proto": "./protoc-generate.sh",
-    "build:idl": "./idl-generate.sh",
-    "build": "pnpm run build:proto && pnpm run build:idl && pnpm exec tsc && pnpm run docs",
-    "test": "pnpm exec jest",
-    "docs": "pnpm exec typedoc --out ./docs ./src",
-    "compile": "tsc",
-    "clean": "rm -rf ./src/gen ./dist ./docs",
-    "fmt": "prettier --write src tests",
-    "ci": "eslint && prettier --check src tests"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/n1xyz/nord.git"
@@ -28,7 +16,7 @@
     "@jest/types": "^29.6.3",
     "@types/google-protobuf": "^3.15.10",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.12.3",
+    "@types/node": "^22.15.29",
     "@types/node-fetch": "^2.6.9",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^8.26.1",
@@ -45,17 +33,28 @@
   },
   "dependencies": {
     "@bufbuild/protobuf": "^2.0.0",
-    "@coral-xyz/anchor": "^0.30.1",
     "@noble/curves": "^1.3.0",
     "@noble/ed25519": "^2.2.3",
     "@noble/hashes": "^1.3.2",
     "@solana/spl-token": "^0.4.13",
-    "@solana/web3.js": "1.92.1",
+    "@solana/web3.js": "^1.98.2",
     "bs58": "^6.0.0",
     "decimal.js": "^10.4.3",
     "ethers": "^6.11.1",
     "node-fetch": "2.6.13",
     "tweetnacl": "^1.0.3",
-    "ws": "^8.16.0"
+    "ws": "^8.16.0",
+    "@n1xyz/proton": "0.0.1-8121ed05.0"
+  },
+  "scripts": {
+    "dev": "nodemon --exec npx tsc",
+    "build:proto": "./protoc-generate.sh",
+    "build": "pnpm run build:proto && pnpm exec tsc && pnpm run docs",
+    "test": "pnpm exec jest",
+    "docs": "pnpm exec typedoc --out ./docs ./src",
+    "compile": "tsc",
+    "clean": "rm -rf ./src/gen ./dist ./docs",
+    "fmt": "prettier --write src tests",
+    "ci": "eslint && prettier --check src tests"
   }
-}
+}

package/src/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/src/index.ts

@@ -9,16 +9,13 @@ export * from "./nord";
 // Export WebSocket modules
 export * from "./websocket/index";
 
-// Export bridge modules
-export * from "./bridge/client";
-export * from "./bridge/types";
+// Re-export proton bridge functionality for backward compatibility
 export {
-  bridgeToBN,
-  fromBN,
-  keypairFromPrivateKey,
-  makeSigningFunction,
-  findPda,
-  bufferToHex,
-  hexToBuffer,
-  shortenPublicKey,
-} from "./bridge/utils";
+  ProtonClient,
+  buildDepositTx,
+  createTokenAccountIfNeeded,
+  type DepositSplParams,
+  type WithdrawalParams,
+  type WithdrawalClaim,
+  type SPLTokenInfo,
+} from "@n1xyz/proton";

package/src/nord/api/actions.ts

@@ -198,7 +198,7 @@ async function withdrawImpl(
     tokenId: number;
     amount: Decimal.Value;
   },
-): Promise<void> {
+): Promise<{ actionId: bigint } & proto.Receipt_WithdrawResult> {
   const amount = toScaledU64(params.amount, params.sizeDecimals);
 
   if (amount <= 0) {
@@ -218,7 +218,18 @@ async function withdrawImpl(
     },
   };
 
-  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}`);
+  }
 }
 
 export async function withdraw(
@@ -232,7 +243,7 @@ export async function withdraw(
     tokenId: number;
     amount: number;
   },
-): Promise<void> {
+): Promise<{ actionId: bigint } & proto.Receipt_WithdrawResult> {
   return withdrawImpl(
     makeSendHttp(serverUrl),
     signFn,

package/src/nord/api/core.ts

@@ -26,9 +26,11 @@ export async function getTimestamp(webServerUrl: string): Promise<bigint> {
  * @returns Next action nonce
  * @throws {NordError} If the request fails
  */
-export async function getActionNonce(webServerUrl: string): Promise<number> {
+export async function getLastEventNonce(webServerUrl: string): Promise<number> {
   try {
-    const response = await checkedFetch(`${webServerUrl}/action_nonce`);
+    const response = await checkedFetch(
+      `${webServerUrl}/event/last-acked-nonce`,
+    );
     const data = await response.json();
     return data.nonce;
   } catch (error) {

package/src/nord/api/market.ts

@@ -78,11 +78,8 @@ export async function getUserAccountIds(
   query: UserAccountIdsQuery,
 ): Promise<UserAccountIdsResponse> {
   try {
-    const params = new URLSearchParams();
-    params.append("pubkey", query.pubkey);
-
     const response = await checkedFetch(
-      `${webServerUrl}/user?${params.toString()}`,
+      `${webServerUrl}/user/${query.pubkey.toString()}`,
     );
     return await response.json();
   } catch (error) {

package/src/nord/api/queries.ts

@@ -73,9 +73,9 @@ export async function queryRecentActions(
  */
 export async function getLastActionId(webServerUrl: string): Promise<number> {
   try {
-    const response = await checkedFetch(`${webServerUrl}/last_actionid`);
+    const response = await checkedFetch(`${webServerUrl}/actions/last-id`);
     const data = await response.json();
-    return data.last_actionid;
+    return data;
   } catch (error) {
     throw new NordError("Failed to get last action ID", {
       cause: error,