@ledgerhq/live-common 34.40.0 → 34.41.0-nightly.0

package/src/exchange/swap/setBroadcastTransaction.ts

@@ -11,13 +11,15 @@ export const setBroadcastTransaction = ({
   targetCurrencyId,
   hardwareWalletType,
   swapType,
+  swapAppVersion,
 }: {
-  result: { operation: Operation; swapId: string };
+  result: { operation: Operation | string; swapId: string };
   provider: string;
   sourceCurrencyId?: string;
   targetCurrencyId?: string;
   hardwareWalletType?: DeviceModelId;
   swapType?: TradeMethod;
+  swapAppVersion?: string;
 }) => {
   const { operation, swapId } = result;
 
@@ -36,16 +38,18 @@ export const setBroadcastTransaction = ({
       targetCurrencyId,
       hardwareWalletType,
       swapType: swapType,
+      swapAppVersion,
     });
   } else {
     postSwapAccepted({
       provider,
       swapId,
-      transactionId: operation.hash,
+      transactionId: typeof operation === "string" ? operation : operation.hash,
       sourceCurrencyId,
       targetCurrencyId,
       hardwareWalletType,
       swapType,
+      swapAppVersion,
     });
   }
 };

package/src/exchange/swap/transactionStrategies.ts

@@ -0,0 +1,234 @@
+import { BigNumber } from "bignumber.js";
+
+import {
+  CosmosTransaction,
+  ElrondTransaction,
+  RippleTransaction,
+  SolanaTransaction,
+  StellarTransaction,
+  TonTransaction,
+  Transaction,
+  TransactionCommon,
+} from "@ledgerhq/wallet-api-client";
+
+export type { SwapLiveError } from "@ledgerhq/wallet-api-exchange-module";
+
+export function defaultTransaction({
+  family,
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): Transaction {
+  return <Transaction>{
+    family,
+    amount,
+    recipient,
+    ...customFeeConfig,
+  };
+}
+
+export function modeSendTransaction({
+  family,
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): Transaction {
+  return {
+    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
+    mode: "send",
+  };
+}
+
+export function stellarTransaction({
+  family,
+  amount,
+  recipient,
+  customFeeConfig,
+  payinExtraId,
+  customErrorType,
+}: TransactionWithCustomFee): StellarTransaction {
+  if (!payinExtraId)
+    throw {
+      error: new Error("Missing payinExtraId"),
+      step: "PayinExtraIdStepError",
+      customErrorType,
+    };
+
+  return {
+    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
+    family: "stellar",
+    memoValue: payinExtraId,
+    memoType: "MEMO_TEXT",
+  };
+}
+
+export function rippleTransaction({
+  amount,
+  recipient,
+  customFeeConfig,
+  payinExtraId,
+  customErrorType,
+}: TransactionWithCustomFee): RippleTransaction {
+  if (!payinExtraId)
+    throw {
+      error: new Error("Missing payinExtraId"),
+      step: "PayinExtraIdStepError",
+      customErrorType,
+    };
+
+  const transaction: RippleTransaction = {
+    family: "ripple",
+    amount,
+    recipient,
+    ...customFeeConfig,
+    tag: new BigNumber(payinExtraId).toNumber(),
+  };
+  return transaction;
+}
+
+// Function to remove gasLimit from customFeeConfig for Ethereum or Bitcoin
+export function withoutGasLimitTransaction({
+  family,
+  amount,
+  recipient,
+  customFeeConfig,
+  extraTransactionParameters,
+}: TransactionWithCustomFee): Transaction {
+  if (customFeeConfig?.gasLimit) {
+    delete customFeeConfig.gasLimit;
+  }
+
+  if (extraTransactionParameters) {
+    return <Transaction>{
+      family,
+      amount,
+      recipient,
+      ...customFeeConfig,
+      data: Buffer.from(extraTransactionParameters, "hex"),
+    };
+  }
+  return defaultTransaction({ family, amount, recipient, customFeeConfig });
+}
+
+export function bitcoinTransaction({
+  amount,
+  recipient,
+  customFeeConfig,
+  extraTransactionParameters,
+}: TransactionWithCustomFee): Transaction {
+  if (extraTransactionParameters) {
+    return {
+      family: "bitcoin",
+      amount,
+      recipient,
+      ...customFeeConfig,
+      opReturnData: Buffer.from(extraTransactionParameters, "utf-8"),
+    };
+  }
+  return {
+    family: "bitcoin",
+    amount,
+    recipient,
+    ...customFeeConfig,
+  };
+}
+
+export function solanaTransaction({
+  family,
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): SolanaTransaction {
+  return {
+    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
+    family: "solana",
+    model: { kind: "transfer", uiState: {} },
+  };
+}
+
+export function elrondTransaction({
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): ElrondTransaction {
+  const transaction: ElrondTransaction = {
+    family: "elrond",
+    amount,
+    recipient,
+    mode: "send",
+    ...customFeeConfig,
+    gasLimit: 0, // FIXME: Placeholder, adjust as needed
+  };
+  return transaction;
+}
+
+function tonTransaction({
+  family,
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): TonTransaction {
+  return {
+    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
+    family: "ton",
+    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 }),
+    family: "cosmos",
+    mode: "send",
+    memo: payinExtraId ?? undefined,
+  };
+}
+
+export type TransactionWithCustomFee = TransactionCommon & {
+  customFeeConfig: {
+    [key: string]: BigNumber;
+  };
+  payinExtraId?: string;
+  customErrorType?: "swap";
+  extraTransactionParameters?: string;
+};
+
+// Define a specific type for the strategy functions, assuming they might need parameters
+export type TransactionStrategyFunction = (params: TransactionWithCustomFee) => Transaction;
+
+export const transactionStrategy: {
+  [K in Transaction["family"]]: TransactionStrategyFunction;
+} = {
+  algorand: defaultTransaction,
+  aptos: defaultTransaction,
+  bitcoin: bitcoinTransaction,
+  cardano: modeSendTransaction,
+  celo: defaultTransaction,
+  cosmos: cosmosTransaction,
+  crypto_org: defaultTransaction,
+  elrond: elrondTransaction,
+  ethereum: withoutGasLimitTransaction,
+  filecoin: defaultTransaction,
+  hedera: defaultTransaction,
+  near: modeSendTransaction,
+  neo: defaultTransaction,
+  polkadot: defaultTransaction,
+  ripple: rippleTransaction,
+  solana: solanaTransaction,
+  stacks: defaultTransaction,
+  stellar: stellarTransaction,
+  tezos: modeSendTransaction,
+  ton: tonTransaction,
+  tron: modeSendTransaction,
+  vechain: defaultTransaction,
+  casper: defaultTransaction,
+  sui: defaultTransaction,
+  internet_computer: defaultTransaction,
+};

package/src/exchange/swap/types.ts

@@ -4,6 +4,7 @@ import { Account, AccountLike, AccountRaw, AccountRawLike, Operation } from "@le
 import { BigNumber } from "bignumber.js";
 import { Result as UseBridgeTransactionResult } from "../../bridge/useBridgeTransaction";
 import { Transaction, TransactionRaw } from "../../generated/types";
+
 export type { SwapLiveError } from "@ledgerhq/wallet-api-exchange-module";
 
 export type ExchangeSwap = {
@@ -198,6 +199,7 @@ type SwapStateRequest = {
   targetCurrencyId: string;
   hardwareWalletType: DeviceModelId;
   swapType: TradeMethod;
+  swapAppVersion?: string;
 }>;
 
 export type SwapStateAcceptedRequest = SwapStateRequest & {
@@ -336,3 +338,65 @@ export type SwapTransactionType = UseBridgeTransactionResult & {
   fromAmountError?: Error;
   fromAmountWarning?: Error;
 };
+
+export type SwapPayloadRequestData = {
+  provider: string;
+  deviceTransactionId: string;
+  fromAccountAddress: string;
+  toAccountAddress: string;
+  fromAccountCurrency: string;
+  toAccountCurrency: string;
+  amount: string;
+  amountInAtomicUnit: number;
+  quoteId?: string;
+  toNewTokenId?: string;
+};
+export type SwapPayloadResponse = {
+  binaryPayload: string;
+  signature: string;
+  payinAddress: string;
+  swapId: string;
+  payinExtraId?: string;
+  extraTransactionParameters?: string;
+};
+
+export type ConfirmSwapRequest = {
+  provider: string;
+  swapId: string;
+  transactionId: string;
+  sourceCurrencyId?: string;
+  targetCurrencyId?: string;
+  hardwareWalletType?: string;
+};
+
+export type CancelSwapRequest = {
+  provider: string;
+  swapId: string;
+  statusCode?: string;
+  errorMessage?: string;
+  sourceCurrencyId?: string;
+  targetCurrencyId?: string;
+  hardwareWalletType?: string;
+  swapType?: string;
+  swapStep?: string;
+};
+
+export type SwapBackendResponse = {
+  provider: string;
+  swapId: string;
+  apiExtraFee: number;
+  apiFee: number;
+  refundAddress: string;
+  amountExpectedFrom: number;
+  amountExpectedTo: number;
+  status: string;
+  from: string;
+  to: string;
+  payinAddress: string;
+  payoutAddress: string;
+  createdAt: string; // ISO-8601
+  binaryPayload: string;
+  signature: string;
+  payinExtraId?: string;
+  extraTransactionParameters?: string;
+};

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

@@ -7,6 +7,7 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 1`]
     "cardanoResources": {
       "delegation": {
         "dRepHex": undefined,
+        "deposit": "2000000",
         "name": "Apex Cardano Pool",
         "poolId": "7facad662e180ce45e5c504957cd1341940c72a708728f7ecfc6e349",
         "rewards": "0",

package/src/families/cardano/signerSerializer.ts

@@ -121,9 +121,10 @@ function prepareCertificate(cert: SignerTxCertificate): Certificate {
   switch (cert.type) {
     case "REGISTRATION":
       return {
-        type: CertificateType.STAKE_REGISTRATION,
+        type: CertificateType.STAKE_REGISTRATION_CONWAY,
         params: {
           stakeCredential,
+          deposit: cert.params.deposit,
         },
       };
     case "DELEGATION":
@@ -136,9 +137,10 @@ function prepareCertificate(cert: SignerTxCertificate): Certificate {
       };
     case "DEREGISTRATION":
       return {
-        type: CertificateType.STAKE_DEREGISTRATION,
+        type: CertificateType.STAKE_DEREGISTRATION_CONWAY,
         params: {
           stakeCredential,
+          deposit: cert.params.deposit,
         },
       };
     case "VOTE_DELEGATION_ABSTAIN":

package/src/families/evm/bridge/mock.ts

@@ -14,7 +14,7 @@ import {
   getSerializedAddressParameters,
   updateTransaction,
 } from "@ledgerhq/coin-framework/bridge/jsHelpers";
-import { getGasLimit } from "@ledgerhq/coin-evm/logic";
+import { getGasLimit } from "@ledgerhq/coin-evm/utils";
 import { getTypedTransaction } from "@ledgerhq/coin-evm/transaction";
 const receive = makeAccountBridgeReceive();
 const defaultGetFees = (_a, t: any) => (t.gasPrice || new BigNumber(0)).times(getGasLimit(t));

package/src/families/evm/platformAdapter.test.ts

@@ -1,8 +1,8 @@
-import { DEFAULT_NONCE } from "@ledgerhq/coin-evm/createTransaction";
 import { Transaction } from "@ledgerhq/coin-evm/types/index";
 import { FAMILIES, EthereumTransaction as PlatformTransaction } from "@ledgerhq/live-app-sdk";
 import BigNumber from "bignumber.js";
 import evm from "./platformAdapter";
+import { DEFAULT_NONCE } from "@ledgerhq/coin-evm/utils";
 
 describe("getPlatformTransactionSignFlowInfos", () => {
   describe("should properly get infos for ETH platform tx", () => {

package/src/families/evm/platformAdapter.ts

@@ -1,6 +1,6 @@
 // TODO: to remove once live-app-sdk is depreciated and removed from LL
 
-import { DEFAULT_NONCE } from "@ledgerhq/coin-evm/createTransaction";
+import { DEFAULT_NONCE } from "@ledgerhq/coin-evm/utils";
 import { Transaction } from "@ledgerhq/coin-evm/types/index";
 import { EthereumTransaction as PlatformTransaction } from "@ledgerhq/live-app-sdk";
 

package/src/families/evm/react.test.ts

@@ -4,15 +4,15 @@
 import BigNumber from "bignumber.js";
 import { renderHook, waitFor } from "@testing-library/react";
 import { Transaction } from "@ledgerhq/coin-evm/types/index";
-import { getGasTracker } from "@ledgerhq/coin-evm/api/gasTracker/index";
-import type { GasTrackerApi } from "@ledgerhq/coin-evm/api/gasTracker/types";
+import { getGasTracker } from "@ledgerhq/coin-evm/network/gasTracker/index";
+import type { GasTrackerApi } from "@ledgerhq/coin-evm/network/gasTracker/types";
 import { CryptoCurrency, CryptoCurrencyId } from "@ledgerhq/types-cryptoassets";
 import { useGasOptions } from "./react";
 
 jest.useFakeTimers();
 jest.spyOn(global, "setInterval");
 
-jest.mock("@ledgerhq/coin-evm/api/gasTracker/index");
+jest.mock("@ledgerhq/coin-evm/network/gasTracker/index");
 const mockedGetGasTracker = jest.mocked(getGasTracker);
 
 const mockedGetGasOptions = jest.fn();

package/src/families/evm/react.ts

@@ -1,4 +1,4 @@
-import { getGasTracker } from "@ledgerhq/coin-evm/api/gasTracker/index";
+import { getGasTracker } from "@ledgerhq/coin-evm/network/gasTracker/index";
 import type { GasOptions, Transaction } from "@ledgerhq/coin-evm/types/index";
 import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import { useEffect, useMemo, useState } from "react";

package/src/families/evm/walletApiAdapter.ts

@@ -1,4 +1,4 @@
-import { createTransaction } from "@ledgerhq/coin-evm/createTransaction";
+import { createTransaction } from "@ledgerhq/coin-evm/bridge/createTransaction";
 import { Transaction } from "@ledgerhq/coin-evm/types/index";
 import { EthereumTransaction as WalletAPIEthereumTransaction } from "@ledgerhq/wallet-api-core";
 import {

package/src/featureFlags/defaultFeatures.ts

@@ -153,6 +153,7 @@ export const DEFAULT_FEATURES: Features = {
   protectServicesDesktop: {
     enabled: false,
     params: {
+      openWithDevTools: false,
       availableOnDesktop: false,
       isNew: false,
       ledgerliveStorageState: false,
@@ -530,7 +531,6 @@ export const DEFAULT_FEATURES: Features = {
     ...DEFAULT_FEATURE,
     params: { link: null },
   },
-  llmNetworkBasedAddAccountFlow: DEFAULT_FEATURE,
   llCounterValueGranularitiesRates: {
     ...DEFAULT_FEATURE,
     params: {

package/src/hw/extractOnboardingState.test.ts

@@ -35,6 +35,15 @@ describe("@hw/extractOnboardingState", () => {
             expect(onboardingState?.currentOnboardingStep).toBe(OnboardingStep.Ready);
             expect(onboardingState?.charonStatus).toBeNull();
           });
+
+          it("should ignore charon update status", () => {
+            const charonState = Buffer.from([0x20]);
+            const onboardingState = extractOnboardingState(flagsBytes, charonState);
+
+            expect(onboardingState).not.toBeNull();
+            expect(onboardingState?.currentOnboardingStep).toBe(OnboardingStep.Ready);
+            expect(onboardingState?.charonStatus).toBeNull();
+          });
         });
 
         describe("and the user refuse to backup the charon", () => {

package/src/hw/extractOnboardingState.ts

@@ -137,6 +137,14 @@ export const extractOnboardingState = (
 
   const currentSeedWordIndex = flagsBytes[2] & currentSeedWordIndexMask;
 
+  const charonSupported = charonState !== undefined && charonState.length > 0;
+  const charonOnboardingBits = charonSupported ? charonState[0] & 0xf : 0;
+  //const charonUpdateBits = charonSupported ? (charonState[0] & 0x30) >> 4 : 0;
+  const charonStatus =
+    charonSupported && fromBitsToCharonStatusMap.has(charonOnboardingBits)
+      ? fromBitsToCharonStatusMap.get(charonOnboardingBits)!
+      : null;
+
   /*
    * Once the device is seeded, there are some additional states for backing up with Charon (for devices that support it)
    * There are 2 scenarios:
@@ -148,9 +156,11 @@ export const extractOnboardingState = (
   if (
     isOnboarded &&
     [OnboardingStep.Ready, OnboardingStep.WelcomeScreen1].includes(currentOnboardingStep) &&
-    charonState !== undefined
+    charonSupported
   ) {
-    currentOnboardingStep = fromBitsToOnboardingStep.get(charonState[0] + CHARON_STEP_BIT_MASK);
+    currentOnboardingStep = fromBitsToOnboardingStep.get(
+      charonOnboardingBits + CHARON_STEP_BIT_MASK,
+    );
 
     if (!currentOnboardingStep) {
       throw new DeviceExtractOnboardingStateError(
@@ -159,12 +169,6 @@ export const extractOnboardingState = (
     }
   }
 
-  const charonSupported = charonState !== undefined && charonState.length > 0;
-  const charonStatus =
-    charonSupported && fromBitsToCharonStatusMap.has(charonState[0])
-      ? fromBitsToCharonStatusMap.get(charonState[0])!
-      : null;
-
   return {
     isOnboarded,
     isInRecoveryMode,

package/src/mock/account.ts

@@ -130,6 +130,7 @@ export function genAccount(id: number | string, opts: GenAccountOptions = {}): A
           (account as CardanoAccount).cardanoResources = {
             delegation: {
               status: true,
+              deposit: "2000000",
               poolId: "45",
               ticker: "ADA",
               name: "Cardano",

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

@@ -1,14 +1,14 @@
-import { handlers } from "./server";
-import { AppBranch, AppPlatform, Visibility } from "../types";
-import { of } from "rxjs";
+import { RpcRequest } from "@ledgerhq/wallet-api-core";
 import {
   ExchangeStartParams,
   ExchangeStartSellParams,
   ExchangeStartSwapParams,
 } from "@ledgerhq/wallet-api-exchange-module";
-import { RpcRequest } from "@ledgerhq/wallet-api-core";
-import { genAccount } from "../../mock/account";
 import { WalletContext, WalletHandlers } from "@ledgerhq/wallet-api-server";
+import { of } from "rxjs";
+import { genAccount } from "../../mock/account";
+import { AppBranch, AppPlatform, Visibility } from "../types";
+import { handlers } from "./server";
 
 const mockTracking = {
   startExchangeRequested: jest.fn(),
@@ -46,6 +46,7 @@ const testAppManifest = {
 
 const mockUiStartExchange = jest.fn();
 const mockUiCompleteExchange = jest.fn();
+const mockUiSwap = jest.fn();
 const mockUiError = jest.fn();
 const mockIsReady = jest.fn();
 
@@ -54,6 +55,7 @@ const mockUiHooks = {
   "custom.exchange.complete": mockUiCompleteExchange,
   "custom.exchange.error": mockUiError,
   "custom.isReady": mockIsReady,
+  "custom.exchange.swap": mockUiSwap,
 };
 
 // Mock converter id to send back the id received in params.