@ledgerhq/live-common 34.48.0-nightly.3 → 34.48.0-nightly.5

package/src/exchange/swap/transactionStrategies.ts

@@ -1,16 +1,7 @@
 import { BigNumber } from "bignumber.js";
 
-import {
-  CosmosTransaction,
-  ElrondTransaction,
-  RippleTransaction,
-  SolanaTransaction,
-  StellarTransaction,
-  TonTransaction,
-  Transaction,
-  TransactionCommon,
-} from "@ledgerhq/wallet-api-client";
-
+import { Transaction } from "../../generated/types";
+import { TransactionCommon } from "@ledgerhq/types-live";
 export type { SwapLiveError } from "@ledgerhq/wallet-api-exchange-module";
 
 export function defaultTransaction({
@@ -18,35 +9,81 @@ export function defaultTransaction({
   amount,
   recipient,
   customFeeConfig,
-}: TransactionWithCustomFee): Transaction {
-  return <Transaction>{
+}: TransactionWithCustomFee): Partial<Transaction> {
+  // Type assertion needed because each Transaction family has different required properties
+  // This function provides base properties that are then extended by family-specific functions
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return {
     family,
     amount,
     recipient,
     ...customFeeConfig,
+  } as Partial<Transaction>;
+}
+
+export function cardanoTransaction({
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "cardano" }>> {
+  return {
+    family: "cardano",
+    amount,
+    recipient,
+    mode: "send",
+    ...customFeeConfig,
   };
 }
 
-export function modeSendTransaction({
-  family,
+export function nearTransaction({
   amount,
   recipient,
   customFeeConfig,
-}: TransactionWithCustomFee): Transaction {
+}: TransactionWithCustomFee): Extract<Transaction, { family: "near" }> {
   return {
-    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
+    family: "near",
+    amount,
+    recipient,
     mode: "send",
+    ...customFeeConfig,
+  };
+}
+
+export function tezosTransaction({
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "tezos" }>> {
+  return {
+    family: "tezos",
+    amount,
+    recipient,
+    mode: "send",
+    ...customFeeConfig,
+  };
+}
+
+export function tronTransaction({
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "tron" }>> {
+  return {
+    family: "tron",
+    amount,
+    recipient,
+    mode: "send",
+    ...customFeeConfig,
   };
 }
 
 export function stellarTransaction({
-  family,
   amount,
   recipient,
   customFeeConfig,
   payinExtraId,
   customErrorType,
-}: TransactionWithCustomFee): StellarTransaction {
+}: TransactionWithCustomFee): Extract<Transaction, { family: "stellar" }> {
   if (!payinExtraId)
     throw {
       error: new Error("Missing payinExtraId"),
@@ -55,8 +92,11 @@ export function stellarTransaction({
     };
 
   return {
-    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
     family: "stellar",
+    mode: "send",
+    amount,
+    recipient,
+    ...customFeeConfig,
     memoValue: payinExtraId,
     memoType: "MEMO_TEXT",
   };
@@ -68,7 +108,7 @@ export function rippleTransaction({
   customFeeConfig,
   payinExtraId,
   customErrorType,
-}: TransactionWithCustomFee): RippleTransaction {
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "xrp" }>> {
   if (!payinExtraId)
     throw {
       error: new Error("Missing payinExtraId"),
@@ -76,38 +116,40 @@ export function rippleTransaction({
       customErrorType,
     };
 
-  const transaction: RippleTransaction = {
-    family: "ripple",
+  return {
+    family: "xrp",
     amount,
     recipient,
     ...customFeeConfig,
     tag: new BigNumber(payinExtraId).toNumber(),
   };
-  return transaction;
 }
 
-// Function to remove gasLimit from customFeeConfig for Ethereum or Bitcoin
-export function withoutGasLimitTransaction({
-  family,
+export function evmTransaction({
   amount,
   recipient,
   customFeeConfig,
   extraTransactionParameters,
-}: TransactionWithCustomFee): Transaction {
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "evm" }>> {
   if (customFeeConfig?.gasLimit) {
     delete customFeeConfig.gasLimit;
   }
 
   if (extraTransactionParameters) {
-    return <Transaction>{
-      family,
+    return {
+      family: "evm" as const,
       amount,
       recipient,
       ...customFeeConfig,
       data: Buffer.from(extraTransactionParameters, "hex"),
     };
   }
-  return defaultTransaction({ family, amount, recipient, customFeeConfig });
+  return {
+    family: "evm" as const,
+    amount,
+    recipient,
+    ...customFeeConfig,
+  };
 }
 
 export function bitcoinTransaction({
@@ -115,33 +157,33 @@ export function bitcoinTransaction({
   recipient,
   customFeeConfig,
   extraTransactionParameters,
-}: TransactionWithCustomFee): Transaction {
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "bitcoin" }>> {
+  const baseTransaction = {
+    family: "bitcoin" as const,
+    amount,
+    recipient,
+    ...customFeeConfig,
+  };
+
   if (extraTransactionParameters) {
     return {
-      family: "bitcoin",
-      amount,
-      recipient,
-      ...customFeeConfig,
+      ...baseTransaction,
       opReturnData: Buffer.from(extraTransactionParameters, "utf-8"),
     };
   }
-  return {
-    family: "bitcoin",
-    amount,
-    recipient,
-    ...customFeeConfig,
-  };
+
+  return baseTransaction;
 }
 
 export function solanaTransaction({
-  family,
   amount,
   recipient,
-  customFeeConfig,
-}: TransactionWithCustomFee): SolanaTransaction {
+  customFeeConfig: _customFeeConfig,
+}: TransactionWithCustomFee): Extract<Transaction, { family: "solana" }> {
   return {
-    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
     family: "solana",
+    amount,
+    recipient,
     model: { kind: "transfer", uiState: {} },
   };
 }
@@ -150,43 +192,44 @@ export function elrondTransaction({
   amount,
   recipient,
   customFeeConfig,
-}: TransactionWithCustomFee): ElrondTransaction {
-  const transaction: ElrondTransaction = {
-    family: "elrond",
+}: TransactionWithCustomFee): Extract<Transaction, { family: "multiversx" }> {
+  return {
+    family: "multiversx",
     amount,
     recipient,
     mode: "send",
-    ...customFeeConfig,
-    gasLimit: 0, // FIXME: Placeholder, adjust as needed
+    fees: customFeeConfig.fees || null,
+    gasLimit: customFeeConfig.gasLimit ? Number(customFeeConfig.gasLimit) : 0,
   };
-  return transaction;
 }
 
 function tonTransaction({
-  family,
   amount,
   recipient,
-  customFeeConfig,
-}: TransactionWithCustomFee): TonTransaction {
+  customFeeConfig: _customFeeConfig,
+}: TransactionWithCustomFee): Extract<Transaction, { family: "ton" }> {
   return {
-    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
     family: "ton",
+    amount,
+    recipient,
     comment: { isEncrypted: false, text: "" },
     fees: new BigNumber(0), // Set default value as completeExchange call prepareTransaction, which set again fees.
   };
 }
 
 export function cosmosTransaction({
-  family,
   amount,
   recipient,
   customFeeConfig,
   payinExtraId,
-}: TransactionWithCustomFee): CosmosTransaction {
-  return <CosmosTransaction>{
-    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "cosmos" }>> {
+  return {
     family: "cosmos",
+    amount,
+    recipient,
     mode: "send",
+    networkInfo: null,
+    ...customFeeConfig,
     memo: payinExtraId ?? undefined,
   };
 }
@@ -198,10 +241,13 @@ export type TransactionWithCustomFee = TransactionCommon & {
   payinExtraId?: string;
   customErrorType?: "swap";
   extraTransactionParameters?: string;
+  family: string;
 };
 
 // Define a specific type for the strategy functions, assuming they might need parameters
-export type TransactionStrategyFunction = (params: TransactionWithCustomFee) => Transaction;
+export type TransactionStrategyFunction = (
+  params: TransactionWithCustomFee,
+) => Partial<Transaction>;
 
 export const transactionStrategy: {
   [K in Transaction["family"]]: TransactionStrategyFunction;
@@ -209,26 +255,28 @@ export const transactionStrategy: {
   algorand: defaultTransaction,
   aptos: defaultTransaction,
   bitcoin: bitcoinTransaction,
-  cardano: modeSendTransaction,
+  canton: defaultTransaction,
+  cardano: cardanoTransaction,
+  casper: defaultTransaction,
   celo: defaultTransaction,
   cosmos: cosmosTransaction,
-  crypto_org: defaultTransaction,
-  elrond: elrondTransaction,
-  ethereum: withoutGasLimitTransaction,
+  evm: evmTransaction,
   filecoin: defaultTransaction,
   hedera: defaultTransaction,
-  near: modeSendTransaction,
-  neo: defaultTransaction,
+  icon: defaultTransaction,
+  internet_computer: defaultTransaction,
+  mina: defaultTransaction,
+  multiversx: elrondTransaction,
+  near: nearTransaction,
   polkadot: defaultTransaction,
-  ripple: rippleTransaction,
   solana: solanaTransaction,
   stacks: defaultTransaction,
   stellar: stellarTransaction,
-  tezos: modeSendTransaction,
+  sui: defaultTransaction,
+  tezos: tezosTransaction,
   ton: tonTransaction,
-  tron: modeSendTransaction,
+  tron: tronTransaction,
   vechain: defaultTransaction,
-  casper: defaultTransaction,
-  sui: defaultTransaction,
-  internet_computer: defaultTransaction,
+  kaspa: defaultTransaction,
+  xrp: rippleTransaction,
 };

package/src/featureFlags/defaultFeatures.ts

@@ -521,7 +521,6 @@ export const DEFAULT_FEATURES: Features = {
   llmMarketQuickActions: DEFAULT_FEATURE,
   spamFilteringTx: DEFAULT_FEATURE,
   lldSpamFilteringTx: DEFAULT_FEATURE,
-  llmSpamFilteringTx: DEFAULT_FEATURE,
   llmMemoTag: DEFAULT_FEATURE,
   lldMemoTag: DEFAULT_FEATURE,
   ldmkTransport: {
@@ -621,6 +620,8 @@ export const DEFAULT_FEATURES: Features = {
       receive_flow: true,
       send_flow: true,
       enableModularization: false,
+      searchDebounceTime: 500,
+      backendEnvironment: "PROD",
     },
   },
   llmModularDrawer: {
@@ -633,6 +634,8 @@ export const DEFAULT_FEATURES: Features = {
       receive_flow: true,
       send_flow: true,
       enableModularization: false,
+      searchDebounceTime: 500,
+      backendEnvironment: "PROD",
     },
   },
   llNftSupport: DEFAULT_FEATURE,

package/src/hw/actions/app.ts

@@ -540,20 +540,17 @@ export const createAction = (
         displayUpgradeWarning: false,
       }));
     }, []);
-    // TODO remove after fix
-    const isCanton = appRequest.account?.currency.id.includes("canton");
-    const wrongDevice =
-      state.derivation && appRequest.account
-        ? state.derivation.address !== appRequest.account.freshAddress &&
-          state.derivation.address !== appRequest.account.seedIdentifier // Use-case added for Hedera
-          ? {
-              accountName: getDefaultAccountName(appRequest.account),
-            }
-          : null
-        : null;
     return {
       ...state,
-      inWrongDeviceForAccount: isCanton ? null : wrongDevice,
+      inWrongDeviceForAccount:
+        state.derivation && appRequest.account
+          ? state.derivation.address !== appRequest.account.freshAddress &&
+            state.derivation.address !== appRequest.account.seedIdentifier // Use-case added for Hedera
+            ? {
+                accountName: getDefaultAccountName(appRequest.account),
+              }
+            : null
+          : null,
       onRetry,
       passWarning,
     };

package/src/modularDrawer/data/state-manager/api.ts

@@ -30,7 +30,7 @@ function transformAssetsResponse(
 export const assetsDataApi = createApi({
   reducerPath: "assetsDataApi",
   baseQuery: fetchBaseQuery({
-    baseUrl: __DEV__ ? getEnv("DADA_API_STAGING") : getEnv("DADA_API_PROD"),
+    baseUrl: "", // Will be overridden in query
   }),
   tagTypes: [AssetsDataTags.Assets],
   endpoints: build => ({
@@ -49,8 +49,10 @@ export const assetsDataApi = createApi({
           additionalData: [AssetsAdditionalData.Apy, AssetsAdditionalData.MarketTrend],
         };
 
+        const baseUrl = queryArg.isStaging ? getEnv("DADA_API_STAGING") : getEnv("DADA_API_PROD");
+
         return {
-          url: "assets",
+          url: `${baseUrl}assets`,
           params,
         };
       },

package/src/modularDrawer/data/state-manager/types.ts

@@ -15,6 +15,7 @@ export interface GetAssetsDataParams {
   useCase?: string;
   product: "llm" | "lld";
   version: string;
+  isStaging?: boolean;
 }
 
 export interface PageParam {

package/src/modularDrawer/hooks/useAssetsData.ts

@@ -24,6 +24,7 @@ export function useAssetsData({
   areCurrenciesFiltered,
   product,
   version,
+  isStaging,
 }: {
   search?: string;
   currencyIds?: string[];
@@ -31,6 +32,7 @@ export function useAssetsData({
   areCurrenciesFiltered?: boolean;
   product: "llm" | "lld";
   version: string;
+  isStaging?: boolean;
 }) {
   const { data, isLoading, error, fetchNextPage, isSuccess, refetch, isFetching, isError } =
     useGetAssetsDataInfiniteQuery({
@@ -39,6 +41,7 @@ export function useAssetsData({
       currencyIds: areCurrenciesFiltered ? currencyIds : undefined,
       product,
       version,
+      isStaging,
     });
 
   const joinedPages = useMemo(() => {

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

@@ -53,7 +53,6 @@ import { getSwapStepFromError } from "../../exchange/error";
 import { postSwapCancelled } from "../../exchange/swap";
 import { DeviceModelId } from "@ledgerhq/types-devices";
 import { setBroadcastTransaction } from "../../exchange/swap/setBroadcastTransaction";
-import { FAMILIES_MAPPING_LL_TO_WAPI } from "../constants";
 
 export { ExchangeType };
 
@@ -486,14 +485,11 @@ export const handlers = ({
       });
 
       const mainFromAccount = getMainAccount(fromAccount, fromParentAccount);
-      const mainFromAccountFamily =
-        FAMILIES_MAPPING_LL_TO_WAPI[mainFromAccount.currency.family] ||
-        mainFromAccount.currency.family;
 
-      if (transaction.family !== mainFromAccountFamily) {
+      if (transaction.family !== mainFromAccount.currency.family) {
         return Promise.reject(
           new Error(
-            `Account and transaction must be from the same family. Account family: ${mainFromAccountFamily}, Transaction family: ${transaction.family}`,
+            `Account and transaction must be from the same family. Account family: ${mainFromAccount.currency.family}, Transaction family: ${transaction.family}`,
           ),
         );
       }
@@ -804,27 +800,34 @@ async function getStrategy(
     delete customFeeConfig.utxoStrategy;
   }
 
-  // Normalize family key for strategy lookup
-  const familyKey = FAMILIES_MAPPING_LL_TO_WAPI[family] || family;
-  const strategy = transactionStrategy?.[familyKey];
+  const strategy = transactionStrategy?.[family];
 
   if (!strategy) {
-    throw new Error(`No transaction strategy found for family: ${familyKey}`);
+    throw new Error(`No transaction strategy found for family: ${family}`);
+  }
+
+  // Convert customFeeConfig values to BigNumber
+  const convertedCustomFeeConfig: { [key: string]: BigNumber } = {};
+  if (customFeeConfig) {
+    for (const [key, value] of Object.entries(customFeeConfig)) {
+      convertedCustomFeeConfig[key] = new BigNumber(value?.toString() || 0);
+    }
   }
 
   try {
     return await strategy({
-      family: familyKey,
-      amount,
+      family,
+      amount: new BigNumber(amount),
       recipient,
-      customFeeConfig: customFeeConfig || {},
+      customFeeConfig: convertedCustomFeeConfig,
       payinExtraId,
       extraTransactionParameters,
       customErrorType,
     });
   } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
     throw new Error(
-      `Failed to execute transaction strategy for family: ${familyKey}. Reason: ${(error as Error).message}`,
+      `Failed to execute transaction strategy for family: ${family}. Reason: ${errorMessage}`,
     );
   }
 }