fix(sdk-coin-sol): remove coin iteration to fetch programId from getAssociatedTokenAccountAddress

TICKET: WIN-5942

Author: abhishekagrawal080

modules/sdk-coin-sol/src/lib/ataInitializationBuilder.ts

@@ -163,7 +163,7 @@ export class AtaInitializationBuilder extends TransactionBuilder {
         // Use the provided ataAddress if it exists, otherwise calculate it
         let ataPk = recipient.ataAddress;
         if (!ataPk) {
-          ataPk = await getAssociatedTokenAccountAddress(tokenAddress, recipient.ownerAddress);
+          ataPk = await getAssociatedTokenAccountAddress(tokenAddress, recipient.ownerAddress, false, programId);
         }
 
         this._instructionsData.push({

modules/sdk-coin-sol/src/lib/tokenTransferBuilder.ts

@@ -132,7 +132,7 @@ export class TokenTransferBuilder extends TransactionBuilder {
         } else {
           throw new Error(`Could not determine token information for ${sendParams.tokenName}`);
         }
-        const sourceAddress = await getAssociatedTokenAccountAddress(tokenAddress, this._sender);
+        const sourceAddress = await getAssociatedTokenAccountAddress(tokenAddress, this._sender, false, programId);
         return {
           type: InstructionBuilderTypes.TokenTransfer,
           params: {
@@ -172,7 +172,7 @@ export class TokenTransferBuilder extends TransactionBuilder {
         // Use the provided ataAddress if it exists, otherwise calculate it
         let ataAddress = recipient.ataAddress;
         if (!ataAddress) {
-          ataAddress = await getAssociatedTokenAccountAddress(tokenAddress, recipient.ownerAddress);
+          ataAddress = await getAssociatedTokenAccountAddress(tokenAddress, recipient.ownerAddress, false, programId);
         }
         return {
           type: InstructionBuilderTypes.CreateAssociatedTokenAccount,

modules/sdk-coin-sol/src/lib/transferBuilderV2.ts

@@ -152,7 +152,7 @@ export class TransferBuilderV2 extends TransactionBuilder {
             throw new Error(`Could not determine token information for ${sendParams.tokenName}`);
           }
 
-          const sourceAddress = await getAssociatedTokenAccountAddress(tokenAddress, this._sender);
+          const sourceAddress = await getAssociatedTokenAccountAddress(tokenAddress, this._sender, false, programId);
           return {
             type: InstructionBuilderTypes.TokenTransfer,
             params: {
@@ -198,7 +198,12 @@ export class TransferBuilderV2 extends TransactionBuilder {
         } else {
           throw new Error(`Could not determine token information for ${recipient.tokenName}`);
         }
-        const recipientTokenAddress = await getAssociatedTokenAccountAddress(tokenAddress, recipient.ownerAddress);
+        const recipientTokenAddress = await getAssociatedTokenAccountAddress(
+          tokenAddress,
+          recipient.ownerAddress,
+          false,
+          programId
+        );
         return {
           type: InstructionBuilderTypes.CreateAssociatedTokenAccount,
           params: {

modules/sdk-coin-sol/src/lib/utils.ts

@@ -533,7 +533,8 @@ export function getSolTokenFromTokenName(tokenName: string): Readonly<SolCoin> |
 export async function getAssociatedTokenAccountAddress(
   tokenMintAddress: string,
   ownerAddress: string,
-  allowOwnerOffCurve = false
+  allowOwnerOffCurve = false,
+  programId?: string
 ): Promise<string> {
   const mintPublicKey = new PublicKey(tokenMintAddress);
   const ownerPublicKey = new PublicKey(ownerAddress);
@@ -543,15 +544,16 @@ export async function getAssociatedTokenAccountAddress(
     throw new UtilsError('Invalid ownerAddress - address off ed25519 curve, got: ' + ownerAddress);
   }
 
-  const coin = getSolTokenFromAddressOnly(tokenMintAddress);
-  let ataAddress: PublicKey;
-  let programId: string;
-  if (coin && coin instanceof SolCoin && (coin as any).programId) {
-    programId = (coin as any).programId.toString();
-  } else {
-    programId = TOKEN_PROGRAM_ID.toString();
+  if (!programId) {
+    const coin = getSolTokenFromAddressOnly(tokenMintAddress);
+    if (coin && coin instanceof SolCoin && (coin as any).programId) {
+      programId = (coin as any).programId.toString();
+    } else {
+      programId = TOKEN_PROGRAM_ID.toString();
+    }
   }
 
+  let ataAddress: PublicKey;
   if (programId === TOKEN_2022_PROGRAM_ID.toString()) {
     ataAddress = await getAssociatedTokenAddress(mintPublicKey, ownerPublicKey, false, TOKEN_2022_PROGRAM_ID);
   } else {

modules/sdk-coin-sol/src/sol.ts

@@ -286,7 +286,8 @@ export class Sol extends BaseCoin {
               return getAssociatedTokenAccountAddress(
                 tokenMintAddress!.tokenAddress,
                 recipientFromUser.address,
-                true
+                true,
+                tokenMintAddress!.programId
               ).then((ata: string) => {
                 return ata === recipientFromTx.address;
               });
@@ -846,7 +847,9 @@ export class Sol extends BaseCoin {
 
             const recipientTokenAccount = await getAssociatedTokenAccountAddress(
               tokenAccount.info.mint,
-              params.recoveryDestination
+              params.recoveryDestination,
+              false,
+              params.programId?.toString()
             );
             const tokenName = tokenAccount.tokenName as string;
             txBuilder.send({

modules/sdk-coin-sol/test/unit/sol.ts

@@ -2091,11 +2091,15 @@ describe('SOL:', function () {
 
       const source2022TokenAccount = await getAssociatedTokenAccountAddress(
         t22mintAddress,
-        testData.wrwUser.walletAddress0
+        testData.wrwUser.walletAddress0,
+        false,
+        TOKEN_2022_PROGRAM_ID.toString()
       );
       const destination2022TokenAccount = await getAssociatedTokenAccountAddress(
         t22mintAddress,
-        testData.keys.destinationPubKey2
+        testData.keys.destinationPubKey2,
+        false,
+        TOKEN_2022_PROGRAM_ID.toString()
       );
       should.equal(instructionsData[1].type, 'TokenTransfer');
       should.equal(instructionsData[1].params.fromAddress, testData.wrwUser.walletAddress0);

modules/sdk-coin-sol/test/unit/utils.ts

@@ -9,6 +9,7 @@ import {
   stakingWithdrawInstructionsIndexes,
 } from '../../src/lib/constants';
 import BigNumber from 'bignumber.js';
+import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token';
 
 describe('SOL util library', function () {
   describe('isValidAddress', function () {
@@ -320,14 +321,22 @@ describe('SOL util library', function () {
     const tokenAddress = 'JC2HAixRNrhBgNjCsV2PBfZEdyitEnWqJPNGokFD8xSA';
     it('should succeed for native address as owner address', async function () {
       const ownerAddress = testData.sol2022AuthAccount.pub;
-      const result = await Utils.getAssociatedTokenAccountAddress(ai16ZMintAddress, ownerAddress);
+      const result = await Utils.getAssociatedTokenAccountAddress(
+        ai16ZMintAddress,
+        ownerAddress,
+        false,
+        TOKEN_2022_PROGRAM_ID.toString()
+      );
       result.should.be.equal(tokenAddress);
     });
     it('should fail for token address as owner address', async function () {
       const invalidOwnerAddress = tokenAddress;
-      await Utils.getAssociatedTokenAccountAddress(ai16ZMintAddress, invalidOwnerAddress).should.be.rejectedWith(
-        'Invalid ownerAddress - address off ed25519 curve, got: ' + invalidOwnerAddress
-      );
+      await Utils.getAssociatedTokenAccountAddress(
+        ai16ZMintAddress,
+        invalidOwnerAddress,
+        false,
+        TOKEN_2022_PROGRAM_ID.toString()
+      ).should.be.rejectedWith('Invalid ownerAddress - address off ed25519 curve, got: ' + invalidOwnerAddress);
     });
   });