@ledgerhq/coin-solana 0.36.0-nightly.7 → 0.37.0-nightly.20251107095716

package/src/tests/tokens-bridge.unit.test.ts

@@ -12,6 +12,7 @@ import {
 
 import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import type { Account, CryptoAssetsStore } from "@ledgerhq/types-live";
+import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import {
   SolanaRecipientMemoIsRequired,
   SolanaTokenAccountFrozen,
@@ -31,7 +32,7 @@ import {
 } from "@solana/spl-token";
 import { calculateToken2022TransferFees } from "../helpers/token";
 import { PARSED_PROGRAMS } from "../network/chain/program/constants";
-import { getCryptoAssetsStore, setCryptoAssetsStoreGetter } from "../cryptoAssetsStore";
+import { setCryptoAssetsStoreGetter } from "../cryptoAssetsStore";
 import usdcTokenData from "../__fixtures__/solana-spl-epjfwdd5aufqssqem2qn1xzybapc8g4weggkzwytdt1v.json";
 
 const USDC_TOKEN = usdcTokenData as unknown as TokenCurrency;
@@ -67,20 +68,27 @@ setCryptoAssetsStoreGetter(
   () =>
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     ({
-      findTokenByAddressInCurrency: (address: string, _currencyId: string) => {
+      findTokenByAddressInCurrency: async (address: string, _currencyId: string) => {
         if (address === "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v") {
           return USDC_TOKEN;
         }
         return undefined;
       },
+      findTokenById: async () => undefined,
       getTokensSyncHash: (_: string) => Promise.resolve("0"),
     }) as CryptoAssetsStore,
 );
 
-const wSolToken = getCryptoAssetsStore().findTokenByAddressInCurrency(
-  testData.mintAddress,
-  "solana",
-) as TokenCurrency;
+// Create a mock token for testing
+const wSolToken: TokenCurrency = {
+  type: "TokenCurrency",
+  id: testData.mintAddress,
+  contractAddress: testData.mintAddress,
+  name: "Wrapped SOL",
+  ticker: "WSOL",
+  units: [{ name: "WSOL", code: "WSOL", magnitude: 9 }],
+  parentCurrency: getCryptoCurrencyById("solana"),
+} as TokenCurrency;
 
 const baseAccount = {
   balance: new BigNumber(10000),

package/src/transaction.ts

@@ -54,7 +54,7 @@ const lamportsToSOL = (account: Account, amount: number) => {
   });
 };
 
-export const formatTransaction = (tx: Transaction, mainAccount: Account): string => {
+export const formatTransaction = async (tx: Transaction, mainAccount: Account): Promise<string> => {
   if (tx.model.commandDescriptor === undefined) {
     throw new Error("can not format unprepared transaction");
   }
@@ -63,17 +63,21 @@ export const formatTransaction = (tx: Transaction, mainAccount: Account): string
   if (Object.keys(commandDescriptor.errors).length > 0) {
     throw new Error("can not format invalid transaction");
   }
-  return formatCommand(mainAccount, tx, commandDescriptor.command);
+  return await formatCommand(mainAccount, tx, commandDescriptor.command);
 };
 
-function formatCommand(mainAccount: Account, tx: Transaction, command: Command) {
+async function formatCommand(
+  mainAccount: Account,
+  tx: Transaction,
+  command: Command,
+): Promise<string> {
   switch (command.kind) {
     case "transfer":
       return formatTransfer(mainAccount, tx, command);
     case "token.transfer":
       return formatTokenTransfer(mainAccount, tx, command);
     case "token.createATA":
-      return formatCreateATA(mainAccount, command);
+      return await formatCreateATA(mainAccount, command);
     case "token.approve":
       return formatCreateApprove(mainAccount, tx, command);
     case "token.revoke":
@@ -152,8 +156,11 @@ function formatTokenTransfer(mainAccount: Account, tx: Transaction, command: Tok
   return "\n" + str;
 }
 
-function formatCreateATA(mainAccount: Account, command: TokenCreateATACommand) {
-  const token = getCryptoAssetsStore().findTokenByAddressInCurrency(
+async function formatCreateATA(
+  mainAccount: Account,
+  command: TokenCreateATACommand,
+): Promise<string> {
+  const token = await getCryptoAssetsStore().findTokenByAddressInCurrency(
     command.mint,
     mainAccount.currency.id,
   );