@ledgerhq/live-common 34.47.0 → 34.48.0-nightly.0

package/src/bridge/generic-alpaca/getAccountShape.ts

@@ -4,7 +4,6 @@ import BigNumber from "bignumber.js";
 import { getAlpacaApi } from "./alpaca";
 import { adaptCoreOperationToLiveOperation, extractBalance } from "./utils";
 import { inferSubOperations } from "@ledgerhq/coin-framework/serialization";
-import { findToken } from "./buildSubAccounts";
 import { buildSubAccounts, OperationCommon } from "./buildSubAccounts";
 
 export function genericGetAccountShape(network: string, kind: string): GetAccountShape {
@@ -33,8 +32,7 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
 
     const assetsBalance = balanceRes
       .filter(b => b.asset.type !== "native")
-      .filter(b => findToken(currency, b));
-
+      .filter(b => alpacaApi.getTokenFromAsset && alpacaApi.getTokenFromAsset(b.asset));
     const nativeBalance = BigInt(nativeAsset?.value ?? "0");
 
     const spendableBalance = BigInt(nativeBalance - BigInt(nativeAsset?.locked ?? "0"));
@@ -43,7 +41,7 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
     const lastPagingToken = oldOps[0]?.extra?.pagingToken || "";
 
     const blockHeight = oldOps.length ? (oldOps[0].blockHeight ?? 0) + 1 : 0;
-    const paginationParams: any = { minHeight: blockHeight };
+    const paginationParams: any = { minHeight: blockHeight, order: "asc" };
     if (lastPagingToken) {
       paginationParams.lastPagingToken = lastPagingToken;
     }
@@ -72,6 +70,7 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
         assetsBalance,
         syncConfig,
         operations: assetOperations,
+        getTokenFromAsset: alpacaApi.getTokenFromAsset,
       }) || [];
 
     const operationsWithSubs = mergedOps.map(op => {

package/src/bridge/generic-alpaca/getTransactionStatus.ts

@@ -3,7 +3,6 @@ import { AccountAwaitingSendPendingOperations } from "@ledgerhq/errors";
 import BigNumber from "bignumber.js";
 import { getAlpacaApi } from "./alpaca";
 import { transactionToIntent } from "./utils";
-// import { FeeEstimation } from "@ledgerhq/coin-framework/api/types";
 
 // => alpaca validateIntent
 export function genericGetTransactionStatus(

package/src/bridge/generic-alpaca/prepareTransaction.ts

@@ -2,27 +2,41 @@ import { Account, AccountBridge, TransactionCommon } from "@ledgerhq/types-live"
 import { getAlpacaApi } from "./alpaca";
 import { transactionToIntent } from "./utils";
 import BigNumber from "bignumber.js";
-import { FeeEstimation } from "@ledgerhq/coin-framework/api/types";
+import { AssetInfo, FeeEstimation } from "@ledgerhq/coin-framework/api/types";
+import { decodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
+import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
 
 function bnEq(a: BigNumber | null | undefined, b: BigNumber | null | undefined): boolean {
   return !a && !b ? true : !a || !b ? false : a.eq(b);
 }
 
+type TransactionParam = TransactionCommon & {
+  fees: BigNumber | null | undefined;
+  customFees?: FeeEstimation;
+  assetReference?: string;
+  assetOwner?: string;
+  subAccountId?: string;
+};
+
+function assetInfosFallback(transaction: TransactionParam): {
+  assetReference: string;
+  assetOwner: string;
+} {
+  return {
+    assetReference: transaction.assetReference ?? "",
+    assetOwner: transaction.assetOwner ?? "",
+  };
+}
+
 export function genericPrepareTransaction(
   network: string,
   kind,
 ): AccountBridge<TransactionCommon, Account, any, any>["prepareTransaction"] {
-  return async (
-    account,
-    transaction: TransactionCommon & {
-      fees: BigNumber | null | undefined;
-      customFees?: FeeEstimation;
-      assetReference?: string;
-      assetOwner?: string;
-      subAccountId?: string;
-    },
-  ) => {
-    const [assetReference, assetOwner] = getAssetInfos(transaction);
+  return async (account, transaction: TransactionParam) => {
+    const { getAssetFromToken } = getAlpacaApi(network, kind);
+    const { assetReference, assetOwner } = getAssetFromToken
+      ? getAssetInfos(transaction, account.freshAddress, getAssetFromToken)
+      : assetInfosFallback(transaction);
 
     let fees = transaction.customFees?.parameters?.fees || null;
     if (fees === null) {
@@ -54,11 +68,24 @@ export function genericPrepareTransaction(
 }
 
 export function getAssetInfos(
-  tr: TransactionCommon & { assetReference?: string; assetOwner?: string },
-): string[] {
+  tr: TransactionParam,
+  owner: string,
+  getAssetFromToken: (token: TokenCurrency, owner: string) => AssetInfo,
+): {
+  assetReference: string;
+  assetOwner: string;
+} {
   if (tr.subAccountId) {
-    const assetString = tr.subAccountId.split("+")[1];
-    return assetString.split(":");
+    const { token } = decodeTokenAccountId(tr.subAccountId);
+
+    if (!token) return assetInfosFallback(tr);
+
+    const asset = getAssetFromToken(token, owner);
+
+    return {
+      assetOwner: ("assetOwner" in asset && asset.assetOwner) || "",
+      assetReference: ("assetReference" in asset && asset.assetReference) || "",
+    };
   }
-  return [tr.assetReference || "", tr.assetOwner || ""];
+  return assetInfosFallback(tr);
 }

package/src/bridge/generic-alpaca/utils.test.ts

@@ -0,0 +1,133 @@
+import { adaptCoreOperationToLiveOperation, extractBalance } from "./utils";
+import BigNumber from "bignumber.js";
+import { Operation as CoreOperation } from "@ledgerhq/coin-framework/api/types";
+
+describe("Alpaca utils", () => {
+  describe("extractBalance", () => {
+    it("extracts an existing balance", () => {
+      expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type1")).toEqual({
+        value: 4n,
+        asset: { type: "type1" },
+      });
+    });
+
+    it("generates an empty balance for a missing type", () => {
+      expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type2")).toEqual({
+        value: 0n,
+        asset: { type: "type2" },
+      });
+    });
+  });
+
+  jest.mock("@ledgerhq/coin-framework/operation", () => ({
+    encodeOperationId: jest.fn((accountId, txHash, opType) => `${accountId}-${txHash}-${opType}`),
+  }));
+
+  describe("adaptCoreOperationToLiveOperation", () => {
+    const accountId = "acc_123";
+    const baseOp: CoreOperation = {
+      id: "op_123",
+      asset: { type: "native" },
+      type: "OUT",
+      value: BigInt(100),
+      tx: {
+        hash: "txhash123",
+        fees: BigInt(10),
+        block: {
+          hash: "blockhash123",
+          height: 123456,
+        },
+        date: new Date("2025-08-29T12:00:00Z"),
+      },
+      senders: ["sender1"],
+      recipients: ["recipient1"],
+    };
+
+    it("does not include fees in non native asset value", () => {
+      expect(
+        adaptCoreOperationToLiveOperation("account", {
+          id: "operation",
+          asset: { type: "token", assetOwner: "owner", assetReference: "reference" },
+          type: "OUT",
+          value: BigInt(100),
+          tx: {
+            hash: "hash",
+            fees: BigInt(10),
+            block: {
+              hash: "block_hash",
+              height: 123456,
+            },
+            date: new Date("2025-08-29T12:00:00Z"),
+          },
+          senders: ["sender"],
+          recipients: ["recipient"],
+        }),
+      ).toEqual({
+        id: "account-hash-OUT",
+        hash: "hash",
+        accountId: "account",
+        type: "OUT",
+        value: new BigNumber(100), // value only
+        fee: new BigNumber(10),
+        extra: {
+          assetOwner: "owner",
+          assetReference: "reference",
+        },
+        blockHash: "block_hash",
+        blockHeight: 123456,
+        senders: ["sender"],
+        recipients: ["recipient"],
+        date: new Date("2025-08-29T12:00:00Z"),
+        transactionSequenceNumber: undefined,
+        hasFailed: false,
+      });
+    });
+
+    it("adapts a basic OUT operation", () => {
+      const result = adaptCoreOperationToLiveOperation(accountId, baseOp);
+
+      expect(result).toEqual({
+        id: "acc_123-txhash123-OUT",
+        hash: "txhash123",
+        accountId,
+        type: "OUT",
+        value: new BigNumber(110), // value + fee
+        fee: new BigNumber(10),
+        blockHash: "blockhash123",
+        blockHeight: 123456,
+        senders: ["sender1"],
+        recipients: ["recipient1"],
+        date: new Date("2025-08-29T12:00:00Z"),
+        transactionSequenceNumber: undefined,
+        hasFailed: false,
+        extra: {},
+      });
+    });
+
+    it("handles FEES operation where value = value + fees", () => {
+      const op = {
+        ...baseOp,
+        type: "FEES",
+        value: BigInt(5),
+        tx: { ...baseOp.tx, fees: BigInt(2) },
+      };
+
+      const result = adaptCoreOperationToLiveOperation(accountId, op);
+
+      expect(result.value.toString()).toEqual("7");
+    });
+
+    it("handles non-FEES/OUT operation where value = value only", () => {
+      const op = {
+        ...baseOp,
+        type: "IN",
+        value: BigInt(50),
+        tx: { ...baseOp.tx, fees: BigInt(2) },
+      };
+
+      const result = adaptCoreOperationToLiveOperation(accountId, op);
+
+      expect(result.value.toString()).toEqual("50");
+    });
+  });
+});

package/src/bridge/generic-alpaca/utils.ts

@@ -44,15 +44,17 @@ export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOpe
   if (op.details?.memo) {
     extra.memo = op.details.memo as string;
   }
+  const bnFees = new BigNumber(op.tx.fees.toString());
   const res = {
-    id: extra.ledgerOpType
-      ? encodeOperationId(accountId, op.tx.hash, extra.ledgerOpType)
-      : encodeOperationId(accountId, op.tx.hash, op.type),
+    id: encodeOperationId(accountId, op.tx.hash, op.type),
     hash: op.tx.hash,
     accountId,
     type: opType,
-    value: new BigNumber(op.value.toString()),
-    fee: new BigNumber(op.tx.fees.toString()),
+    value:
+      op.asset.type === "native" && ["OUT", "FEES"].includes(opType)
+        ? new BigNumber(op.value.toString()).plus(bnFees)
+        : new BigNumber(op.value.toString()),
+    fee: bnFees,
     blockHash: op.tx.block.hash,
     blockHeight: op.tx.block.height,
     senders: op.senders,

package/src/e2e/enum/DeviceLabels.ts

@@ -6,6 +6,7 @@ export enum DeviceLabels {
   SIGN = "Sign",
   APPROVE = "Approve",
   ACCEPT = "Accept",
+  ACCEPT_RISK = "Accept risk",
   TRANSFER = "Transfer",
   RECIPIENT = "Recipient",
   DEST = "Dest",
@@ -33,10 +34,11 @@ export enum DeviceLabels {
   DELEGATE_FROM = "Delegate from",
   PLEASE_REVIEW = "Please",
   VALUE = "Value",
-  CONNECT_WITH = "Connect with",
-  MAKE_SURE_TO_USE = "Make sure to use",
-  YOUR_CRYPTO_ACCOUNTS = "Your crypto accounts",
+  CONNECT_TO = "Connect to",
+  CONNECT = "Connect",
+  LEDGER_LIVE_WILL_BE = "Ledger Live will be",
   TURN_ON_SYNC = "Turn on sync",
+  TURN_ON_SYNC2 = "Turn On sync",
   NEW_ORDINARY = "New ordinary",
   SEND_TO_ADDRESS_2 = "Send to address (2/2)",
   REVIEW_OPERATION = "Review",
@@ -46,12 +48,13 @@ export enum DeviceLabels {
   DELEGATE_STAKE = "Delegate stake",
   SETTINGS = "Settings",
   CONTRACT_DATA = "Contract data",
-  REMOVE_PHONE_OR_COMPUTER = "Remove phone or",
-  AFTER_REMOVING = "After removing, you",
+  REMOVE_FROM_LEDGER_SYNC = "Remove from",
+  REMOVE = "Remove",
   VERIFY_ETHEREUM = "Verify Ethereum",
   VERIFY_BSC = "Verify BSC",
   SIGN_TRANSACTION = "Sign transaction",
   VERIFY_POLYGON = "Verify Polygon",
   VERIFY_SOLANA_ADDRESS = "Verify Solana address",
   REVIEW_TRANSACTION = "Review transaction",
+  I_UNDERSTAND = "I understand",
 }

package/src/e2e/families/tezos.ts

@@ -3,6 +3,8 @@ import { DeviceLabels } from "../enum/DeviceLabels";
 
 export async function delegateTezos() {
   await waitFor(DeviceLabels.REVIEW_OPERATION);
+  await pressUntilTextFound(DeviceLabels.ACCEPT_RISK);
+  await pressBoth();
   await pressUntilTextFound(DeviceLabels.ACCEPT);
   await pressBoth();
 }

package/src/e2e/speculos.ts

@@ -460,7 +460,7 @@ async function retryAxiosRequest<T>(
   throw lastError!;
 }
 
-export async function waitFor(text: string, maxAttempts = 15): Promise<string[]> {
+export async function waitFor(text: string, maxAttempts = 60): Promise<string[]> {
   const port = getEnv("SPECULOS_API_PORT");
   const address = getSpeculosAddress();
   const url = `${address}:${port}/events?stream=false&currentscreenonly=true`;
@@ -491,14 +491,14 @@ export async function pressBoth() {
 
 export async function pressUntilTextFound(
   targetText: string,
-  maxAttempts: number = 15,
+  strictMatch: boolean = false,
 ): Promise<string[]> {
+  const maxAttempts = 15;
   const speculosApiPort = getEnv("SPECULOS_API_PORT");
 
   for (let attempts = 0; attempts < maxAttempts; attempts++) {
     const texts = await fetchCurrentScreenTexts(speculosApiPort);
-
-    if (texts.includes(targetText)) {
+    if (strictMatch ? texts === targetText : texts.includes(targetText)) {
       return await fetchAllEvents(speculosApiPort);
     }
 
@@ -575,28 +575,25 @@ export async function waitForTimeOut(ms: number) {
 }
 
 export async function removeMemberLedgerSync() {
-  await waitFor(DeviceLabels.CONNECT_WITH);
-  await pressUntilTextFound(DeviceLabels.MAKE_SURE_TO_USE);
-  await pressUntilTextFound(DeviceLabels.CONNECT_WITH);
+  await waitFor(DeviceLabels.CONNECT_TO);
+  await pressUntilTextFound(DeviceLabels.CONNECT, true);
   await pressBoth();
-  await waitFor(DeviceLabels.REMOVE_PHONE_OR_COMPUTER);
-  await pressUntilTextFound(DeviceLabels.AFTER_REMOVING);
-  await pressUntilTextFound(DeviceLabels.REMOVE_PHONE_OR_COMPUTER);
+  await waitFor(DeviceLabels.REMOVE_FROM_LEDGER_SYNC);
+  await pressUntilTextFound(DeviceLabels.REMOVE, true);
   await pressBoth();
   await waitFor(DeviceLabels.TURN_ON_SYNC);
-  await pressUntilTextFound(DeviceLabels.YOUR_CRYPTO_ACCOUNTS);
-  await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC);
+  await pressUntilTextFound(DeviceLabels.LEDGER_LIVE_WILL_BE);
+  await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC2);
   await pressBoth();
 }
 
 export async function activateLedgerSync() {
-  await waitFor(DeviceLabels.CONNECT_WITH);
-  await pressUntilTextFound(DeviceLabels.MAKE_SURE_TO_USE);
-  await pressUntilTextFound(DeviceLabels.CONNECT_WITH);
+  await waitFor(DeviceLabels.CONNECT_TO);
+  await pressUntilTextFound(DeviceLabels.CONNECT, true);
   await pressBoth();
   await waitFor(DeviceLabels.TURN_ON_SYNC);
-  await pressUntilTextFound(DeviceLabels.YOUR_CRYPTO_ACCOUNTS);
-  await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC);
+  await pressUntilTextFound(DeviceLabels.LEDGER_LIVE_WILL_BE);
+  await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC2);
   await pressBoth();
 }
 
@@ -731,12 +728,22 @@ export async function signDelegationTransaction(delegatingAccount: Delegate) {
 }
 
 export async function verifyAmountsAndAcceptSwap(swap: Swap, amount: string) {
+  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
+  const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
+  await verifySwapData(swap, events, amount);
+  await pressBoth();
+}
+
+export async function verifyAmountsAndAcceptSwapForDifferentSeed(swap: Swap, amount: string) {
+  await pressUntilTextFound(DeviceLabels.I_UNDERSTAND);
+  await pressBoth();
   const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
   await verifySwapData(swap, events, amount);
   await pressBoth();
 }
 
 export async function verifyAmountsAndRejectSwap(swap: Swap, amount: string) {
+  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
   const events = await pressUntilTextFound(DeviceLabels.REJECT);
   await verifySwapData(swap, events, amount);
   await pressBoth();

package/src/exchange/platform/transfer/completeExchange.ts

@@ -1,4 +1,4 @@
-import secp256k1 from "secp256k1";
+import { secp256k1 } from "@noble/curves/secp256k1";
 import { firstValueFrom, from, Observable } from "rxjs";
 import { TransportStatusError, WrongDeviceForAccount } from "@ledgerhq/errors";
 
@@ -187,7 +187,8 @@ function convertSignature(signature: string, exchangeType: ExchangeTypes): Buffe
     return Buffer.from(base64Signature, "base64");
   }
   if (exchangeType === ExchangeTypes.Sell) return Buffer.from(signature, "hex");
-  return <Buffer>secp256k1.signatureExport(Buffer.from(signature, "hex"));
+  const sig = secp256k1.Signature.fromCompact(Buffer.from(signature, "hex"));
+  return Buffer.from(sig.toDERRawBytes());
 }
 
 export default completeExchange;

package/src/exchange/swap/completeExchange.ts

@@ -14,7 +14,7 @@ import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
 import { log } from "@ledgerhq/logs";
 import BigNumber from "bignumber.js";
 import { Observable } from "rxjs";
-import secp256k1 from "secp256k1";
+import { secp256k1 } from "@noble/curves/secp256k1";
 import { getCurrencyExchangeConfig } from "../";
 import { getAccountCurrency, getMainAccount } from "../../account";
 import { getAccountBridge } from "../../bridge";
@@ -271,7 +271,10 @@ const completeExchange = (
 function convertSignature(signature: string, exchangeType: ExchangeTypes): Buffer {
   return exchangeType === ExchangeTypes.SwapNg
     ? base64UrlDecode(signature)
-    : <Buffer>secp256k1.signatureExport(Buffer.from(signature, "hex"));
+    : (() => {
+        const sig = secp256k1.Signature.fromCompact(Buffer.from(signature, "hex"));
+        return Buffer.from(sig.toDERRawBytes());
+      })();
 }
 
 function base64UrlDecode(base64Url: string): Buffer {

package/src/exchange/swap/initSwap.ts

@@ -14,7 +14,7 @@ import { log } from "@ledgerhq/logs";
 import { BigNumber } from "bignumber.js";
 import invariant from "invariant";
 import { firstValueFrom, from, Observable } from "rxjs";
-import secp256k1 from "secp256k1";
+import { secp256k1 } from "@noble/curves/secp256k1";
 import { getCurrencyExchangeConfig } from "../";
 import { getAccountCurrency, getMainAccount } from "../../account";
 import { getAccountBridge } from "../../bridge";
@@ -184,9 +184,10 @@ const initSwap = (input: InitSwapInput): Observable<SwapRequestEvent> => {
 
         await swap.processTransaction(Buffer.from(swapResult.binaryPayload, "hex"), estimatedFees);
         if (unsubscribed) return;
-        const goodSign = <Buffer>(
-          secp256k1.signatureExport(Buffer.from(swapResult.signature, "hex"))
-        );
+        const goodSign = <Buffer>(() => {
+          const sig = secp256k1.Signature.fromCompact(Buffer.from(swapResult.signature, "hex"));
+          return Buffer.from(sig.toDERRawBytes());
+        })();
         await swap.checkTransactionSignature(goodSign);
         if (unsubscribed) return;
         const mainPayoutCurrency = getAccountCurrency(payoutAccount);

package/src/families/canton/config.ts

@@ -9,6 +9,7 @@ export const cantonConfig: Record<string, ConfigInfo> = {
       },
       // TBC
       nodeUrl: "https://wallet-validator-canton.ledger.com",
+      nodeId: "figment",
       // TBC
       gatewayUrl: "https://canton-gateway.api.live.ledger.com",
       minReserve: 0,
@@ -22,9 +23,12 @@ export const cantonConfig: Record<string, ConfigInfo> = {
         type: "active",
       },
       nodeUrl: "https://wallet-validator-devnet-canton.ledger-test.com",
+      nodeId: "ledger-live-devnet-prd",
       gatewayUrl: "https://canton-gateway.api.live.ledger-test.com",
       minReserve: 0,
       useGateway: true,
+      nativeInstrumentId:
+        "6e9fc50fb94e56751b49f09ba2dc84da53a9d7cff08115ebb4f6b7a12d0c990c:Splice.Amulet:Amulet",
     },
   },
   config_currency_canton_network_localnet: {
@@ -34,6 +38,7 @@ export const cantonConfig: Record<string, ConfigInfo> = {
         type: "active",
       },
       nodeUrl: "http://localhost:2975/v2",
+      nodeId: undefined,
       gatewayUrl: undefined,
       minReserve: 0,
       useGateway: false,

package/src/families/hedera/__snapshots__/bridge.integration.test.ts.snap

@@ -3,7 +3,7 @@
 exports[`hedera currency bridge scanAccounts hedera seed 1 1`] = `
 [
   {
-    "balance": "942529312",
+    "balance": "942076781",
     "currencyId": "hedera",
     "derivationMode": "hederaBip44",
     "freshAddress": "0.0.1040977",
@@ -14,22 +14,22 @@ exports[`hedera currency bridge scanAccounts hedera seed 1 1`] = `
     },
     "id": "js:2:hedera:0.0.1040977:hederaBip44",
     "index": 0,
-    "operationsCount": 40,
+    "operationsCount": 41,
     "pendingOperations": [],
     "seedIdentifier": "9e92a312233d5fd6b5a723875aeea2cea81a8e48ffc00341cff6dffcfd3ab7f2",
-    "spendableBalance": "942529312",
+    "spendableBalance": "942076781",
     "subAccounts": [],
     "swapHistory": [],
     "syncHash": "0x30c71e3f",
     "used": true,
   },
   {
-    "balance": "30000000",
+    "balance": "20000000",
     "id": "js:2:hedera:0.0.1040977:hederaBip44+hedera%2Fhts%2Ftune~!underscore!~fm~!underscore!~0.0.127877",
     "operationsCount": 0,
     "parentId": "js:2:hedera:0.0.1040977:hederaBip44",
     "pendingOperations": [],
-    "spendableBalance": "30000000",
+    "spendableBalance": "20000000",
     "swapHistory": [],
     "tokenId": "hedera/hts/tune_fm_0.0.127877",
     "type": "TokenAccountRaw",
@@ -141,12 +141,12 @@ exports[`hedera currency bridge scanAccounts hedera seed 1 1`] = `
     "used": true,
   },
   {
-    "balance": "328000000",
+    "balance": "338000000",
     "id": "js:2:hedera:0.0.8313485:hederaBip44+hedera%2Fhts%2Ftune~!underscore!~fm~!underscore!~0.0.127877",
     "operationsCount": 0,
     "parentId": "js:2:hedera:0.0.8313485:hederaBip44",
     "pendingOperations": [],
-    "spendableBalance": "328000000",
+    "spendableBalance": "338000000",
     "swapHistory": [],
     "tokenId": "hedera/hts/tune_fm_0.0.127877",
     "type": "TokenAccountRaw",
@@ -724,6 +724,26 @@ exports[`hedera currency bridge scanAccounts hedera seed 1 2`] = `
       "type": "OUT",
       "value": "1000054816",
     },
+    {
+      "accountId": "js:2:hedera:0.0.1040977:hederaBip44",
+      "blockHash": null,
+      "blockHeight": 5,
+      "extra": {
+        "consensusTimestamp": "1756718310.549818000",
+      },
+      "fee": "452531",
+      "hasFailed": false,
+      "hash": "QDUwQqgrOgB4aPkMprRe3yiux277A7_PJVfpbv-P4GBMT33ahyXp8NQXbblLDA0c",
+      "id": "js:2:hedera:0.0.1040977:hederaBip44-QDUwQqgrOgB4aPkMprRe3yiux277A7_PJVfpbv-P4GBMT33ahyXp8NQXbblLDA0c-FEES",
+      "recipients": [
+        "0.0.8313485",
+      ],
+      "senders": [
+        "0.0.1040977",
+      ],
+      "type": "FEES",
+      "value": "452531",
+    },
     {
       "accountId": "js:2:hedera:0.0.1040977:hederaBip44",
       "blockHash": null,

package/src/families/solana/setup.ts

@@ -19,6 +19,8 @@ import { SolanaCoinConfig } from "@ledgerhq/coin-solana/config";
 import { getCryptoCurrencyById } from "../../currencies";
 import { signMessage } from "@ledgerhq/coin-solana/hw-signMessage";
 import { LegacySignerSolana } from "@ledgerhq/live-signer-solana";
+import { setShouldSkipTokenLoading } from "@ledgerhq/coin-solana/preload";
+import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import { getCryptoAssetsStore } from "../../bridge/crypto-assets";
 
 const createSigner: CreateSigner<SolanaSigner> = (transport: Transport) =>
@@ -28,6 +30,13 @@ const getCurrencyConfig = () => {
   return getCurrencyConfiguration<SolanaCoinConfig>(getCryptoCurrencyById("solana"));
 };
 
+try {
+  const isCALLazyLoadingEnabled = LiveConfig.getValueByKey("feature_cal_lazy_loading");
+  setShouldSkipTokenLoading(Boolean(isCALLazyLoadingEnabled));
+} catch (error) {
+  setShouldSkipTokenLoading(false);
+}
+
 const bridge: Bridge<Transaction, SolanaAccount, TransactionStatus> = createBridges(
   executeWithSigner(createSigner),
   getCurrencyConfig,

package/src/featureFlags/defaultFeatures.ts

@@ -108,6 +108,7 @@ export const DEFAULT_FEATURES: Features = {
   postOnboardingAssetsTransfer: DEFAULT_FEATURE,
   counterValue: DEFAULT_FEATURE,
   mockFeature: DEFAULT_FEATURE,
+  calLedgerService: DEFAULT_FEATURE,
   ptxServiceCtaExchangeDrawer: DEFAULT_FEATURE,
   ptxServiceCtaScreens: DEFAULT_FEATURE,
   ptxSwapReceiveTRC20WithoutTrx: DEFAULT_FEATURE,
@@ -624,8 +625,6 @@ export const DEFAULT_FEATURES: Features = {
       enableModularization: false,
     },
   },
-  lldModularDrawerBackendData: DEFAULT_FEATURE,
-  llmModularDrawerBackendData: DEFAULT_FEATURE,
   llmModularDrawer: {
     ...DEFAULT_FEATURE,
     params: {