@ledgerhq/live-common 34.12.0-nightly.2 → 34.12.0

package/src/e2e/speculos.ts

@@ -232,22 +232,6 @@ export const specs: Specs = {
     },
     dependency: "",
   },
-  Multiverse_X: {
-    currency: getCryptoCurrencyById("elrond"),
-    appQuery: {
-      model: DeviceModelId.nanoSP,
-      appName: "MultiversX",
-    },
-    dependency: "",
-  },
-  Osmosis: {
-    currency: getCryptoCurrencyById("osmo"),
-    appQuery: {
-      model: DeviceModelId.nanoSP,
-      appName: "Cosmos",
-    },
-    dependency: "",
-  },
 };
 
 export async function startSpeculos(
@@ -376,8 +360,6 @@ export async function pressRightUntil(text: string, maxAttempts: number = 10): P
       action: "press-and-release",
     });
     attempts++;
-
-    await waitForTimeOut(200);
   }
 
   if (attempts === maxAttempts) {

package/src/exchange/providers/index.ts

@@ -56,14 +56,11 @@ type TestProvider = {
     curve: "secp256k1" | "secp256r1";
     data: string;
   };
-  service: {
-    appVersion: number;
-    name: "swap" | "sell" | "fund";
-  };
   signature: string;
+  version: number;
 };
 export function setTestProviderInfo(provider: string) {
-  const { name, publicKey, signature, service } = JSON.parse(provider) as TestProvider;
+  const { name, publicKey, signature, version } = JSON.parse(provider) as TestProvider;
   testProvider = {
     name,
     publicKey: {
@@ -71,9 +68,6 @@ export function setTestProviderInfo(provider: string) {
       data: Buffer.from(publicKey.data, "hex"),
     },
     signature: Buffer.from(signature, "hex"),
-    version: service.appVersion,
+    version,
   };
 }
-export function getTestProviderInfo(): ExchangeProviderNameAndSignature | undefined {
-  return testProvider;
-}

package/src/exchange/providers/swap.ts

@@ -1,5 +1,4 @@
-import { getEnv } from "@ledgerhq/live-env";
-import { ExchangeProviderNameAndSignature, getTestProviderInfo } from ".";
+import { ExchangeProviderNameAndSignature } from ".";
 import { isIntegrationTestEnv } from "../swap/utils/isIntegrationTestEnv";
 import { getProvidersData } from "./getProvidersData";
 import network from "@ledgerhq/live-network";
@@ -227,20 +226,6 @@ let providerDataCache: Record<string, ProviderConfig & AdditionalProviderConfig>
 export const getSwapProvider = async (
   providerName: string,
 ): Promise<ProviderConfig & AdditionalProviderConfig> => {
-  const testProviderInfo = getTestProviderInfo();
-  if (getEnv("MOCK_EXCHANGE_TEST_CONFIG") && testProviderInfo) {
-    return {
-      needsKYC: false,
-      needsBearerToken: false,
-      type: "CEX",
-      termsOfUseUrl: "https://example.com",
-      supportUrl: "https://example.com",
-      mainUrl: "https://example.com",
-      displayName: providerName,
-      ...testProviderInfo,
-    };
-  }
-
   const res = await fetchAndMergeProviderData();
 
   if (!res[providerName.toLowerCase()]) {

package/src/exchange/swap/completeExchange.ts

@@ -24,7 +24,6 @@ import { getSwapProvider } from "../providers";
 import { convertToAppExchangePartnerKey } from "../providers";
 import { CompleteExchangeStep, convertTransportError } from "../error";
 import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
-import BigNumber from "bignumber.js";
 
 const withDevicePromise = (deviceId, fn) =>
   firstValueFrom(withDevice(deviceId)(transport => from(fn(transport))));
@@ -66,29 +65,7 @@ const completeExchange = (
         if (mainRefundCurrency.type !== "CryptoCurrency")
           throw new Error("This should be a cryptocurrency");
 
-        // Thorswap ERC20 token exception hack:
-        // - We remove subAccountId to prevent EVM calldata swap during prepareTransaction.
-        // - Set amount to 0 to ensure correct handling of the transaction
-        //   (this is adjusted during prepareTransaction before signing the actual EVM transaction for tokens but we skip it).
-        // - Since it's an ERC20 token transaction (not ETH), amount is set to 0 ETH
-        //   because no ETH is being sent, only tokens.
-        // - This workaround can't be applied earlier in the flow as the amount is used for display purposes and checks.
-        //   We must set the amount to 0 at this stage to avoid issues during the transaction.
-        // - This ensures proper handling of Thorswap-ERC20-specific transactions.
-        if (
-          provider.toLocaleLowerCase() === "thorswap" &&
-          transaction.subAccountId &&
-          transaction.family === "evm"
-        ) {
-          const transactionFixed = {
-            ...transaction,
-            subAccountId: undefined,
-            amount: BigNumber(0),
-          };
-          transaction = await accountBridge.prepareTransaction(refundAccount, transactionFixed);
-        } else {
-          transaction = await accountBridge.prepareTransaction(refundAccount, transaction);
-        }
+        transaction = await accountBridge.prepareTransaction(refundAccount, transaction);
         if (unsubscribed) return;
 
         const { errors, estimatedFees } = await accountBridge.getTransactionStatus(

package/src/exchange/swap/utils/index.ts

@@ -61,7 +61,7 @@ export const isRegistrationRequired = async (provider: string): Promise<boolean>
 };
 
 export const getProviderName = (provider: string): string => {
-  const { displayName } = SWAP_DATA_CDN[provider] ?? { displayName: "" };
+  const { displayName } = provider ? SWAP_DATA_CDN[provider] : { displayName: "" };
   return displayName;
 };
 

package/src/exchange/testCurrencyConfig/data/coins.ts

@@ -29,11 +29,6 @@ const coins = [
       0x82, 0x90, 0x4, 0xfe, 0x6f, 0x1d, 0x0, 0x3a, 0x58,
     ]).toString("hex"),
   ],
-  [
-    "ton",
-    "03544f4e03544f4e00",
-    "3045022100fe1b854d275796f89a7e24ef118767f0660b1883a27834e126ddd22ebb7fccc3022010806932659ea8bf2f46d3d9bac5fb288c2ba7e36ca690f2961a19f7b7f66a43",
-  ],
 ];
 
 export default coins;