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

package/src/types.ts

@@ -39,22 +39,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;
 }
 
 /**
@@ -150,7 +139,7 @@ export interface OrderInfo {
   account_id: number;
 }
 
-interface HashMap<T> {
+export interface HashMap<T> {
   [key: number]: T;
 }
 
@@ -166,9 +155,8 @@ 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;
@@ -176,8 +164,8 @@ export interface BlockQuery {
 
 /**
  * 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;
@@ -186,9 +174,9 @@ 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[];
@@ -196,7 +184,7 @@ export interface BlockSummaryResponse {
 
 /**
  * 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;
@@ -204,10 +192,9 @@ export interface ActionQuery {
 
 /**
  * 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;
@@ -216,8 +203,7 @@ 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;
@@ -225,9 +211,9 @@ export interface ActionsQuery {
 
 /**
  * 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[];
@@ -235,9 +221,9 @@ export interface ActionsResponse {
 
 /**
  * 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;
@@ -247,9 +233,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;
@@ -259,11 +245,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;
@@ -273,11 +258,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;

package/src/utils.ts

@@ -9,7 +9,8 @@ import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
 import { ethers } from "ethers";
 import fetch from "node-fetch";
 import { RequestInfo, RequestInit, Response } from "node-fetch";
-import { BN } from "@coral-xyz/anchor";
+import { Keypair } from "@solana/web3.js";
+import bs58 from "bs58";
 
 export const SESSION_TTL: bigint = 60n * 60n * 24n * 30n;
 export const ZERO_DECIMAL = new Decimal(0);
@@ -300,22 +301,18 @@ export function findToken(tokens: Token[], tokenId: number): Token {
   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
- */
-export function toBN(amount: number, decimals: number): BN {
-  const amountString = amount.toFixed(decimals);
-  const [whole, fraction] = amountString.split(".");
-
-  // Convert to smallest units (no decimals)
-  const wholeBN = new BN(whole).mul(new BN(10).pow(new BN(decimals)));
-  const fractionBN = fraction
-    ? new BN(fraction.padEnd(decimals, "0").slice(0, decimals))
-    : new BN(0);
-
-  return wholeBN.add(fractionBN);
+export function keypairFromPrivateKey(
+  privateKey: string | Uint8Array,
+): Keypair {
+  if (typeof privateKey === "string") {
+    if (!privateKey.startsWith("0x")) {
+      return Keypair.fromSecretKey(bs58.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 Keypair.fromSecretKey(bytes);
+  }
+  return Keypair.fromSecretKey(privateKey);
 }