@ledgerhq/live-common 34.46.0-nightly.5 → 34.47.0-nightly.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.46.0-nightly.5",
+  "version": "34.47.0-nightly.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -165,76 +165,76 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.9.18-nightly.2",
-    "@ledgerhq/coin-aptos": "^3.1.1-nightly.2",
-    "@ledgerhq/coin-bitcoin": "^0.21.0-nightly.2",
-    "@ledgerhq/coin-canton": "^0.2.2-nightly.2",
-    "@ledgerhq/coin-cardano": "^0.11.2-nightly.2",
-    "@ledgerhq/coin-casper": "^2.0.9-nightly.2",
-    "@ledgerhq/coin-celo": "^1.2.1-nightly.4",
-    "@ledgerhq/coin-cosmos": "^0.16.7-nightly.2",
-    "@ledgerhq/coin-evm": "^2.28.0-nightly.4",
-    "@ledgerhq/coin-filecoin": "^1.10.1-nightly.2",
-    "@ledgerhq/coin-framework": "^6.2.0-nightly.2",
-    "@ledgerhq/coin-hedera": "^1.11.0-nightly.2",
-    "@ledgerhq/coin-icon": "^0.11.5-nightly.2",
-    "@ledgerhq/coin-internet_computer": "^1.7.18-nightly.2",
-    "@ledgerhq/coin-mina": "^1.1.17-nightly.2",
-    "@ledgerhq/coin-multiversx": "^0.4.18-nightly.2",
-    "@ledgerhq/coin-near": "^0.12.1-nightly.2",
-    "@ledgerhq/coin-polkadot": "^6.7.1-nightly.2",
-    "@ledgerhq/coin-solana": "^0.32.0-nightly.2",
-    "@ledgerhq/coin-stacks": "^0.8.18-nightly.2",
-    "@ledgerhq/coin-stellar": "^6.2.0-nightly.2",
-    "@ledgerhq/coin-sui": "^0.10.1-nightly.2",
-    "@ledgerhq/coin-tezos": "^6.1.1-nightly.2",
-    "@ledgerhq/coin-ton": "^0.13.7-nightly.2",
-    "@ledgerhq/coin-tron": "^5.1.1-nightly.2",
-    "@ledgerhq/coin-vechain": "^2.8.2-nightly.2",
-    "@ledgerhq/coin-xrp": "^7.2.0-nightly.2",
+    "@ledgerhq/coin-algorand": "^0.9.18",
+    "@ledgerhq/coin-aptos": "^3.1.1",
+    "@ledgerhq/coin-bitcoin": "^0.20.2",
+    "@ledgerhq/coin-canton": "^0.3.0",
+    "@ledgerhq/coin-cardano": "^0.11.2",
+    "@ledgerhq/coin-casper": "^2.0.9",
+    "@ledgerhq/coin-celo": "^1.2.1",
+    "@ledgerhq/coin-cosmos": "^0.16.7",
+    "@ledgerhq/coin-evm": "^2.28.0",
+    "@ledgerhq/coin-filecoin": "^1.10.1",
+    "@ledgerhq/coin-framework": "^6.2.0",
+    "@ledgerhq/coin-hedera": "^1.10.1",
+    "@ledgerhq/coin-icon": "^0.11.5",
+    "@ledgerhq/coin-internet_computer": "^1.7.18",
+    "@ledgerhq/coin-mina": "^1.1.17",
+    "@ledgerhq/coin-multiversx": "^0.4.18",
+    "@ledgerhq/coin-near": "^0.12.1",
+    "@ledgerhq/coin-polkadot": "^6.8.0",
+    "@ledgerhq/coin-solana": "^0.31.1",
+    "@ledgerhq/coin-stacks": "^0.8.18",
+    "@ledgerhq/coin-stellar": "^6.2.0",
+    "@ledgerhq/coin-sui": "^0.12.0-nightly.0",
+    "@ledgerhq/coin-tezos": "^6.2.0",
+    "@ledgerhq/coin-ton": "^0.13.8-nightly.0",
+    "@ledgerhq/coin-tron": "^5.3.0-nightly.0",
+    "@ledgerhq/coin-vechain": "^2.8.2",
+    "@ledgerhq/coin-xrp": "^7.2.0",
     "@ledgerhq/crypto-icons-ui": "^1.18.0-nightly.0",
-    "@ledgerhq/cryptoassets": "^13.26.0-nightly.1",
-    "@ledgerhq/device-core": "^0.6.1-nightly.2",
+    "@ledgerhq/cryptoassets": "^13.26.0",
+    "@ledgerhq/device-core": "^0.6.1",
     "@ledgerhq/devices": "8.5.1-nightly.0",
     "@ledgerhq/errors": "^6.25.0-nightly.0",
     "@ledgerhq/hw-app-algorand": "^6.31.6-nightly.0",
     "@ledgerhq/hw-app-aptos": "^6.34.6-nightly.0",
     "@ledgerhq/hw-app-btc": "^10.10.2-nightly.0",
-    "@ledgerhq/hw-app-celo": "^6.34.1-nightly.2",
+    "@ledgerhq/hw-app-celo": "^6.34.1",
     "@ledgerhq/hw-app-cosmos": "^6.32.6-nightly.0",
-    "@ledgerhq/hw-app-eth": "^6.45.16-nightly.2",
-    "@ledgerhq/hw-app-exchange": "^0.12.1-nightly.0",
+    "@ledgerhq/hw-app-eth": "^6.45.16",
+    "@ledgerhq/hw-app-exchange": "^0.13.0",
     "@ledgerhq/hw-app-hedera": "^1.2.6-nightly.0",
     "@ledgerhq/hw-app-icon": "^1.3.6-nightly.0",
     "@ledgerhq/hw-app-multiversx": "^6.25.1-nightly.0",
     "@ledgerhq/hw-app-near": "^6.31.6-nightly.0",
     "@ledgerhq/hw-app-polkadot": "^6.34.6-nightly.0",
     "@ledgerhq/hw-app-str": "^7.2.6-nightly.0",
-    "@ledgerhq/hw-app-sui": "^1.3.0-nightly.0",
+    "@ledgerhq/hw-app-sui": "^1.4.0-nightly.0",
     "@ledgerhq/hw-app-tezos": "^6.31.6-nightly.0",
     "@ledgerhq/hw-app-trx": "^6.31.6-nightly.0",
-    "@ledgerhq/hw-app-vet": "^0.5.14-nightly.1",
+    "@ledgerhq/hw-app-vet": "^0.5.14",
     "@ledgerhq/hw-app-xrp": "^6.32.4-nightly.0",
     "@ledgerhq/hw-transport": "^6.31.10-nightly.0",
     "@ledgerhq/hw-transport-mocker": "^6.29.10-nightly.0",
     "@ledgerhq/ledger-cal-service": "^1.3.1-nightly.1",
     "@ledgerhq/live-config": "^3.2.0-nightly.0",
-    "@ledgerhq/live-countervalues": "^0.7.0-nightly.2",
-    "@ledgerhq/live-countervalues-react": "^0.4.1-nightly.2",
-    "@ledgerhq/live-dmk-shared": "^0.12.1-nightly.0",
+    "@ledgerhq/live-countervalues": "^0.6.2",
+    "@ledgerhq/live-countervalues-react": "^0.5.0",
+    "@ledgerhq/live-dmk-shared": "^0.12.1",
     "@ledgerhq/live-env": "^2.15.0-nightly.1",
     "@ledgerhq/live-hooks": "0.1.0",
     "@ledgerhq/live-network": "^2.0.16-nightly.1",
-    "@ledgerhq/live-nft": "^0.8.18-nightly.2",
+    "@ledgerhq/live-nft": "^0.8.18",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-canton": "^0.2.2-nightly.2",
-    "@ledgerhq/live-signer-evm": "^0.7.1-nightly.4",
-    "@ledgerhq/live-signer-solana": "^0.5.3-nightly.2",
-    "@ledgerhq/live-wallet": "^0.13.0-nightly.2",
+    "@ledgerhq/live-signer-canton": "^0.2.3-nightly.0",
+    "@ledgerhq/live-signer-evm": "^0.7.1",
+    "@ledgerhq/live-signer-solana": "^0.5.3",
+    "@ledgerhq/live-wallet": "^0.12.2",
     "@ledgerhq/logs": "^6.13.0",
     "@ledgerhq/speculos-transport": "^0.2.9-nightly.1",
     "@ledgerhq/wallet-api-acre-module": "^0.6.0",
-    "@ledgerhq/wallet-api-exchange-module": "^0.16.0-nightly.0"
+    "@ledgerhq/wallet-api-exchange-module": "^0.16.0-nightly.1"
   },
   "devDependencies": {
     "@solana/web3.js": "1.95.4",
@@ -282,10 +282,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.2.42-nightly.2",
+    "@ledgerhq/device-react": "^0.2.42",
     "@ledgerhq/types-cryptoassets": "^7.26.0-nightly.0",
-    "@ledgerhq/types-devices": "^6.26.0",
-    "@ledgerhq/types-live": "^6.82.0-nightly.2"
+    "@ledgerhq/types-devices": "^6.27.0",
+    "@ledgerhq/types-live": "^6.82.0"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

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

@@ -14,9 +14,10 @@ exports[`sui currency bridge scanAccounts sui seed 1 1`] = `
     "pendingOperations": [],
     "seedIdentifier": "e5fb8c817b97e9e9aec677b9e822e8a60c7471624f36b701c94560b88195a8e7",
     "spendableBalance": "102696240",
+    "subAccounts": [],
     "suiResources": {},
     "swapHistory": [],
-    "syncHash": undefined,
+    "syncHash": "6p9XjoTwZ81o9xTkodgswDbETbrN5Lkv1b2shBN4p99s",
     "used": true,
   },
   {
@@ -31,6 +32,7 @@ exports[`sui currency bridge scanAccounts sui seed 1 1`] = `
     "pendingOperations": [],
     "seedIdentifier": "e5fb8c817b97e9e9aec677b9e822e8a60c7471624f36b701c94560b88195a8e7",
     "spendableBalance": "0",
+    "subAccounts": [],
     "suiResources": {},
     "swapHistory": [],
     "syncHash": undefined,

package/src/families/sui/constants.ts

@@ -0,0 +1,2 @@
+// Encapsulate for LLD et LLM
+export * from "@ledgerhq/coin-sui/constants";

package/src/families/sui/logic.ts

@@ -0,0 +1,2 @@
+// Encapsulate for LLD et LLM
+export * from "@ledgerhq/coin-sui/logic";

package/src/families/sui/react.ts

@@ -0,0 +1,115 @@
+import { useEffect, useMemo, useState } from "react";
+import { FIGMENT_SUI_VALIDATOR_ADDRESS } from "@ledgerhq/coin-sui/constants";
+import { BigNumber } from "bignumber.js";
+import { SuiAccount, SuiResources, SuiValidator, MappedStake } from "./types";
+import { getAccountCurrency } from "../../account";
+import { Unit } from "@ledgerhq/types-cryptoassets";
+import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies";
+import { getCurrentSuiPreloadData } from "@ledgerhq/coin-sui/preload";
+import { getOperationExtra } from "@ledgerhq/coin-sui/getOperationExtra";
+import { OperationType } from "@ledgerhq/types-live";
+
+export function useSuiMappedStakingPositions(account: SuiAccount) {
+  const { validators } = getCurrentSuiPreloadData();
+  const stakingPositions = account.suiResources?.stakes;
+
+  const unit = getAccountCurrency(account).units[0];
+
+  return useMemo(
+    () => mapStakingPositions(stakingPositions ?? [], validators, unit),
+    [stakingPositions, validators, unit],
+  );
+}
+
+export function useGetExtraDetails(account: SuiAccount, type: OperationType, digest: string) {
+  if (!account.suiResources) {
+    account.suiResources = {};
+  }
+  if (!account.suiResources.cachedOps) {
+    account.suiResources.cachedOps = {};
+  }
+  const cache = account.suiResources.cachedOps;
+  const [data, setData] = useState(cache[digest]);
+
+  useEffect(() => {
+    if (type !== "DELEGATE" && type !== "UNDELEGATE") return;
+    if (data) return;
+    getOperationExtra(digest).then(result => {
+      setData(result);
+      cache[digest] = result;
+    });
+  }, [data, digest, cache, type]);
+
+  return data;
+}
+
+export function useLedgerFirstShuffledValidatorsSui(search: string) {
+  const { validators: unorderedValidators } = getCurrentSuiPreloadData();
+  const validators = reorderValidators(unorderedValidators);
+  return useMemo(() => {
+    if (validators.length === 0 || !search || search === "") {
+      return validators;
+    }
+
+    const lowercaseSearch = search.toLowerCase();
+
+    const filtered = validators.filter(
+      validator =>
+        validator.suiAddress?.toLowerCase().includes(lowercaseSearch) ||
+        validator.name.toLowerCase().includes(lowercaseSearch),
+    );
+
+    return filtered;
+  }, [validators, search]);
+}
+
+function reorderValidators(validators: SuiValidator[]): SuiValidator[] {
+  const sortedValidators = [...validators].sort((a, b) =>
+    new BigNumber(b.stakingPoolSuiBalance).minus(new BigNumber(a.stakingPoolSuiBalance)).toNumber(),
+  );
+
+  // move Ledger validator to the first position
+  const ledgerValidator = sortedValidators.find(
+    v => v.suiAddress === FIGMENT_SUI_VALIDATOR_ADDRESS,
+  );
+
+  if (ledgerValidator) {
+    const sortedValidatorsLedgerFirst = sortedValidators.filter(
+      v => v.suiAddress !== FIGMENT_SUI_VALIDATOR_ADDRESS,
+    );
+    sortedValidatorsLedgerFirst.unshift(ledgerValidator);
+
+    return sortedValidatorsLedgerFirst;
+  }
+
+  return sortedValidators;
+}
+
+type Stake = Required<SuiResources>["stakes"];
+
+export const mapStakingPositions = (
+  stakingPositions: Stake,
+  validators: SuiValidator[],
+  unit: Unit,
+): MappedStake[] => {
+  const data = stakingPositions.flatMap(sp =>
+    sp.stakes.map(s => ({ ...s, validatorAddress: sp.validatorAddress })),
+  );
+  return data.map<MappedStake>(sp => {
+    const rank = validators.findIndex(v => v.suiAddress === sp.validatorAddress);
+    const validator = validators[rank] ?? sp;
+    const formatConfig = {
+      disableRounding: false,
+      alwaysShowSign: false,
+      showCode: true,
+    };
+
+    return {
+      ...sp,
+      rank,
+      validator,
+      stakedSuiId: sp.stakedSuiId,
+      formattedAmount: formatCurrencyUnit(unit, BigNumber(sp.principal), formatConfig),
+    };
+  });
+};

package/src/families/sui/types.ts

@@ -0,0 +1,2 @@
+// Encapsulate for LLD et LLM
+export * from "@ledgerhq/coin-sui/types";

package/src/modularDrawer/hooks/modules/useAssetAccountCounts.tsx

@@ -0,0 +1,36 @@
+import { Observable } from "rxjs";
+import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { getAccountTuplesForCurrency } from "../../../utils/getAccountTuplesForCurrency";
+import type { Account } from "@ledgerhq/types-live";
+import { WalletAPIAccount } from "../../../wallet-api/types";
+
+type AccountModuleParams = {
+  assets: CryptoOrTokenCurrency[];
+  nestedAccounts: Account[];
+  accountIds: Map<string, boolean> | undefined;
+  formatLabel: (count: number) => string;
+  accounts$?: Observable<WalletAPIAccount[]>;
+};
+
+export type AssetCountItem = {
+  asset: CryptoOrTokenCurrency;
+  label: string;
+  count: number;
+};
+
+export const useAssetAccountCounts = ({
+  assets,
+  nestedAccounts,
+  accountIds,
+  formatLabel,
+}: AccountModuleParams): AssetCountItem[] =>
+  assets
+    .map(asset => {
+      const { length } = getAccountTuplesForCurrency(asset, nestedAccounts, accountIds);
+      return {
+        asset,
+        label: formatLabel(length),
+        count: length,
+      };
+    })
+    .sort((a, b) => b.count - a.count);

package/src/modularDrawer/hooks/modules/useLeftApyModule.tsx

@@ -0,0 +1,26 @@
+import React from "react";
+import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { ApyType } from "../../types";
+
+const createApyItem = ({
+  value,
+  type,
+  ApyIndicator,
+}: {
+  value: number;
+  type: ApyType;
+  ApyIndicator: React.ComponentType<{ value: number; type: ApyType }>;
+}) => <ApyIndicator value={value} type={type} />;
+
+export const useLeftApyModule = (
+  assets: CryptoOrTokenCurrency[],
+  ApyIndicator: React.ComponentType<{ value: number; type: ApyType }>,
+) => {
+  const value = 5.11; // TODO to be retrieved from DADA
+  const type = "APY"; // TODO to be retrieved from DADA
+
+  return assets.map(asset => ({
+    ...asset,
+    leftElement: createApyItem({ value, type, ApyIndicator }),
+  }));
+};

package/src/modularDrawer/types.ts

@@ -0,0 +1 @@
+export type ApyType = "NRR" | "APY" | "APR";

package/src/wallet-api/Exchange/error.ts

@@ -24,6 +24,16 @@ export function createWrongSellParams(params: unknown): ExchangeErrorData {
   };
 }
 
+export function createWrongFundParams(params: unknown): ExchangeErrorData {
+  return {
+    code: "WRONG_FUND_PARAMS",
+    message: "fund params are not correctly set",
+    data: {
+      params,
+    },
+  };
+}
+
 export function createAccounIdNotFound(accountId: string): ExchangeErrorData {
   return {
     code: "ACCOUNT_ID_NOT_FOUND",

package/src/wallet-api/Exchange/server.test.ts

@@ -3,6 +3,7 @@ import {
   ExchangeStartParams,
   ExchangeStartSellParams,
   ExchangeStartSwapParams,
+  ExchangeStartFundParams,
 } from "@ledgerhq/wallet-api-exchange-module";
 import { WalletContext, WalletHandlers } from "@ledgerhq/wallet-api-server";
 import { of } from "rxjs";
@@ -153,8 +154,10 @@ describe("handlers", () => {
         uiHooks: mockUiHooks,
       });
 
-      const params: ExchangeStartParams = {
+      const params: ExchangeStartFundParams = {
         exchangeType: "FUND",
+        provider: "TestFundProvider",
+        fromAccountId: accounts[0].id,
       };
       const { request, context, walletHandlers } = prepareSellRequest(params);
 
@@ -170,6 +173,7 @@ describe("handlers", () => {
       expect(mockUiStartExchange).toHaveBeenCalledTimes(1);
       const receivedParams = mockUiStartExchange.mock.calls[0][0].exchangeParams;
       expect(receivedParams.exchangeType).toBe("FUND");
+      expect(receivedParams.provider).toBe("TestFundProvider");
       expect(mockUiCompleteExchange).not.toHaveBeenCalled();
     });
   });

package/src/wallet-api/Exchange/server.ts

@@ -22,6 +22,7 @@ import {
   ExchangeStartResult,
   ExchangeStartSellParams,
   ExchangeStartSwapParams,
+  ExchangeStartFundParams,
   ExchangeSwapParams,
   ExchangeType,
   SwapLiveError,
@@ -44,6 +45,7 @@ import {
   createAccounIdNotFound,
   createWrongSellParams,
   createWrongSwapParams,
+  createWrongFundParams,
   ExchangeError,
 } from "./error";
 import { TrackingAPI } from "./tracking";
@@ -82,6 +84,8 @@ export type CompleteExchangeUiRequest = {
 };
 type FundStartParamsUiRequest = {
   exchangeType: "FUND";
+  provider: string;
+  exchange: Partial<Exchange> | undefined;
 };
 
 type SellStartParamsUiRequest = {
@@ -158,8 +162,6 @@ export const handlers = ({
         }
 
         const trackingParams = {
-          // @ts-expect-error ExchangeStartFundParams does not yet have the provider. Will be added in another iteration after a bugfix is confirmed
-          // TODO: expect-error to be deleted after
           provider: params.provider,
           exchangeType: params.exchangeType,
         };
@@ -174,9 +176,7 @@ export const handlers = ({
         } else if (params.exchangeType == "SELL") {
           exchangeParams = extractSellStartParam(params, accounts);
         } else {
-          exchangeParams = {
-            exchangeType: params.exchangeType,
-          };
+          exchangeParams = extractFundStartParam(params, accounts);
         }
 
         return new Promise((resolve, reject) =>
@@ -711,6 +711,45 @@ function extractSellStartParam(
   };
 }
 
+function extractFundStartParam(
+  params: ExchangeStartFundParams,
+  accounts: AccountLike[],
+): ExchangeStartParamsUiRequest {
+  if (!("provider" in params)) {
+    throw new ExchangeError(createWrongFundParams(params));
+  }
+
+  if (!params.fromAccountId) {
+    return {
+      exchangeType: params.exchangeType,
+      provider: params.provider,
+    } as ExchangeStartParamsUiRequest;
+  }
+
+  const realFromAccountId = getAccountIdFromWalletAccountId(params?.fromAccountId);
+
+  if (!realFromAccountId) {
+    throw new ExchangeError(createAccounIdNotFound(params.fromAccountId));
+  }
+
+  const fromAccount = accounts?.find(acc => acc.id === realFromAccountId);
+
+  if (!fromAccount) {
+    throw new ServerError(createAccountNotFound(params.fromAccountId));
+  }
+
+  const fromParentAccount = getParentAccount(fromAccount, accounts);
+
+  return {
+    exchangeType: params.exchangeType,
+    provider: params.provider,
+    exchange: {
+      fromAccount,
+      fromParentAccount,
+    },
+  };
+}
+
 async function getToCurrency(
   binaryPayload: string,
   toAccount: AccountLike,