@n1xyz/nord-ts 0.0.16 → 0.0.17

package/dist/bridge/client.js

@@ -185,7 +185,28 @@ class SolanaBridgeClient {
         }
         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);
+        // Get the token program ID from the mint account
+        const mintAccount = await this.connection.getAccountInfo(params.mint);
+        if (!mintAccount) {
+            throw new Error("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 Error("Mint Account is not owned by a supported SPL token program");
+        }
+        // Get the token program ID from the fromAccount to ensure we're using the same program
+        const fromAccountInfo = await this.connection.getAccountInfo(params.fromAccount);
+        if (!fromAccountInfo) {
+            throw new Error(`From account not found for address: ${params.fromAccount.toBase58()}. ` +
+                "This may indicate an invalid, uninitialized, or missing token account.");
+        }
+        if (!fromAccountInfo.owner.equals(tokenProgramId)) {
+            throw new Error(`From account owner (${fromAccountInfo.owner.toBase58()}) does not match mint owner (${tokenProgramId.toBase58()}). ` +
+                "This usually means the fromAccount is not a valid token account for the given mint.");
+        }
+        const toAccount = await (0, spl_token_1.getAssociatedTokenAddress)(params.mint, tokenAuthority, true, tokenProgramId);
         // Build the transaction
         const accounts = {
             payer: this.provider.wallet.publicKey,
@@ -195,7 +216,7 @@ class SolanaBridgeClient {
             program: this.programId,
             fromAccount: params.fromAccount,
             toAccount: toAccount,
-            tokenProgram: spl_token_1.TOKEN_2022_PROGRAM_ID,
+            tokenProgram: tokenProgramId,
             systemProgram: web3_js_1.SystemProgram.programId,
             crumbAuthority,
             tokenAuthority,
@@ -217,7 +238,7 @@ class SolanaBridgeClient {
             toAccount, // associated token account address
             authority, // owner of the token account
             params.mint, // token mint
-            spl_token_1.TOKEN_2022_PROGRAM_ID);
+            tokenProgramId);
             // Add the instruction to the beginning of the transaction
             tx.instructions.unshift(createTokenAccountIx);
         }
@@ -235,6 +256,18 @@ class SolanaBridgeClient {
         const [stateUpdate] = await this.findBlockStoragePda(params.claim.blockId.toNumber());
         const [withdrawalNullifier] = await this.findWithdrawalNullifierPda(params.claim.blockId.toNumber(), params.claim.leafIndex.toNumber());
         const [authority] = await this.findAuthorityPda();
+        // Get the token program ID from the fromAccount
+        const fromAccountInfo = await this.connection.getAccountInfo(params.fromAccount);
+        if (!fromAccountInfo) {
+            throw new Error(`From account not found for address: ${params.fromAccount.toBase58()}. ` +
+                "This may indicate an invalid, uninitialized, or missing token account.");
+        }
+        const tokenProgramId = fromAccountInfo.owner;
+        // Validate that the account 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 Error("From Account is not owned by a supported SPL token program");
+        }
         // Build the transaction
         const tx = await this.program.methods
             .withdraw(params.claim)
@@ -245,7 +278,7 @@ class SolanaBridgeClient {
             fromAccount: params.fromAccount,
             toAccount: params.toAccount,
             authority,
-            tokenProgram: spl_token_1.TOKEN_2022_PROGRAM_ID,
+            tokenProgram: tokenProgramId,
             systemProgram: web3_js_1.SystemProgram.programId,
         })
             .transaction();
@@ -379,13 +412,19 @@ class SolanaBridgeClient {
      * @returns Associated token account address
      */
     async createTokenAccountIfNeeded(mint, owner, payer) {
-        const associatedTokenAddress = await (0, spl_token_1.getAssociatedTokenAddress)(mint, owner);
+        // Get the token program ID from the mint account
+        const mintAccount = await this.connection.getAccountInfo(mint);
+        if (!mintAccount) {
+            throw new Error("Mint account not found");
+        }
+        const tokenProgramId = mintAccount.owner;
+        const associatedTokenAddress = await (0, spl_token_1.getAssociatedTokenAddress)(mint, owner, false, tokenProgramId);
         try {
             await this.connection.getTokenAccountBalance(associatedTokenAddress);
         }
         catch {
             // Account doesn't exist, create it
-            const transaction = new web3_js_1.Transaction().add((0, spl_token_1.createAssociatedTokenAccountInstruction)(payer.publicKey, associatedTokenAddress, owner, mint));
+            const transaction = new web3_js_1.Transaction().add((0, spl_token_1.createAssociatedTokenAccountInstruction)(payer.publicKey, associatedTokenAddress, owner, mint, tokenProgramId));
             // Sign and send the transaction using our helper method
             await this.signAndSendTransaction(transaction, [payer]);
         }

package/dist/gen/nord.d.ts

@@ -1,5 +1,4 @@
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
-import { Message } from "./common";
 export declare const protobufPackage = "nord";
 export declare enum Side {
     ASK = 0,
@@ -235,6 +234,29 @@ export interface Token {
     weightBps: number;
     viewSymbol: string;
 }
+export interface QuoteSize {
+    size: bigint;
+    price: bigint;
+}
+export interface OrderLimit {
+    price: bigint;
+    size: bigint;
+    quoteSize: QuoteSize | undefined;
+}
+export interface OrderType {
+    side: Side;
+    fillMode: FillMode;
+    isReduceOnly: boolean;
+}
+export interface TradeOrPlace {
+    marketId: number;
+    orderType: OrderType | undefined;
+    limit: OrderLimit | undefined;
+    clientOrderId?: bigint | undefined;
+}
+export interface CancelOrder {
+    orderId: bigint;
+}
 export interface Action {
     /**
      * Must be within 60s of the engine's current logical time, which
@@ -296,9 +318,6 @@ export interface Action {
     } | {
         $case: "transfer";
         value: Action_Transfer;
-    } | {
-        $case: "message";
-        value: Message;
     } | {
         $case: "addTrigger";
         value: Action_AddTrigger;
@@ -308,6 +327,9 @@ export interface Action {
     } | {
         $case: "takePosition";
         value: Action_TakePosition;
+    } | {
+        $case: "transaction";
+        value: Transaction;
     } | undefined;
 }
 export interface Action_CreateSession {
@@ -562,6 +584,20 @@ export interface Action_TakePosition {
      */
     price?: bigint | undefined;
 }
+export interface TransactionKind {
+    inner?: {
+        $case: "tradeOrPlace";
+        value: TradeOrPlace;
+    } | {
+        $case: "cancelOrder";
+        value: CancelOrder;
+    } | undefined;
+}
+export interface Transaction {
+    sessionId: bigint;
+    accountId?: bigint | undefined;
+    actions: TransactionKind[];
+}
 export interface Receipt {
     /**
      * Action id which was run to produce this receipt.
@@ -693,6 +729,7 @@ export interface Receipt_WithdrawResult {
     amount: bigint;
     balance: bigint;
     accountId: number;
+    fee: bigint;
     userPubkey: Uint8Array;
 }
 /** pyth receipts are not user facing, so they can be terse and optional */
@@ -740,6 +777,11 @@ export interface Receipt_TriggerRemoved {
 export declare const U128: MessageFns<U128>;
 export declare const Market: MessageFns<Market>;
 export declare const Token: MessageFns<Token>;
+export declare const QuoteSize: MessageFns<QuoteSize>;
+export declare const OrderLimit: MessageFns<OrderLimit>;
+export declare const OrderType: MessageFns<OrderType>;
+export declare const TradeOrPlace: MessageFns<TradeOrPlace>;
+export declare const CancelOrder: MessageFns<CancelOrder>;
 export declare const Action: MessageFns<Action>;
 export declare const Action_CreateSession: MessageFns<Action_CreateSession>;
 export declare const Action_CreateToken: MessageFns<Action_CreateToken>;
@@ -759,6 +801,8 @@ 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 TransactionKind: MessageFns<TransactionKind>;
+export declare const Transaction: MessageFns<Transaction>;
 export declare const Receipt: MessageFns<Receipt>;
 export declare const Receipt_Posted: MessageFns<Receipt_Posted>;
 export declare const Receipt_Trade: MessageFns<Receipt_Trade>;