@ledgerhq/live-common 34.51.0-nightly.1 → 34.51.0-nightly.11

package/src/e2e/families/cardano.ts

@@ -11,7 +11,7 @@ import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 
 export async function sendCardano(tx: Transaction) {
-  const isNanoS = process.env.SPECULOS_DEVICE === Device.LNS;
+  const isNanoS = process.env.SPECULOS_DEVICE === Device.LNS.name;
   await waitFor(DeviceLabels.NEW_ORDINARY);
   await (isNanoS ? pressRightButton() : pressBoth());
   if (isNanoS) {
@@ -66,7 +66,7 @@ export async function delegateCardano() {
     [DeviceLabels.CONFIRM, "right"],
   ] as const;
 
-  const steps = process.env.SPECULOS_DEVICE === Device.LNS ? LNSSpecificSteps : commonSteps;
+  const steps = process.env.SPECULOS_DEVICE === Device.LNS.name ? LNSSpecificSteps : commonSteps;
 
   for (const [label, action] of steps) {
     try {

package/src/e2e/families/evm.ts

@@ -1,12 +1,7 @@
 import expect from "expect";
 import { NFTTransaction, Transaction } from "../models/Transaction";
-import {
-  pressBoth,
-  pressUntilTextFound,
-  containsSubstringInEvent,
-  waitFor,
-  getSpeculosModel,
-} from "../speculos";
+import { pressBoth, pressUntilTextFound, containsSubstringInEvent, waitFor } from "../speculos";
+import { getSpeculosModel } from "../speculosAppVersion";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import { DeviceModelId } from "@ledgerhq/types-devices";
@@ -18,7 +13,7 @@ export async function sendEVM(tx: Transaction) {
       : await pressUntilTextFound(DeviceLabels.ACCEPT);
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
-  if (tx.accountToCredit.ensName && process.env.SPECULOS_DEVICE !== Device.LNS) {
+  if (tx.accountToCredit.ensName && process.env.SPECULOS_DEVICE !== Device.LNS.name) {
     const isENSNameCorrect = containsSubstringInEvent(tx.accountToCredit.ensName, events);
     expect(isENSNameCorrect).toBeTruthy();
   } else {

package/src/e2e/families/solana.ts

@@ -4,13 +4,11 @@ import {
   pressUntilTextFound,
   containsSubstringInEvent,
   getDelegateEvents,
-  getSpeculosModel,
 } from "../speculos";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import { Transaction } from "../models/Transaction";
 import { Delegate } from "../models/Delegate";
-import { DeviceModelId } from "@ledgerhq/types-devices";
 
 export async function delegateSolana(delegatingAccount: Delegate) {
   await getDelegateEvents(delegatingAccount);
@@ -18,13 +16,10 @@ export async function delegateSolana(delegatingAccount: Delegate) {
 }
 
 export async function sendSolana(tx: Transaction) {
-  const events =
-    getSpeculosModel() !== DeviceModelId.nanoS
-      ? await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION)
-      : await pressUntilTextFound(DeviceLabels.APPROVE);
+  const events = await pressUntilTextFound(DeviceLabels.APPROVE);
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
-  if (process.env.SPECULOS_DEVICE !== Device.LNS) {
+  if (process.env.SPECULOS_DEVICE !== Device.LNS.name) {
     const isAddressCorrect = containsSubstringInEvent(
       tx.accountToCredit.parentAccount?.address ?? tx.accountToCredit.address,
       events,

package/src/e2e/families/sui.ts

@@ -0,0 +1,7 @@
+import { pressBoth, pressUntilTextFound } from "../speculos";
+import { DeviceLabels } from "../enum/DeviceLabels";
+
+export async function sendSui() {
+  await pressUntilTextFound(DeviceLabels.ACCEPT);
+  await pressBoth();
+}

package/src/e2e/families/tezos.ts

@@ -1,10 +1,5 @@
-import {
-  getDelegateEvents,
-  getDeviceLabels,
-  getSpeculosModel,
-  pressBoth,
-  pressUntilTextFound,
-} from "../speculos";
+import { getDelegateEvents, getDeviceLabels, pressBoth, pressUntilTextFound } from "../speculos";
+import { getSpeculosModel } from "../speculosAppVersion";
 import { Delegate } from "../models/Delegate";
 import { DeviceModelId } from "@ledgerhq/types-devices";
 import { DeviceLabels } from "../enum/DeviceLabels";

package/src/e2e/speculos.ts

@@ -16,7 +16,6 @@ import { getEnv } from "@ledgerhq/live-env";
 import { getCryptoCurrencyById } from "../currencies";
 import { DeviceLabels } from "./enum/DeviceLabels";
 import { Account } from "./enum/Account";
-import { Device as CryptoWallet } from "./enum/Device";
 import { Currency } from "./enum/Currency";
 import expect from "expect";
 import { sendBTC, sendBTCBasedCoin } from "./families/bitcoin";
@@ -42,6 +41,8 @@ import { Swap } from "./models/Swap";
 import { delegateOsmosis } from "./families/osmosis";
 import { AppInfos } from "./enum/AppInfos";
 import { DEVICE_LABELS_CONFIG } from "./data/deviceLabelsData";
+import { sendSui } from "./families/sui";
+import { getAppVersionFromCatalog, getSpeculosModel } from "./speculosAppVersion";
 
 const isSpeculosRemote = process.env.REMOTE_SPECULOS === "true";
 
@@ -50,6 +51,7 @@ export type Spec = {
   appQuery: {
     model: DeviceModelId;
     appName: string;
+    appVersion?: string;
   };
   /** @deprecated */
   dependency?: string;
@@ -73,19 +75,6 @@ export function setExchangeDependencies(dependencies: Dependency[]) {
   specs["Exchange"].dependencies = Array.from(map.values());
 }
 
-export function getSpeculosModel() {
-  const speculosDevice = process.env.SPECULOS_DEVICE;
-  switch (speculosDevice) {
-    case CryptoWallet.LNS:
-      return DeviceModelId.nanoS;
-    case CryptoWallet.LNX:
-      return DeviceModelId.nanoX;
-    case CryptoWallet.LNSP:
-    default:
-      return DeviceModelId.nanoSP;
-  }
-}
-
 type Specs = {
   [key: string]: Spec;
 };
@@ -311,7 +300,6 @@ export const specs: Specs = {
     },
     dependency: "",
   },
-
   Celo: {
     currency: getCryptoCurrencyById("celo"),
     appQuery: {
@@ -344,6 +332,14 @@ export const specs: Specs = {
     },
     dependency: "",
   },
+  Sui: {
+    currency: getCryptoCurrencyById("sui"),
+    appQuery: {
+      model: getSpeculosModel(),
+      appName: "Sui",
+    },
+    dependency: "",
+  },
 };
 
 export async function startSpeculos(
@@ -358,13 +354,21 @@ export async function startSpeculos(
   invariant(seed, "SEED is not set");
   const coinapps = COINAPPS;
   invariant(coinapps, "COINAPPS is not set");
-  let appCandidates;
+  const appCandidates = await listAppCandidates(coinapps);
 
-  if (!appCandidates) {
-    appCandidates = await listAppCandidates(coinapps);
-  }
+  const nanoAppCatalogPath = getEnv("E2E_NANO_APP_VERSION_PATH");
 
   const { appQuery, dependency, onSpeculosDeviceCreated } = spec;
+  try {
+    const displayName = spec.currency?.managerAppName || appQuery.appName;
+    const catalogVersion = await getAppVersionFromCatalog(displayName, nanoAppCatalogPath);
+    if (catalogVersion) {
+      appQuery.appVersion = catalogVersion;
+    }
+  } catch (e) {
+    console.warn("[speculos] Unable to fetch app version from catalog", e);
+  }
+
   const appCandidate = findLatestAppCandidate(appCandidates, appQuery);
   const { model } = appQuery;
   const { dependencies } = spec;
@@ -516,7 +520,9 @@ export async function pressUntilTextFound(
 
   for (let attempts = 0; attempts < maxAttempts; attempts++) {
     const texts = await fetchCurrentScreenTexts(speculosApiPort);
-    if (strictMatch ? texts === targetText : texts.includes(targetText)) {
+    if (
+      strictMatch ? texts === targetText : texts.toLowerCase().includes(targetText.toLowerCase())
+    ) {
       return await fetchAllEvents(speculosApiPort);
     }
 
@@ -593,25 +599,25 @@ export async function waitForTimeOut(ms: number) {
 }
 
 export async function removeMemberLedgerSync() {
-  await waitFor(DeviceLabels.CONNECT_TO);
-  await pressUntilTextFound(DeviceLabels.CONNECT, true);
+  await waitFor(DeviceLabels.CONNECT_WITH);
+  await pressUntilTextFound(DeviceLabels.CONNECT_WITH_LEDGER_SYNC, true);
   await pressBoth();
-  await waitFor(DeviceLabels.REMOVE_FROM_LEDGER_SYNC);
-  await pressUntilTextFound(DeviceLabels.REMOVE, true);
+  await waitFor(DeviceLabels.REMOVE_PHONE_OR_COMPUTER);
+  await pressUntilTextFound(DeviceLabels.REMOVE_PHONE_OR_COMPUTER, true);
   await pressBoth();
   await waitFor(DeviceLabels.TURN_ON_SYNC);
   await pressUntilTextFound(DeviceLabels.LEDGER_LIVE_WILL_BE);
-  await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC2);
+  await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC);
   await pressBoth();
 }
 
 export async function activateLedgerSync() {
-  await waitFor(DeviceLabels.CONNECT_TO);
-  await pressUntilTextFound(DeviceLabels.CONNECT, true);
+  await waitFor(DeviceLabels.CONNECT_WITH);
+  await pressUntilTextFound(DeviceLabels.CONNECT_WITH_LEDGER_SYNC, true);
   await pressBoth();
   await waitFor(DeviceLabels.TURN_ON_SYNC);
   await pressUntilTextFound(DeviceLabels.LEDGER_LIVE_WILL_BE);
-  await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC2);
+  await pressUntilTextFound(DeviceLabels.TURN_ON_SYNC);
   await pressBoth();
 }
 
@@ -632,6 +638,10 @@ export async function goToSettings() {
   await pressBoth();
 }
 
+export async function providePublicKey() {
+  await pressRightButton();
+}
+
 type DeviceLabelsReturn = {
   delegateConfirmLabel: string;
   delegateVerifyLabel: string;
@@ -660,6 +670,10 @@ 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);
@@ -721,6 +735,12 @@ export async function signSendTransaction(tx: Transaction) {
     case Currency.HBAR:
       await sendHedera();
       break;
+    case Currency.SUI:
+      await sendSui();
+      break;
+    case Currency.SUI_USDC:
+      await sendSui();
+      break;
     default:
       throw new Error(`Unsupported currency: ${currencyName.ticker}`);
   }
@@ -811,6 +831,7 @@ function verifySwapData(swap: Swap, events: string[], amount: string) {
   if (getSpeculosModel() !== DeviceModelId.nanoS) {
     expectDeviceScreenContains(swapPair, events, "Swap pair not found on the device screen");
   }
+
   expectDeviceScreenContains(amount, events, `Amount ${amount} not found on the device screen`);
 }
 

package/src/e2e/speculosAppVersion.ts

@@ -0,0 +1,86 @@
+import { HttpManagerApiRepository, ApplicationV2Entity } from "@ledgerhq/device-core";
+import { version } from "@ledgerhq/device-core/package.json";
+import { getEnv } from "@ledgerhq/live-env";
+import { DeviceModelId } from "@ledgerhq/devices";
+import { Device as CryptoWallet } from "./enum/Device";
+import * as fs from "fs";
+import * as path from "path";
+
+export function getSpeculosModel(): DeviceModelId {
+  const speculosDevice = process.env.SPECULOS_DEVICE;
+  switch (speculosDevice) {
+    case CryptoWallet.LNS.name:
+      return DeviceModelId.nanoS;
+    case CryptoWallet.LNX.name:
+      return DeviceModelId.nanoX;
+    case CryptoWallet.LNSP.name:
+    default:
+      return DeviceModelId.nanoSP;
+  }
+}
+
+function getDeviceTargetId(device: DeviceModelId): number {
+  const modelToTargetIdMap = {
+    [DeviceModelId.nanoS]: CryptoWallet.LNS.targetId,
+    [DeviceModelId.nanoX]: CryptoWallet.LNX.targetId,
+    [DeviceModelId.nanoSP]: CryptoWallet.LNSP.targetId,
+  };
+  return modelToTargetIdMap[device];
+}
+
+export async function getNanoAppCatalog(
+  device: DeviceModelId,
+  deviceFirmware: string,
+): Promise<ApplicationV2Entity[]> {
+  const repository = new HttpManagerApiRepository(getEnv("MANAGER_API_BASE"), version);
+  const targetId = getDeviceTargetId(device);
+  return await repository.catalogForDevice({
+    provider: 1,
+    targetId: targetId,
+    firmwareVersion: deviceFirmware,
+  });
+}
+
+function getDeviceFirmwareVersion(): string {
+  const firmwareVersion = process.env.SPECULOS_FIRMWARE_VERSION;
+  if (!firmwareVersion) {
+    throw new Error("SPECULOS_FIRMWARE_VERSION environment variable is not set");
+  }
+  return firmwareVersion;
+}
+
+export async function createNanoAppJsonFile(nanoAppFilePath: string): Promise<void> {
+  try {
+    const device = getSpeculosModel();
+    const firmware = getDeviceFirmwareVersion();
+    const appCatalog = await getNanoAppCatalog(device, firmware);
+    const jsonFilePath = path.join(process.cwd(), nanoAppFilePath);
+    const dirPath = path.dirname(jsonFilePath);
+    if (!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath, { recursive: true });
+    }
+    fs.writeFileSync(jsonFilePath, JSON.stringify(appCatalog, null, 2), "utf8");
+  } catch (error) {
+    console.error("Unable to create app version file:", error);
+  }
+}
+
+export async function getAppVersionFromCatalog(
+  currency: string,
+  nanoAppFilePath: string,
+): Promise<string | undefined> {
+  try {
+    await createNanoAppJsonFile(nanoAppFilePath);
+    const rootDir = process.cwd();
+    const jsonFilePath = path.join(rootDir, nanoAppFilePath);
+    type CatalogApp = { versionDisplayName: string; version: string };
+    const raw = fs.readFileSync(jsonFilePath, "utf8");
+    const catalog: CatalogApp[] = JSON.parse(raw);
+
+    const app = catalog.find(entry => entry.versionDisplayName === currency);
+
+    return app?.version ?? "";
+  } catch (error) {
+    console.error(`Unable to get app version for ${currency} from catalog:`, error);
+  }
+}

package/src/e2e/speculosCI.ts

@@ -7,7 +7,7 @@ import {
 import { SpeculosDevice } from "./speculos";
 import https from "https";
 
-const { SEED, GITHUB_TOKEN, AWS_ROLE, CLUSTER } = process.env;
+const { SEED, GITHUB_TOKEN, AWS_ROLE, CLUSTER, SPECULOS_IMAGE_TAG } = process.env;
 const GIT_API_URL = "https://api.github.com/repos/LedgerHQ/actions/actions/";
 const START_WORKFLOW_ID = "workflows/161487603/dispatches";
 const STOP_WORKFLOW_ID = "workflows/161487604/dispatches";
@@ -147,6 +147,7 @@ function createStartPayload(deviceParams: DeviceParams, runId: string) {
   return {
     ref: GITHUB_REF,
     inputs: {
+      speculos_version: SPECULOS_IMAGE_TAG?.split(":")[1] || "master",
       coin_app: appName,
       coin_app_version: appVersion,
       device: reverseModelMap[model],

package/src/exchange/providers/swap.ts

@@ -140,9 +140,9 @@ const DEFAULT_SWAP_PROVIDERS: Record<string, ProviderConfig & Partial<Additional
     type: "DEX",
     needsKYC: false,
     needsBearerToken: false,
-    termsOfUseUrl: "https://1inch.io/assets/1inch_network_terms_of_use.pdf",
-    supportUrl: "https://help.1inch.io/en/",
-    mainUrl: "https://1inch.io/",
+    termsOfUseUrl: "https://1inch.com/assets/Widget_1inch.com_Terms_of_Use.pdf",
+    supportUrl: "https://help.1inch.com/en/",
+    mainUrl: "https://1inch.com/",
   },
   paraswap: {
     type: "DEX",
@@ -232,7 +232,7 @@ export const dexProvidersContractAddress: { [key: string]: string } = {
 
 export const termsOfUse: { [key: string]: string } = {
   paraswap: "https://paraswap.io/tos",
-  "1inch": "https://1inch.io/assets/1inch_network_terms_of_use.pdf",
+  "1inch": "https://1inch.com/assets/Widget_1inch.com_Terms_of_Use.pdf",
   Uniswap: "https://uniswap.org/terms-of-service",
 };
 

package/src/exchange/swap/api/v5/__mocks__/fetchRates.mocks.ts

@@ -58,8 +58,7 @@ export const fetchRatesMock = (
     {
       provider: "oneinch",
       providerType: "DEX",
-      providerURL:
-        "https://app.1inch.io/#/1/unified/swap/usdt/eth?ledgerLive=true&sourceTokenAmount=100",
+      providerURL: "https://1inch.com/swap/#/1/unified/swap/usdt/eth&sourceTokenAmount=100",
       from: "ethereum/erc20/usd_tether__erc20_",
       to: "ethereum",
       amountFrom: "100",

package/src/exchange/swap/hooks/useFromState.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 import "../../../__tests__/test-helpers/dom-polyfill";
-import { getCryptoCurrencyById, getTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
 import { Account } from "@ledgerhq/types-live";
 import { renderHook, act } from "@testing-library/react";
 import BigNumber from "bignumber.js";
@@ -14,7 +14,9 @@ import { useFromState } from "./useFromState";
 
 const BTC = getCryptoCurrencyById("bitcoin");
 const ETH = getCryptoCurrencyById("ethereum");
-const USDT = getTokenById("ethereum/erc20/usd_tether__erc20_");
+const usdtToken = findTokenById("ethereum/erc20/usd_tether__erc20_");
+if (!usdtToken) throw new Error("USDT token not found");
+const USDT = usdtToken;
 
 jest.useFakeTimers();
 

package/src/exchange/swap/hooks/usePickDefaultAccount.ts

@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 import { AccountLike } from "@ledgerhq/types-live";
 import { useCurrenciesByMarketcap } from "../../../currencies/hooks";
-import { listCryptoCurrencies, listTokens } from "../../../currencies";
+import { listCryptoCurrencies } from "../../../currencies";
 import { getAvailableAccountsById } from "../utils";
 
 // Pick a default source account if none are selected.
@@ -10,7 +10,7 @@ export const usePickDefaultAccount = (
   fromAccount: AccountLike | null | undefined,
   setFromAccount: (account: AccountLike) => void,
 ): void => {
-  const list = [...listCryptoCurrencies(), ...listTokens()];
+  const list = listCryptoCurrencies();
   const allCurrencies = useCurrenciesByMarketcap(list);
 
   useEffect(() => {

package/src/exchange/swap/hooks/useReverseAccounts.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 import "../../../__tests__/test-helpers/dom-polyfill";
-import { getCryptoCurrencyById, getTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
 import type { Account } from "@ledgerhq/types-live";
 import { renderHook, act } from "@testing-library/react";
 import { genTokenAccount } from "@ledgerhq/coin-framework/mocks/account";
@@ -11,7 +11,9 @@ import { useReverseAccounts } from "./useReverseAccounts";
 
 const BTC = getCryptoCurrencyById("bitcoin");
 const ETH = getCryptoCurrencyById("ethereum");
-const USDT = getTokenById("ethereum/erc20/usd_tether__erc20_");
+const usdtToken = findTokenById("ethereum/erc20/usd_tether__erc20_");
+if (!usdtToken) throw new Error("USDT token not found");
+const USDT = usdtToken;
 
 const fromParentAccount = genAccount("mocked-account-2", {
   currency: ETH,

package/src/exchange/swap/hooks/useSwapTransaction.ts

@@ -36,6 +36,7 @@ export const useFromAmountStatusMessage = (
   { account, parentAccount, status, transaction }: Result<Transaction>,
   // The order of errors/warnings here will determine the precedence
   statusTypeToInclude: string[],
+  sponsored?: boolean,
 ): Error | undefined => {
   const statusEntries = useMemo(
     () => statusTypeToInclude.map(statusType => (status.errors || status.warnings)?.[statusType]),
@@ -65,7 +66,9 @@ export const useFromAmountStatusMessage = (
       .filter(errorOrWarning => !(errorOrWarning instanceof AmountRequired));
     const isRelevantStatus = (relevantStatus as Error) instanceof NotEnoughGas;
 
-    if (isRelevantStatus && currency && estimatedFees) {
+    // Skip gas validation for sponsored transactions since gas fees are covered by sponsor
+
+    if (isRelevantStatus && currency && estimatedFees && !sponsored) {
       const query = new URLSearchParams({
         // get account id first and set it equal to account.
         // if parent account exists then overwrite the former.
@@ -86,7 +89,15 @@ export const useFromAmountStatusMessage = (
     }
 
     return relevantStatus;
-  }, [statusEntries, currency, estimatedFees, transaction?.amount, account?.id, parentAccount?.id]);
+  }, [
+    statusEntries,
+    currency,
+    estimatedFees,
+    transaction?.amount,
+    account?.id,
+    parentAccount?.id,
+    sponsored,
+  ]);
 };
 
 type UseSwapTransactionProps = {
@@ -100,6 +111,7 @@ type UseSwapTransactionProps = {
   refreshRate?: number;
   allowRefresh?: boolean;
   isEnabled?: boolean;
+  sponsored?: boolean;
 };
 
 export const useSwapTransaction = ({
@@ -113,6 +125,7 @@ export const useSwapTransaction = ({
   refreshRate,
   allowRefresh,
   isEnabled,
+  sponsored,
 }: UseSwapTransactionProps): SwapTransactionType => {
   const bridgeTransaction = useBridgeTransaction(() => ({
     account: defaultAccount,
@@ -140,11 +153,11 @@ export const useSwapTransaction = ({
 
   const { account: toAccount } = toState;
 
-  const fromAmountError = useFromAmountStatusMessage(bridgeTransaction, [
-    "gasPrice",
-    "amount",
-    "gasLimit",
-  ]);
+  const fromAmountError = useFromAmountStatusMessage(
+    bridgeTransaction,
+    ["gasPrice", "amount", "gasLimit"],
+    sponsored,
+  );
 
   const { isSwapReversable, reverseSwap } = useReverseAccounts({
     accounts,

package/src/exchange/swap/hooks/useToState.test.ts

@@ -3,7 +3,7 @@
  */
 import "../../../__tests__/test-helpers/dom-polyfill";
 import { renderHook, act } from "@testing-library/react";
-import { getCryptoCurrencyById, getTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
 import { selectorStateDefaultValues, useToState } from ".";
 import { genTokenAccount } from "@ledgerhq/coin-framework/mocks/account";
 import { genAccount } from "../../../mock/account";
@@ -12,7 +12,9 @@ import type { Account } from "@ledgerhq/types-live";
 
 const BTC = getCryptoCurrencyById("bitcoin");
 const ETH = getCryptoCurrencyById("ethereum");
-const USDT = getTokenById("ethereum/erc20/usd_tether__erc20_");
+const usdtToken = findTokenById("ethereum/erc20/usd_tether__erc20_");
+if (!usdtToken) throw new Error("USDT token not found");
+const USDT = usdtToken;
 
 const selectedAccount = genAccount("mocked-account-selected", { currency: ETH });
 

package/src/exchange/swap/hooks/useUpdateMaxAmount.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 import "../../../__tests__/test-helpers/dom-polyfill";
-import { getCryptoCurrencyById, getTokenById } from "@ledgerhq/cryptoassets";
+import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
 import { act, renderHook } from "@testing-library/react";
 import BigNumber from "bignumber.js";
 import { checkAccountSupported } from "../../../account/index";
@@ -19,7 +19,9 @@ jest.mock("../../../families/evm/bridge/mock");
 const mockedEstimateMaxSpendable = jest.mocked(ethBridge.accountBridge.estimateMaxSpendable);
 
 const ETH = getCryptoCurrencyById("ethereum");
-const USDT = getTokenById("ethereum/erc20/usd_tether__erc20_");
+const usdtToken = findTokenById("ethereum/erc20/usd_tether__erc20_");
+if (!usdtToken) throw new Error("USDT token not found");
+const USDT = usdtToken;
 
 const parentAccount = genAccount("parent-account", {
   currency: ETH,

package/src/exchange/swap/mock.ts

@@ -103,7 +103,7 @@ export const mockGetExchangeRates = async (
       providerType: "DEX",
       expirationDate: new Date(),
       tradeMethod: "float",
-      providerURL: `https://app.1inch.io/#/1/unified/swap/eth/usdt?ledgerLive=true&sourceTokenAmount=${transaction.amount}`,
+      providerURL: `https://1inch.com/swap/#/1/unified/swap/eth/usdt&sourceTokenAmount=${transaction.amount}`,
     },
   ];
 };

package/src/exchange/swap/transactionStrategies.ts

@@ -130,6 +130,7 @@ export function evmTransaction({
   recipient,
   customFeeConfig,
   extraTransactionParameters,
+  sponsored,
 }: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "evm" }>> {
   if (customFeeConfig?.gasLimit) {
     delete customFeeConfig.gasLimit;
@@ -142,6 +143,7 @@ export function evmTransaction({
       recipient,
       ...customFeeConfig,
       data: Buffer.from(extraTransactionParameters, "hex"),
+      sponsored,
     };
   }
   return {
@@ -149,6 +151,7 @@ export function evmTransaction({
     amount,
     recipient,
     ...customFeeConfig,
+    sponsored,
   };
 }
 
@@ -242,6 +245,7 @@ export type TransactionWithCustomFee = TransactionCommon & {
   customErrorType?: "swap";
   extraTransactionParameters?: string;
   family: string;
+  sponsored?: boolean;
 };
 
 // Define a specific type for the strategy functions, assuming they might need parameters

package/src/exchange/swap/types.ts

@@ -207,6 +207,7 @@ type SwapStateRequest = {
   seedIdTo?: string;
   refundAddress?: string;
   payoutAddress?: string;
+  sponsored?: boolean;
 }>;
 
 export type SwapStateAcceptedRequest = SwapStateRequest & {

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

@@ -1,4 +1,4 @@
-import { getTokenById } from "@ledgerhq/cryptoassets";
+import { findTokenById } from "@ledgerhq/cryptoassets";
 import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import type { Account, TokenAccount } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
@@ -87,7 +87,9 @@ describe("swap/utils/getAccountTuplesForCurrency", () => {
   });
 
   describe("TokenCurrency", () => {
-    const aaveToken = Object.freeze(getTokenById("ethereum/erc20/aave"));
+    const token = findTokenById("ethereum/erc20/aave");
+    if (!token) throw new Error("AAVE token not found");
+    const aaveToken = Object.freeze(token);
 
     test("returns correct parent accounts including a new subAccount when a TokenCurrency is provided", () => {
       const ethAccounts = [

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

@@ -12,6 +12,7 @@ import {
   makeAccountBridgeReceive,
   scanAccounts,
   signOperation,
+  signRawOperation,
   broadcast,
   sync,
   isInvalidRecipient,
@@ -106,6 +107,7 @@ const accountBridge: AccountBridge<AlgorandTransaction, any> = {
   assignFromAccountRaw,
   initAccount,
   signOperation,
+  signRawOperation,
   broadcast,
   getSerializedAddressParameters,
 };