@ledgerhq/live-common 34.52.0-nightly.0 → 34.52.0-nightly.2

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

@@ -3,10 +3,18 @@ import { GetAccountShape, mergeOps } from "@ledgerhq/coin-framework/bridge/jsHel
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
 import BigNumber from "bignumber.js";
 import { getAlpacaApi } from "./alpaca";
-import { adaptCoreOperationToLiveOperation, extractBalance } from "./utils";
+import { adaptCoreOperationToLiveOperation, cleanedOperation, extractBalance } from "./utils";
 import { inferSubOperations } from "@ledgerhq/coin-framework/serialization";
-import { buildSubAccounts, OperationCommon } from "./buildSubAccounts";
-import { Pagination } from "@ledgerhq/coin-framework/api/types";
+import { buildSubAccounts, mergeSubAccounts } from "./buildSubAccounts";
+import type { Operation, Pagination } from "@ledgerhq/coin-framework/api/types";
+import type { OperationCommon } from "./types";
+
+function isNftCoreOp(operation: Operation): boolean {
+  return (
+    typeof operation.details?.ledgerOpType === "string" &&
+    ["NFT_IN", "NFT_OUT"].includes(operation.details?.ledgerOpType)
+  );
+}
 
 export function genericGetAccountShape(network: string, kind: string): GetAccountShape {
   return async (info, syncConfig) => {
@@ -56,39 +64,34 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
     }
 
     const [newCoreOps] = await alpacaApi.listOperations(address, paginationParams);
-    const newOps = newCoreOps.map(op =>
-      adaptCoreOperationToLiveOperation(accountId, op),
-    ) as OperationCommon[];
-    const mergedOps = mergeOps(oldOps, newOps) as OperationCommon[];
+    const newOps = newCoreOps
+      .filter(op => !isNftCoreOp(op))
+      .map(op => adaptCoreOperationToLiveOperation(accountId, op)) as OperationCommon[];
 
-    const assetOperations: OperationCommon[] = [];
-    mergedOps.forEach(operation => {
-      if (
+    const newAssetOperations = newOps.filter(
+      operation =>
         operation?.extra?.assetReference &&
         operation?.extra?.assetOwner &&
-        !["OPT_IN", "OPT_OUT"].includes(operation.type)
-      ) {
-        assetOperations.push(operation);
-      }
-    });
-
-    const subAccounts = await buildSubAccounts({
-      currency,
+        !["OPT_IN", "OPT_OUT"].includes(operation.type),
+    );
+    const newSubAccounts = await buildSubAccounts({
       accountId,
       allTokenAssetsBalances,
       syncConfig,
-      operations: assetOperations,
+      operations: newAssetOperations,
       getTokenFromAsset: alpacaApi.getTokenFromAsset,
     });
+    const subAccounts = mergeSubAccounts(initialAccount?.subAccounts ?? [], newSubAccounts);
 
-    const operations = mergedOps.map(op => {
-      const subOperations = inferSubOperations(op.hash, subAccounts);
+    const newOpsWithSubs = newOps.map(op => {
+      const subOperations = inferSubOperations(op.hash, newSubAccounts);
 
-      return {
+      return cleanedOperation({
         ...op,
         subOperations,
-      };
+      });
     });
+    const operations = mergeOps(oldOps, newOpsWithSubs) as OperationCommon[];
 
     const res = {
       id: accountId,

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

@@ -29,9 +29,11 @@ jest.mock("../alpaca", () => ({
 
 const adaptCoreOperationToLiveOperationMock = jest.fn();
 const extractBalanceMock = jest.fn();
+const cleanedOperationMock = jest.fn();
 jest.mock("../utils", () => ({
   adaptCoreOperationToLiveOperation: (...a: any[]) => adaptCoreOperationToLiveOperationMock(...a),
   extractBalance: (...a: any[]) => extractBalanceMock(...a),
+  cleanedOperation: (...a: any[]) => cleanedOperationMock(...a),
 }));
 
 const inferSubOperationsMock = jest.fn();
@@ -40,8 +42,10 @@ jest.mock("@ledgerhq/coin-framework/serialization", () => ({
 }));
 
 const buildSubAccountsMock = jest.fn();
+const mergeSubAccountsMock = jest.fn();
 jest.mock("../buildSubAccounts", () => ({
   buildSubAccounts: (...a: any[]) => buildSubAccountsMock(...a),
+  mergeSubAccounts: (...a: any[]) => mergeSubAccountsMock(...a),
 }));
 
 // Test matrix for Stellar & XRP
@@ -51,7 +55,7 @@ const chains = [
   { currency: { id: "tezos", name: "Tezos" }, network: "mainnet" },
 ];
 
-describe("genericGetAccountShape (stellar & xrp)", () => {
+describe("genericGetAccountShape", () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
@@ -88,6 +92,11 @@ describe("genericGetAccountShape (stellar & xrp)", () => {
       }));
 
       mergeOpsMock.mockImplementation((oldOps, newOps) => [...newOps, ...oldOps]);
+      cleanedOperationMock.mockImplementation(operation => operation);
+      mergeSubAccountsMock.mockImplementation((oldSubAccounts, newSubAccounts) => [
+        ...newSubAccounts,
+        ...oldSubAccounts,
+      ]);
 
       buildSubAccountsMock.mockReturnValue([
         { id: `${currency.id}_subAcc1`, type: "TokenAccount" },

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

@@ -1,4 +1,4 @@
-import { TransactionCommon } from "@ledgerhq/types-live";
+import type { Operation, TransactionCommon } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
 import type { Unit } from "@ledgerhq/types-cryptoassets";
 
@@ -32,3 +32,7 @@ export type GenericTransaction = TransactionCommon & {
   assetOwner?: string;
   networkInfo?: NetworkInfo | null;
 };
+
+export interface OperationCommon extends Operation {
+  extra: Record<string, any>;
+}

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

@@ -1,5 +1,6 @@
 import {
   adaptCoreOperationToLiveOperation,
+  cleanedOperation,
   extractBalance,
   findCryptoCurrencyByNetwork,
   transactionToIntent,
@@ -7,9 +8,38 @@ import {
 import BigNumber from "bignumber.js";
 import { Operation as CoreOperation } from "@ledgerhq/coin-framework/api/types";
 import { Account } from "@ledgerhq/types-live";
-import { GenericTransaction } from "./types";
+import { GenericTransaction, OperationCommon } from "./types";
 
 describe("Alpaca utils", () => {
+  describe("cleanedOperation", () => {
+    it("creates a cleaned version of an operation without mutating it", () => {
+      const dirty = {
+        id: "id",
+        hash: "hash",
+        senders: ["sender"],
+        recipients: ["recipient"],
+        extra: { assetAmount: 5, assetReference: "USDC", paginationToken: "pagination" },
+      } as unknown as OperationCommon;
+
+      const clean = cleanedOperation(dirty);
+
+      expect(clean).toEqual({
+        id: "id",
+        hash: "hash",
+        senders: ["sender"],
+        recipients: ["recipient"],
+        extra: { paginationToken: "pagination" },
+      });
+      expect(dirty).toEqual({
+        id: "id",
+        hash: "hash",
+        senders: ["sender"],
+        recipients: ["recipient"],
+        extra: { assetAmount: 5, assetReference: "USDC", paginationToken: "pagination" },
+      });
+    });
+  });
+
   describe("transactionToIntent", () => {
     describe("type", () => {
       it("fallbacks to 'Payment' without a transaction mode", () => {

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

@@ -9,7 +9,7 @@ import {
 } from "@ledgerhq/coin-framework/api/types";
 import { findCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
-import { GenericTransaction } from "./types";
+import { GenericTransaction, OperationCommon } from "./types";
 
 export function findCryptoCurrencyByNetwork(network: string): CryptoCurrency | undefined {
   const networksRemap = {
@@ -27,6 +27,30 @@ export function extractBalance(balances: Balance[], type: string): Balance {
   );
 }
 
+function isStringArray(value: unknown): value is string[] {
+  return Array.isArray(value) && value.every(item => typeof item === "string");
+}
+
+export function cleanedOperation(operation: OperationCommon): OperationCommon {
+  if (!operation.extra) return operation;
+
+  const extraToClean = new Set([
+    "assetReference",
+    "assetAmount",
+    "assetOwner",
+    "assetSenders",
+    "assetRecipients",
+    "parentSenders",
+    "parentRecipients",
+    "ledgerOpType",
+  ]);
+  const cleanedExtra = Object.fromEntries(
+    Object.entries(operation.extra).filter(([key]) => !extraToClean.has(key)),
+  );
+
+  return { ...operation, extra: cleanedExtra };
+}
+
 export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOperation): Operation {
   const opType = op.type as OperationType;
 
@@ -34,6 +58,10 @@ export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOpe
     assetReference?: string;
     assetOwner?: string;
     assetAmount?: string | undefined;
+    assetSenders?: string[];
+    assetRecipients?: string[];
+    parentSenders?: string[];
+    parentRecipients?: string[];
     ledgerOpType?: string | undefined;
     memo?: string | undefined;
   } = {};
@@ -46,6 +74,22 @@ export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOpe
     extra.assetAmount = op.details.assetAmount as string;
   }
 
+  if (isStringArray(op.details?.assetSenders)) {
+    extra.assetSenders = op.details?.assetSenders;
+  }
+
+  if (isStringArray(op.details?.assetRecipients)) {
+    extra.assetRecipients = op.details?.assetRecipients;
+  }
+
+  if (isStringArray(op.details?.parentSenders)) {
+    extra.parentSenders = op.details?.parentSenders;
+  }
+
+  if (isStringArray(op.details?.parentRecipients)) {
+    extra.parentRecipients = op.details?.parentRecipients;
+  }
+
   if (op.asset?.type !== "native") {
     extra.assetReference =
       "assetReference" in (op.asset ?? {}) ? (op.asset as any).assetReference : "";
@@ -67,11 +111,11 @@ export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOpe
     fee: bnFees,
     blockHash: op.tx.block.hash,
     blockHeight: op.tx.block.height,
-    senders: op.senders,
-    recipients: op.recipients,
+    senders: extra.parentSenders ?? op.senders,
+    recipients: extra.parentRecipients ?? op.recipients,
     date: op.tx.date,
     transactionSequenceNumber: op.details?.sequence as number,
-    hasFailed: (op.details as unknown as { status?: string })?.status === "failed",
+    hasFailed: op.details?.status === "failed",
     extra,
   };
 

package/src/e2e/data/deviceLabelsData.ts

@@ -114,7 +114,7 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.ETHEREUM.name]: DeviceLabels.VERIFY_ETHEREUM,
       [AppInfos.POLKADOT.name]: DeviceLabels.PLEASE_REVIEW,
       [AppInfos.POLYGON.name]: DeviceLabels.VERIFY_POLYGON,
-      [AppInfos.SOLANA.name]: DeviceLabels.VERIFY_SOLANA_ADDRESS,
+      [AppInfos.SOLANA.name]: DeviceLabels.PUBKEY,
       default: DeviceLabels.ADDRESS,
     },
     receiveConfirm: {
@@ -124,14 +124,13 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.ETHEREUM.name]: DeviceLabels.CONFIRM,
       [AppInfos.POLKADOT.name]: DeviceLabels.CAPS_APPROVE,
       [AppInfos.POLYGON.name]: DeviceLabels.CONFIRM,
-      [AppInfos.SOLANA.name]: DeviceLabels.CONFIRM,
       default: DeviceLabels.APPROVE,
     },
     delegateVerify: {
       [AppInfos.COSMOS.name]: DeviceLabels.PLEASE_REVIEW,
       [AppInfos.MULTIVERS_X.name]: DeviceLabels.RECEIVER,
       [AppInfos.NEAR.name]: DeviceLabels.VIEW_HEADER,
-      [AppInfos.SOLANA.name]: DeviceLabels.REVIEW_TRANSACTION,
+      [AppInfos.SOLANA.name]: DeviceLabels.DELEGATE_FROM,
       default: DeviceLabels.REVIEW_OPERATION,
     },
     delegateConfirm: {
@@ -141,7 +140,6 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.INJECTIVE.name]: DeviceLabels.CAPS_APPROVE,
       [AppInfos.MULTIVERS_X.name]: DeviceLabels.SIGN,
       [AppInfos.NEAR.name]: DeviceLabels.CONTINUE_TO_ACTION,
-      [AppInfos.SOLANA.name]: DeviceLabels.SIGN_TRANSACTION,
       [AppInfos.OSMOSIS.name]: DeviceLabels.CAPS_APPROVE,
       default: DeviceLabels.APPROVE,
     },
@@ -160,6 +158,7 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.BITCOIN.name]: DeviceLabels.SIGN_TRANSACTION,
       [AppInfos.KASPA.name]: DeviceLabels.APPROVE,
       [AppInfos.DOGECOIN.name]: DeviceLabels.ACCEPT,
+      [AppInfos.BITCOIN_CASH.name]: DeviceLabels.ACCEPT,
       default: DeviceLabels.CAPS_APPROVE,
     },
   },

package/src/e2e/speculos.ts

@@ -723,26 +723,23 @@ export function getDeviceLabels(appInfo: AppInfos): DeviceLabelsReturn {
 export async function expectValidAddressDevice(account: Account, addressDisplayed: string) {
   if (account.currency === Currency.SUI_USDC) {
     providePublicKey();
+  }
+  const { receiveVerifyLabel, receiveConfirmLabel } = getDeviceLabels(account.currency.speculosApp);
+  await waitFor(receiveVerifyLabel);
+  if (isTouchDevice()) {
+    const events = await pressUntilTextFound(receiveConfirmLabel);
+    const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
+    expect(isAddressCorrect).toBeTruthy();
+    await pressAndRelease(DeviceLabels.CONFIRM);
   } else {
     const { receiveVerifyLabel, receiveConfirmLabel } = getDeviceLabels(
       account.currency.speculosApp,
     );
     await waitFor(receiveVerifyLabel);
-    if (isTouchDevice()) {
-      const events = await pressUntilTextFound(receiveConfirmLabel);
-      const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
-      expect(isAddressCorrect).toBeTruthy();
-      await pressAndRelease(DeviceLabels.CONFIRM);
-    } else {
-      const { receiveVerifyLabel, receiveConfirmLabel } = getDeviceLabels(
-        account.currency.speculosApp,
-      );
-      await waitFor(receiveVerifyLabel);
-      const events = await pressUntilTextFound(receiveConfirmLabel);
-      const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
-      expect(isAddressCorrect).toBeTruthy();
-      await pressBoth();
-    }
+    const events = await pressUntilTextFound(receiveConfirmLabel);
+    const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
+    expect(isAddressCorrect).toBeTruthy();
+    await pressBoth();
   }
 }
 

package/src/modularDrawer/__mocks__/currencies.mock.ts

@@ -7,6 +7,7 @@ export const mockArbitrumCryptoCurrency = getCryptoCurrencyById("arbitrum");
 export const mockBaseCryptoCurrency = getCryptoCurrencyById("base");
 export const mockScrollCryptoCurrency = getCryptoCurrencyById("scroll");
 export const mockInjectiveCryptoCurrency = getCryptoCurrencyById("injective");
+export const mockBscCryptoCurrency = getCryptoCurrencyById("bsc");
 
 export const arbitrumToken: TokenCurrency = {
   type: "TokenCurrency",
@@ -41,6 +42,45 @@ export const usdcToken: TokenCurrency = {
   ],
 };
 
+export const maticEth: TokenCurrency = {
+  type: "TokenCurrency" as const,
+  id: "ethereum/erc20/matic",
+  ledgerSignature: "",
+  contractAddress: "0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0",
+  parentCurrency: mockEthCryptoCurrency,
+  tokenType: "erc20" as const,
+  name: "Matic",
+  ticker: "MATIC",
+  delisted: false,
+  disableCountervalue: false,
+  units: [
+    {
+      name: "Matic",
+      code: "MATIC",
+      magnitude: 18,
+    },
+  ],
+};
+
+export const maticBsc: TokenCurrency = {
+  type: "TokenCurrency" as const,
+  id: "bsc/bep20/matic_token",
+  ledgerSignature: "",
+  contractAddress: "0xCC42724C6683B7E57334c4E856f4c9965ED682bD",
+  parentCurrency: mockBscCryptoCurrency,
+  tokenType: "bep20" as const,
+  name: "Matic Token",
+  ticker: "MATIC",
+  delisted: false,
+  disableCountervalue: false,
+  units: [
+    {
+      name: "Matic Token",
+      code: "MATIC",
+      magnitude: 18,
+    },
+  ],
+};
 export const findCryptoCurrencyById = (id: string) =>
   [mockBtcCryptoCurrency, mockEthCryptoCurrency, mockArbitrumCryptoCurrency].find(a => a.id === id);
 export const getTokenOrCryptoCurrencyById = (id: string) =>

package/src/modularDrawer/utils/index.ts

@@ -2,17 +2,13 @@ import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 export { groupCurrenciesByProvider } from "./groupCurrenciesByProvider";
 export { sortAccountsByFiatValue } from "./sortAccountsByFiatValue";
 
-function isCorrespondingCurrency(
+const getBaseId = (currency: CryptoOrTokenCurrency) =>
+  currency.type === "CryptoCurrency" ? currency.id : currency.parentCurrency.id;
+
+function belongsToSameNetwork(
   elem: CryptoOrTokenCurrency,
   network: CryptoOrTokenCurrency,
 ): boolean {
-  if (elem.type === "TokenCurrency") {
-    return elem.parentCurrency?.id === network.id || elem.id === network.id;
-  }
-  if (elem.type === "CryptoCurrency") {
-    return elem.id === network.id;
-  }
-  return false;
+  return getBaseId(elem) === getBaseId(network);
 }
-
-export { isCorrespondingCurrency };
+export { getBaseId, belongsToSameNetwork };

package/src/modularDrawer/utils/index.test.ts

@@ -1,43 +0,0 @@
-import { isCorrespondingCurrency } from "./index";
-
-import { createFixtureCryptoCurrency } from "../../mock/fixtures/cryptoCurrencies";
-import { cryptocurrenciesById } from "@ledgerhq/cryptoassets";
-import type { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
-
-describe("isCorrespondingCurrency", () => {
-  const evmCurrency = createFixtureCryptoCurrency("evm");
-  const usdcToken: CryptoOrTokenCurrency = {
-    type: "TokenCurrency",
-    id: "ethereum/erc20/usdc",
-    contractAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-    parentCurrency: evmCurrency,
-    tokenType: "erc20",
-    name: "USD Coin",
-    ticker: "USDC",
-    units: [{ name: "USD Coin", code: "USDC", magnitude: 6 }],
-  };
-  const evmCrypto: CryptoOrTokenCurrency = evmCurrency;
-
-  it("returns true for a token whose parentCurrency.id matches the reference crypto", () => {
-    expect(isCorrespondingCurrency(usdcToken, evmCurrency)).toBe(true);
-  });
-
-  it("returns true for a token whose id matches the reference crypto", () => {
-    expect(isCorrespondingCurrency(usdcToken, usdcToken)).toBe(true);
-  });
-
-  it("returns true for a crypto whose id matches the reference crypto", () => {
-    expect(isCorrespondingCurrency(evmCrypto, evmCurrency)).toBe(true);
-  });
-
-  it("returns false for a token whose parentCurrency is different", () => {
-    const bitcoinCurrency = cryptocurrenciesById["bitcoin"];
-    const tokenWithOtherParent = { ...usdcToken, parentCurrency: bitcoinCurrency };
-    expect(isCorrespondingCurrency(tokenWithOtherParent, evmCurrency)).toBe(false);
-  });
-
-  it("returns false for a crypto whose id is different", () => {
-    const bitcoinCurrency = cryptocurrenciesById["bitcoin"];
-    expect(isCorrespondingCurrency(bitcoinCurrency, evmCurrency)).toBe(false);
-  });
-});