@n1xyz/nord-ts 0.0.14 → 0.0.15

package/.prettierignore

@@ -1 +1,2 @@
 src/gen/*
+src/idl/*.json

package/README.md

@@ -41,12 +41,12 @@ import { Nord } from "nord-ts";
 // Create a Nord instance
 const nord = new Nord({
   webServerUrl: 'https://api.nord.exchange',
-  solanaProgramId: 'your_solana_program_id',
+  bridgeVk: 'your_bridge_vk', // Provide the bridge verification key
   solanaUrl: 'https://api.mainnet-beta.solana.com',
 });
 
 // Initialize and fetch market data
-await nord.fetchNordInfo();
+await Nord.initNord(nord); // Initialize client (derives program ID, fetches info)
 ```
 
 ### Creating a User from Private Key
@@ -55,12 +55,15 @@ await nord.fetchNordInfo();
 import { Nord, NordUser } from "nord-ts";
 import { Connection } from "@solana/web3.js";
 
-// Create Nord instance
-const nord = new Nord({
+// Define Nord configuration
+const nordConfig = {
   webServerUrl: 'https://api.nord.exchange',
-  solanaProgramId: 'your_solana_program_id',
+  bridgeVk: 'your_bridge_vk', // Provide the bridge verification key
   solanaUrl: 'https://api.mainnet-beta.solana.com',
-});
+};
+
+// Initialize Nord client asynchronously
+const nord = await Nord.initNord(nordConfig);
 
 // Optional Solana connection
 const connection = new Connection('https://api.mainnet-beta.solana.com');

package/dist/bridge/client.d.ts

@@ -16,6 +16,7 @@ export declare class SolanaBridgeClient {
     config: SolanaBridgeConfig;
     /** Anchor provider */
     provider: AnchorProvider;
+    bridge: PublicKey;
     /**
      * Create a new Solana Bridge Client
      *
@@ -26,17 +27,17 @@ export declare class SolanaBridgeClient {
     /**
      * Derive a PDA (Program Derived Address) for the given seeds
      *
+     * Seeds can be of type:
+     * - Buffer: raw bytes
+     * - PublicKey: Solana public key
+     * - string: string encoded as UTF-8 bytes
+     * - number: u64 encoded as little-endian 8 bytes
+     *
      * @param type PDA seed type
      * @param seeds Additional seeds
      * @returns [PDA, bump]
      */
-    findPda(type: PdaSeedType, ...seeds: (Buffer | PublicKey | string | number)[]): Promise<[PublicKey, number]>;
-    /**
-     * Find the contract storage PDA
-     *
-     * @returns [PDA, bump]
-     */
-    findContractStoragePda(): Promise<[PublicKey, number]>;
+    findPda(type: PdaSeedType, ...seeds: any[]): Promise<[PublicKey, number]>;
     /**
      * Find the asset config PDA for a token mint
      *

package/dist/bridge/client.js

@@ -39,8 +39,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const types_1 = require("./types");
-// Import the BRIDGE_IDL
-const bridge_1 = require("../idl/bridge");
+const idl_1 = require("../idl");
 /**
  * Solana Bridge Client for interacting with the bridge program
  */
@@ -66,11 +65,18 @@ class SolanaBridgeClient {
         anchor.setProvider(provider);
         // Store the provider
         this.provider = provider;
-        this.program = new anchor.Program({ ...bridge_1.BRIDGE_IDL, address: config.programId }, provider);
+        this.program = new anchor.Program({ ...idl_1.BRIDGE_IDL, address: config.programId }, provider);
+        this.bridge = new web3_js_1.PublicKey(config.bridgeVk);
     }
     /**
      * Derive a PDA (Program Derived Address) for the given seeds
      *
+     * Seeds can be of type:
+     * - Buffer: raw bytes
+     * - PublicKey: Solana public key
+     * - string: string encoded as UTF-8 bytes
+     * - number: u64 encoded as little-endian 8 bytes
+     *
      * @param type PDA seed type
      * @param seeds Additional seeds
      * @returns [PDA, bump]
@@ -91,19 +97,13 @@ class SolanaBridgeClient {
                     buffer.writeBigUInt64LE(BigInt(seed), 0);
                     return buffer;
                 }
-                return seed;
+                else {
+                    return seed.toBytes();
+                }
             }),
         ];
         return web3_js_1.PublicKey.findProgramAddressSync(seedBuffers, this.programId);
     }
-    /**
-     * Find the contract storage PDA
-     *
-     * @returns [PDA, bump]
-     */
-    async findContractStoragePda() {
-        return this.findPda(types_1.PdaSeedType.ContractStorage);
-    }
     /**
      * Find the asset config PDA for a token mint
      *
@@ -111,7 +111,7 @@ class SolanaBridgeClient {
      * @returns [PDA, bump]
      */
     async findAssetConfigPda(mint) {
-        return this.findPda(types_1.PdaSeedType.AssetConfig, mint);
+        return this.findPda(types_1.PdaSeedType.AssetConfig, this.bridge, mint);
     }
     /**
      * Find the deposit storage PDA for a deposit index
@@ -120,7 +120,7 @@ class SolanaBridgeClient {
      * @returns [PDA, bump]
      */
     async findDepositStoragePda(depositIndex) {
-        return this.findPda(types_1.PdaSeedType.DepositStorage, depositIndex);
+        return this.findPda(types_1.PdaSeedType.DepositStorage, this.bridge, depositIndex);
     }
     /**
      * Find the block storage PDA for a block ID
@@ -129,7 +129,7 @@ class SolanaBridgeClient {
      * @returns [PDA, bump]
      */
     async findBlockStoragePda(blockId) {
-        return this.findPda(types_1.PdaSeedType.BlockStorage, blockId);
+        return this.findPda(types_1.PdaSeedType.BlockStorage, this.bridge, blockId);
     }
     /**
      * Find the withdrawal nullifier PDA
@@ -171,11 +171,10 @@ class SolanaBridgeClient {
      * @returns Transaction signature
      */
     async depositSpl(params) {
-        const [contractStorage] = await this.findContractStoragePda();
         const [assetConfig] = await this.findAssetConfigPda(params.mint);
         // Get the last deposit index from contract storage
-        const contractStorageAccount = await this.program.account.contractStorage.fetch(contractStorage);
-        const lastDepositIndex = contractStorageAccount.lastDepositIndex.toNumber();
+        const bridgeAccount = await this.program.account.bridge.fetch(this.bridge);
+        const lastDepositIndex = bridgeAccount.lastDepositIndex.toNumber();
         // Find the deposit PDA for this deposit
         const [deposit] = await this.findDepositStoragePda(lastDepositIndex + 1);
         // Find the previous deposit PDA if it exists
@@ -184,32 +183,38 @@ class SolanaBridgeClient {
             const [prevDepositPda] = await this.findDepositStoragePda(lastDepositIndex);
             prevDeposit = prevDepositPda;
         }
+        const tokenAuthority = (await this.findPda(types_1.PdaSeedType.TokenAuthority, this.bridge))[0];
+        const crumbAuthority = (await this.findPda(types_1.PdaSeedType.CrumbAuthority, this.bridge))[0];
+        const toAccount = await (0, spl_token_1.getAssociatedTokenAddress)(params.mint, tokenAuthority, true, spl_token_1.TOKEN_2022_PROGRAM_ID);
         // Build the transaction
         const accounts = {
-            depositor: this.provider.wallet.publicKey,
+            payer: this.provider.wallet.publicKey,
             deposit,
             assetConfig,
-            contractStorage,
+            bridge: this.bridge,
+            program: this.programId,
             fromAccount: params.fromAccount,
-            toAccount: params.toAccount,
+            toAccount: toAccount,
             tokenProgram: spl_token_1.TOKEN_2022_PROGRAM_ID,
             systemProgram: web3_js_1.SystemProgram.programId,
+            crumbAuthority,
+            tokenAuthority,
         };
+        const allAccounts = { ...accounts, prevDeposit: prevDeposit };
         // Create the transaction
-        const tx = await this.program.methods
-            .depositSpl(params.amount)
-            .accounts({ ...accounts, prevDeposit: prevDeposit })
-            .transaction();
+        const tx = await (await this.program.methods
+            .deposit(this.provider.wallet.publicKey, params.amount)
+            .accounts(allAccounts)).transaction();
         // Check if toAccount is initialized and add preinstruction if needed
         try {
-            await this.connection.getTokenAccountBalance(params.toAccount);
+            await this.connection.getTokenAccountBalance(toAccount);
         }
         catch {
             // Account doesn't exist, add instruction to create it
             // Get the authority PDA which is the owner of the toAccount
             const [authority] = await this.findAuthorityPda();
             const createTokenAccountIx = (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.provider.wallet.publicKey, // payer
-            params.toAccount, // associated token account address
+            toAccount, // associated token account address
             authority, // owner of the token account
             params.mint, // token mint
             spl_token_1.TOKEN_2022_PROGRAM_ID);
@@ -255,14 +260,13 @@ class SolanaBridgeClient {
      * @returns Transaction signature
      */
     async whitelistAsset(mint, signer) {
-        const [contractStorage] = await this.findContractStoragePda();
         const [assetWhitelisted] = await this.findAssetConfigPda(mint);
         // Build the transaction
         const tx = await this.program.methods
             .whitelistAsset(mint)
             .accounts({
             operator: signer.publicKey,
-            contractStorage,
+            bridge: this.bridge,
             assetWhitelisted,
             systemProgram: web3_js_1.SystemProgram.programId,
         })
@@ -278,10 +282,9 @@ class SolanaBridgeClient {
      * @returns Transaction signature
      */
     async proposeBlock(facts, signer) {
-        const [contractStorage] = await this.findContractStoragePda();
         // Get the last block ID from contract storage
-        const contractStorageAccount = await this.program.account.contractStorage.fetch(contractStorage);
-        const [block] = await this.findBlockStoragePda(contractStorageAccount.lastBlockId.toNumber() + 1);
+        const bridgeAccount = await this.program.account.bridge.fetch(this.bridge);
+        const [block] = await this.findBlockStoragePda(bridgeAccount.lastBlockId.toNumber() + 1);
         // Find the last deposit PDA
         const [lastDeposit] = await this.findDepositStoragePda(facts.nextStateFacts.lastDepositIndex.toNumber());
         // Find the DA fact state
@@ -294,7 +297,7 @@ class SolanaBridgeClient {
             block,
             lastDeposit,
             daFactState,
-            contractStorage,
+            bridge: this.bridge,
             systemProgram: web3_js_1.SystemProgram.programId,
         })
             .transaction();
@@ -310,7 +313,6 @@ class SolanaBridgeClient {
      * @returns Transaction signature
      */
     async finalizeBlock(blockId, stateUpdateId, signer) {
-        const [contractStorage] = await this.findContractStoragePda();
         const [block] = await this.findBlockStoragePda(blockId);
         // Build the transaction
         const tx = await this.program.methods
@@ -318,7 +320,7 @@ class SolanaBridgeClient {
             .accounts({
             payer: signer.publicKey,
             block,
-            contractStorage,
+            bridge: this.bridge,
             systemProgram: web3_js_1.SystemProgram.programId,
         })
             .transaction();
@@ -355,14 +357,13 @@ class SolanaBridgeClient {
      * @returns Transaction signature
      */
     async initialize(operator, initialAppStateCommitment, signer) {
-        const [contractStorage] = await this.findContractStoragePda();
         // Build the transaction
         const tx = await this.program.methods
             .initialize(operator, Array.from(initialAppStateCommitment))
             .accounts({
             payer: signer.publicKey,
             program: this.programId,
-            contractStorage,
+            bridge: this.bridge,
             systemProgram: web3_js_1.SystemProgram.programId,
         })
             .transaction();

package/dist/bridge/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./client";
 export * from "./types";
 export * from "./utils";
-import { BRIDGE_IDL } from "../idl/bridge";
-export { BRIDGE_IDL };
+export { BRIDGE_IDL } from "../idl";

package/dist/bridge/index.js

@@ -19,5 +19,5 @@ __exportStar(require("./client"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
 // Re-export the IDL for convenience
-const bridge_1 = require("../idl/bridge");
-Object.defineProperty(exports, "BRIDGE_IDL", { enumerable: true, get: function () { return bridge_1.BRIDGE_IDL; } });
+var idl_1 = require("../idl");
+Object.defineProperty(exports, "BRIDGE_IDL", { enumerable: true, get: function () { return idl_1.BRIDGE_IDL; } });

package/dist/bridge/types.d.ts

@@ -8,6 +8,8 @@ export interface SolanaBridgeConfig {
     rpcUrl: string;
     /** Program ID for the bridge program */
     programId: string;
+    /** Bridge Verifying Key */
+    bridgeVk: string;
     /** Commitment level for transactions */
     commitment: "processed" | "confirmed" | "finalized";
     /** Token information for supported SPL tokens */
@@ -36,8 +38,6 @@ export interface DepositSplParams {
     mint: PublicKey;
     /** User's token account to deposit from */
     fromAccount: PublicKey;
-    /** Bridge's token account to deposit to */
-    toAccount: PublicKey;
 }
 /**
  * Parameters for withdrawing tokens
@@ -108,7 +108,9 @@ export interface TransferParams {
  * PDA seed types
  */
 export declare enum PdaSeedType {
-    ContractStorage = "contract_storage",
+    Bridge = "bridge",
+    TokenAuthority = "token_authority",
+    CrumbAuthority = "crumb_authority",
     AssetConfig = "asset_config",
     DepositStorage = "deposit_storage",
     BlockStorage = "block_storage",

package/dist/bridge/types.js

@@ -6,7 +6,9 @@ exports.PdaSeedType = void 0;
  */
 var PdaSeedType;
 (function (PdaSeedType) {
-    PdaSeedType["ContractStorage"] = "contract_storage";
+    PdaSeedType["Bridge"] = "bridge";
+    PdaSeedType["TokenAuthority"] = "token_authority";
+    PdaSeedType["CrumbAuthority"] = "crumb_authority";
     PdaSeedType["AssetConfig"] = "asset_config";
     PdaSeedType["DepositStorage"] = "deposit_storage";
     PdaSeedType["BlockStorage"] = "block_storage";

package/dist/gen/nord.d.ts

@@ -59,10 +59,11 @@ export declare enum Error {
     PYTH_FEED_ALREADY_ADDED = 95,
     PYTH_GUARDIAN_SET_UNINITIALIZED = 96,
     PYTH_GUARDIAN_SET_INVALID = 97,
-    /** UNINITIALIZED_PRICES - TODO(deprecate) */
-    UNINITIALIZED_PRICES = 98,
+    PYTH_FEED_DECIMALS_OUT_OF_RANGE = 98,
     PYTH_FEED_PRICE_OUT_OF_RANGE = 99,
-    INVALID_TOKEN_PARAMETERS = 100,
+    PYTH_FEED_VARIANCE_OUT_OF_RANGE = 100,
+    PYTH_GUARDIAN_SET_AND_PYTH_SIGNATURE_DO_NOT_MATCH = 126,
+    INVALID_TOKEN_PARAMETERS = 101,
     INDEX_PRICE_OUT_OF_RANGE = 103,
     INDEX_DECIMALS_OUT_OF_RANGE = 104,
     INVALID_STATE_VERSION = 105,
@@ -88,10 +89,8 @@ export declare enum Error {
      * before reducing position
      */
     CAN_REDUCE_POSITION_ONLY_IF_ALL_ORDERS_ARE_CANCELED = 124,
-    PYTH_GUARDIAN_SET_AND_PYTH_SIGNATURE_DO_NOT_MATCH = 126,
     /** UNEXPECTED_TOKEN_ID - Token was found, but not expected to be used in action context */
     UNEXPECTED_TOKEN_ID = 127,
-    SIGNATURE_VERIFICATION = 128,
     /**
      * TOKEN_NOT_READY - happens in some situation when token misses some relevant information
      * needed for operation, for example index price
@@ -140,6 +139,11 @@ export declare enum Error {
      * Reduce orders can only be post only.
      */
     ORDER_REDUCE_IS_POST_ONLY = 158,
+    /**
+     * ORDER_EXECUTION_SELL_PRICE - 10011_111;
+     * Order was rejected, because it planned under proposed price
+     */
+    ORDER_EXECUTION_SELL_PRICE = 159,
     /** BALANCE - 10100_000 */
     BALANCE = 160,
     /** BALANCE_DEPOSIT_OVERFLOW - 10100_001 */
@@ -174,6 +178,7 @@ export declare enum Error {
      * Binary pattern: 10101_001
      */
     TRIGGER_INVALID_PRICE = 169,
+    TRIGGER_NOT_FOUND = 170,
     /** TIMESTAMP - 10110_000 */
     TIMESTAMP = 176,
     /** TIMESTAMP_OUT_OF_THRESHOLD - 10110_001 */
@@ -196,11 +201,18 @@ export declare enum Error {
     MARKET_FROZEN = 193,
     /** POSITION - 11001_000 */
     POSITION = 200,
+    /** POSITION_NOT_FOUND - Position not found for specific entity in specific market */
+    POSITION_NOT_FOUND = 201,
     POSITION_STATE_ORDER = 202,
     POSITION_STATE_ORDER_PRICE = 203,
     POSITION_STATE_ORDER_SIZE = 204,
     POSITION_STATE_ORDER_SIDE = 205,
     POSITION_SIZE_LIMIT = 206,
+    PRICE = 209,
+    SIGNATURE_VERIFICATION = 217,
+    SIGNATURE_VERIFICATION_MALFORMED_PUBLIC_KEY = 218,
+    SIGNATURE_VERIFICATION_INVALID_LENGTH = 219,
+    NOT_IMPLEMENTED = 500,
     Dropped = 999
 }
 export declare function errorFromJSON(object: any): Error;
@@ -305,6 +317,9 @@ export interface Action {
     } | {
         $case: "removeTrigger";
         value: Action_RemoveTrigger;
+    } | {
+        $case: "takePosition";
+        value: Action_TakePosition;
     } | undefined;
 }
 export interface Action_CreateSession {
@@ -430,6 +445,10 @@ export interface Action_PlaceOrder {
      * Optional account on behalf of whom the order should be placed.
      * Executed only if sender has delegated authority to do so,
      * like admin user or liquidator bot.
+     * # Delegation allowed if:
+     * - trigger
+     * - reduce bad position
+     * - sell at good price to reduce if cannot cover bad position
      */
     delegatorAccountId?: number | undefined;
     /**
@@ -536,6 +555,25 @@ export interface Action_RemoveTrigger {
     side: Side;
     accountId?: number | undefined;
 }
+export interface Action_TakePosition {
+    sessionId: bigint;
+    marketId: number;
+    /** Amount to take. */
+    size: bigint;
+    /**
+     * Account id which performs operation;
+     * if not specified, first account of session's owner user is picked
+     */
+    senderAccountId?: number | undefined;
+    /**
+     * If set, then it is take action.
+     * If price not so good as in field, take will fail.
+     *
+     * If not set,
+     * will do fill-or-kill order as per liquidation trade rule.
+     */
+    price?: bigint | undefined;
+}
 export interface Receipt {
     /**
      * Action id which was run to produce this receipt.
@@ -597,6 +635,9 @@ export interface Receipt {
     } | {
         $case: "triggerRemoved";
         value: Receipt_TriggerRemoved;
+    } | {
+        $case: "positionTakenOrTraded";
+        value: Receipt_PositionTakenOrTradedResult;
     } | undefined;
 }
 export interface Receipt_Posted {
@@ -622,6 +663,23 @@ export interface Receipt_PlaceOrderResult {
     fills: Receipt_Trade[];
     clientOrderId?: bigint | undefined;
 }
+export interface Receipt_TakenResult {
+    pnl: bigint;
+    size: bigint;
+    takerAccountId: number;
+}
+export interface Receipt_PositionTakenOrTradedResult {
+    marketId: number;
+    PositionTakenOrTradedKind?: {
+        $case: "taken";
+        value: Receipt_TakenResult;
+    } | //
+    /** non empty if trade immediately */
+    {
+        $case: "traded";
+        value: Receipt_PlaceOrderResult;
+    } | undefined;
+}
 export interface Receipt_CancelOrderResult {
     orderId: bigint;
     /** Account from which order was cancelled */
@@ -712,11 +770,14 @@ export declare const Action_Unpause: MessageFns<Action_Unpause>;
 export declare const Action_Transfer: MessageFns<Action_Transfer>;
 export declare const Action_AddTrigger: MessageFns<Action_AddTrigger>;
 export declare const Action_RemoveTrigger: MessageFns<Action_RemoveTrigger>;
+export declare const Action_TakePosition: MessageFns<Action_TakePosition>;
 export declare const Receipt: MessageFns<Receipt>;
 export declare const Receipt_Posted: MessageFns<Receipt_Posted>;
 export declare const Receipt_Trade: MessageFns<Receipt_Trade>;
 export declare const Receipt_CreateSessionResult: MessageFns<Receipt_CreateSessionResult>;
 export declare const Receipt_PlaceOrderResult: MessageFns<Receipt_PlaceOrderResult>;
+export declare const Receipt_TakenResult: MessageFns<Receipt_TakenResult>;
+export declare const Receipt_PositionTakenOrTradedResult: MessageFns<Receipt_PositionTakenOrTradedResult>;
 export declare const Receipt_CancelOrderResult: MessageFns<Receipt_CancelOrderResult>;
 export declare const Receipt_DepositResult: MessageFns<Receipt_DepositResult>;
 export declare const Receipt_InsertTokenResult: MessageFns<Receipt_InsertTokenResult>;