@sodax/sdk 2.0.0-rc.10 → 2.0.0-rc.11

package/dist/index.cjs

@@ -4013,7 +4013,7 @@ function isValidWalletProviderForChainKey(chainKey, walletProvider) {
 }
 
 // ../types/dist/index.js
-var CONFIG_VERSION = 208;
+var CONFIG_VERSION = 209;
 function isEvmSpokeChainConfig(value) {
   return typeof value === "object" && value !== null && value.chain.type === "EVM" && value.chain.key !== HUB_CHAIN_KEY;
 }
@@ -22940,7 +22940,12 @@ var SolanaSpokeService = class _SolanaSpokeService {
         }
       ]).instruction();
     } else {
-      const signerTokenAccount = await _SolanaSpokeService.getAssociatedTokenAddress(token.toBase58(), walletAddress);
+      const tokenProgramId = await _SolanaSpokeService.getMintTokenProgramId(this.connection, token);
+      const signerTokenAccount = await _SolanaSpokeService.getAssociatedTokenAddress(
+        token.toBase58(),
+        walletAddress,
+        tokenProgramId
+      );
       depositInstruction = await assetManagerProgram.methods.transfer(amountBN, Buffer.from(recipient.slice(2), "hex"), Buffer.from(data.slice(2), "hex")).accountsStrict({
         signer: walletPublicKey,
         systemProgram: web3_js.SystemProgram.programId,
@@ -22951,7 +22956,7 @@ var SolanaSpokeService = class _SolanaSpokeService {
         authority: AssetManagerPDA.authority(assetManagerProgram.programId).pda,
         mint: token,
         connection: connectionProgram.programId,
-        tokenProgram: splToken.TOKEN_PROGRAM_ID
+        tokenProgram: tokenProgramId
       }).remainingAccounts([
         {
           pubkey: ConnectionConfigPDA.config(connectionProgram.programId).pda,
@@ -23090,8 +23095,22 @@ var SolanaSpokeService = class _SolanaSpokeService {
   static async getTokenAccountBalance(connection, publicKey) {
     return await connection.getTokenAccountBalance(new web3_js.PublicKey(publicKey));
   }
-  static async getAssociatedTokenAddress(mint, walletAddress) {
-    return (await splToken.getAssociatedTokenAddress(new web3_js.PublicKey(mint), new web3_js.PublicKey(walletAddress), true)).toBase58();
+  /**
+   * Resolves the token program that owns a mint (legacy SPL Token vs Token-2022). Falls back to
+   * the legacy SPL Token program when the mint account can't be read.
+   */
+  static async getMintTokenProgramId(connection, mint) {
+    const mintAccountInfo = await connection.getAccountInfo(mint);
+    return mintAccountInfo?.owner.equals(splToken.TOKEN_2022_PROGRAM_ID) ? splToken.TOKEN_2022_PROGRAM_ID : splToken.TOKEN_PROGRAM_ID;
+  }
+  static async getAssociatedTokenAddress(mint, walletAddress, tokenProgramId = splToken.TOKEN_PROGRAM_ID) {
+    const ata = await splToken.getAssociatedTokenAddress(
+      new web3_js.PublicKey(mint),
+      new web3_js.PublicKey(walletAddress),
+      true,
+      tokenProgramId
+    );
+    return ata.toBase58();
   }
   static buildTransactionInstruction(rawInstructions) {
     return rawInstructions.map(

package/dist/index.d.cts

@@ -8,7 +8,7 @@ import { JsonRpcProvider } from 'near-api-js';
 import { Transaction, TransactionResult } from '@mysten/sui/transactions';
 import { SuiClient } from '@mysten/sui/client';
 import { rpc, Transaction as Transaction$1, Memo, MemoType, Operation, FeeBumpTransaction, Horizon, Account, xdr } from '@stellar/stellar-sdk';
-import { Connection as Connection$1, TransactionInstruction, PublicKey } from '@solana/web3.js';
+import { Connection as Connection$1, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { IconService } from 'icon-sdk-js';
 import { ChainGrpcWasmApi, TxGrpcApi } from '@injectivelabs/sdk-ts';
 import { NetworkEndpoints } from '@injectivelabs/networks';
@@ -9279,7 +9279,12 @@ declare class SolanaSpokeService {
     waitForTransactionReceipt(params: WaitForTxReceiptParams<SolanaChainKey>): Promise<Result<WaitForTxReceiptReturnType<SolanaChainKey>>>;
     static getBalance(connection: Connection$1, publicKey: SolanaBase58PublicKey): Promise<number>;
     static getTokenAccountBalance(connection: Connection$1, publicKey: SolanaBase58PublicKey): Promise<SolanaRpcResponseAndContext<SolanaTokenAmount>>;
-    static getAssociatedTokenAddress(mint: SolanaBase58PublicKey, walletAddress: SolanaBase58PublicKey): Promise<SolanaBase58PublicKey>;
+    /**
+     * Resolves the token program that owns a mint (legacy SPL Token vs Token-2022). Falls back to
+     * the legacy SPL Token program when the mint account can't be read.
+     */
+    static getMintTokenProgramId(connection: Connection$1, mint: PublicKey): Promise<PublicKey>;
+    static getAssociatedTokenAddress(mint: SolanaBase58PublicKey, walletAddress: SolanaBase58PublicKey, tokenProgramId?: PublicKey): Promise<SolanaBase58PublicKey>;
     static buildTransactionInstruction(rawInstructions: SolanaRawTransactionInstruction[]): TransactionInstruction[];
 }
 

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import { JsonRpcProvider } from 'near-api-js';
 import { Transaction, TransactionResult } from '@mysten/sui/transactions';
 import { SuiClient } from '@mysten/sui/client';
 import { rpc, Transaction as Transaction$1, Memo, MemoType, Operation, FeeBumpTransaction, Horizon, Account, xdr } from '@stellar/stellar-sdk';
-import { Connection as Connection$1, TransactionInstruction, PublicKey } from '@solana/web3.js';
+import { Connection as Connection$1, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { IconService } from 'icon-sdk-js';
 import { ChainGrpcWasmApi, TxGrpcApi } from '@injectivelabs/sdk-ts';
 import { NetworkEndpoints } from '@injectivelabs/networks';
@@ -9279,7 +9279,12 @@ declare class SolanaSpokeService {
     waitForTransactionReceipt(params: WaitForTxReceiptParams<SolanaChainKey>): Promise<Result<WaitForTxReceiptReturnType<SolanaChainKey>>>;
     static getBalance(connection: Connection$1, publicKey: SolanaBase58PublicKey): Promise<number>;
     static getTokenAccountBalance(connection: Connection$1, publicKey: SolanaBase58PublicKey): Promise<SolanaRpcResponseAndContext<SolanaTokenAmount>>;
-    static getAssociatedTokenAddress(mint: SolanaBase58PublicKey, walletAddress: SolanaBase58PublicKey): Promise<SolanaBase58PublicKey>;
+    /**
+     * Resolves the token program that owns a mint (legacy SPL Token vs Token-2022). Falls back to
+     * the legacy SPL Token program when the mint account can't be read.
+     */
+    static getMintTokenProgramId(connection: Connection$1, mint: PublicKey): Promise<PublicKey>;
+    static getAssociatedTokenAddress(mint: SolanaBase58PublicKey, walletAddress: SolanaBase58PublicKey, tokenProgramId?: PublicKey): Promise<SolanaBase58PublicKey>;
     static buildTransactionInstruction(rawInstructions: SolanaRawTransactionInstruction[]): TransactionInstruction[];
 }
 

package/dist/index.mjs

@@ -10,7 +10,7 @@ import * as ecc from '@bitcoinerlab/secp256k1';
 import { CLPositionManagerAbi, encodeCLPositionManagerMintCalldata, encodeCLPositionManagerIncreaseLiquidityCalldata, encodeCLPositionManagerDecreaseLiquidityCalldata, getPoolId, CLPoolManagerAbi, decodePoolKey } from '@pancakeswap/infinity-sdk';
 import { Transaction as Transaction$1 } from '@mysten/sui/transactions';
 import { SuiClient } from '@mysten/sui/client';
-import { TOKEN_PROGRAM_ID, getAssociatedTokenAddress } from '@solana/spl-token';
+import { TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddress } from '@solana/spl-token';
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import BN from 'bn.js';
 import * as IconSdkRaw from 'icon-sdk-js';
@@ -3985,7 +3985,7 @@ function isValidWalletProviderForChainKey(chainKey, walletProvider) {
 }
 
 // ../types/dist/index.js
-var CONFIG_VERSION = 208;
+var CONFIG_VERSION = 209;
 function isEvmSpokeChainConfig(value) {
   return typeof value === "object" && value !== null && value.chain.type === "EVM" && value.chain.key !== HUB_CHAIN_KEY;
 }
@@ -22912,7 +22912,12 @@ var SolanaSpokeService = class _SolanaSpokeService {
         }
       ]).instruction();
     } else {
-      const signerTokenAccount = await _SolanaSpokeService.getAssociatedTokenAddress(token.toBase58(), walletAddress);
+      const tokenProgramId = await _SolanaSpokeService.getMintTokenProgramId(this.connection, token);
+      const signerTokenAccount = await _SolanaSpokeService.getAssociatedTokenAddress(
+        token.toBase58(),
+        walletAddress,
+        tokenProgramId
+      );
       depositInstruction = await assetManagerProgram.methods.transfer(amountBN, Buffer.from(recipient.slice(2), "hex"), Buffer.from(data.slice(2), "hex")).accountsStrict({
         signer: walletPublicKey,
         systemProgram: SystemProgram.programId,
@@ -22923,7 +22928,7 @@ var SolanaSpokeService = class _SolanaSpokeService {
         authority: AssetManagerPDA.authority(assetManagerProgram.programId).pda,
         mint: token,
         connection: connectionProgram.programId,
-        tokenProgram: TOKEN_PROGRAM_ID
+        tokenProgram: tokenProgramId
       }).remainingAccounts([
         {
           pubkey: ConnectionConfigPDA.config(connectionProgram.programId).pda,
@@ -23062,8 +23067,22 @@ var SolanaSpokeService = class _SolanaSpokeService {
   static async getTokenAccountBalance(connection, publicKey) {
     return await connection.getTokenAccountBalance(new PublicKey(publicKey));
   }
-  static async getAssociatedTokenAddress(mint, walletAddress) {
-    return (await getAssociatedTokenAddress(new PublicKey(mint), new PublicKey(walletAddress), true)).toBase58();
+  /**
+   * Resolves the token program that owns a mint (legacy SPL Token vs Token-2022). Falls back to
+   * the legacy SPL Token program when the mint account can't be read.
+   */
+  static async getMintTokenProgramId(connection, mint) {
+    const mintAccountInfo = await connection.getAccountInfo(mint);
+    return mintAccountInfo?.owner.equals(TOKEN_2022_PROGRAM_ID) ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID;
+  }
+  static async getAssociatedTokenAddress(mint, walletAddress, tokenProgramId = TOKEN_PROGRAM_ID) {
+    const ata = await getAssociatedTokenAddress(
+      new PublicKey(mint),
+      new PublicKey(walletAddress),
+      true,
+      tokenProgramId
+    );
+    return ata.toBase58();
   }
   static buildTransactionInstruction(rawInstructions) {
     return rawInstructions.map(

package/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.0-rc.10",
+  "version": "2.0.0-rc.11",
   "license": "MIT",
   "description": "Sodax SDK",
   "keywords": [
@@ -65,8 +65,8 @@
     "near-api-js": "7.2.0",
     "rlp": "3.0.0",
     "viem": "2.29.2",
-    "@sodax/types": "2.0.0-rc.10",
-    "@sodax/libs": "2.0.0-rc.10"
+    "@sodax/libs": "2.0.0-rc.11",
+    "@sodax/types": "2.0.0-rc.11"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.17.4",