@ledgerhq/coin-evm 2.28.0-nightly.3 → 2.28.0

package/lib-es/logic/estimateFees.test.js

@@ -1,7 +1,5 @@
 import BigNumber from "bignumber.js";
 import { getNodeApi } from "../network/node";
-import ledgerGasTracker from "../network/gasTracker/ledger";
-import { setCoinConfig } from "../config";
 import { estimateFees } from "./estimateFees";
 jest.mock("../network/node", () => ({ getNodeApi: jest.fn() }));
 describe("estimateFees", () => {
@@ -36,66 +34,20 @@ describe("estimateFees", () => {
         mockNodeApi.getGasEstimation.mockResolvedValue(mockGasLimit);
         mockNodeApi.getFeeData.mockResolvedValue(mockFeeData);
         jest.mocked(getNodeApi).mockReturnValue(mockNodeApi);
-        setCoinConfig(() => ({
-            info: {
-                gasTracker: { type: "ledger", explorerId: "eth" },
-            },
-        }));
     });
     it("should estimate fees for native asset", async () => {
-        jest.spyOn(ledgerGasTracker, "getGasOptions").mockResolvedValue({
-            fast: {
-                maxFeePerGas: new BigNumber("30000000000"),
-                maxPriorityFeePerGas: new BigNumber("3000000000"),
-                gasPrice: new BigNumber("30000000000"),
-                nextBaseFee: null,
-            },
-            medium: {
-                maxFeePerGas: new BigNumber("20000000000"),
-                maxPriorityFeePerGas: new BigNumber("2000000000"),
-                gasPrice: new BigNumber("20000000000"),
-                nextBaseFee: null,
-            },
-            slow: {
-                maxFeePerGas: new BigNumber("10000000000"),
-                maxPriorityFeePerGas: new BigNumber("1000000000"),
-                gasPrice: new BigNumber("10000000000"),
-                nextBaseFee: null,
-            },
-        });
         const result = await estimateFees(mockCurrency, mockIntent);
         expect(mockNodeApi.getFeeData).toHaveBeenCalledWith(mockCurrency, {
             feesStrategy: "fast",
             type: 0,
         });
         expect(result).toEqual({
-            value: 420000000000000n,
+            value: BigInt(mockGasLimit.multipliedBy(mockFeeData.gasPrice).toFixed()),
             parameters: {
                 gasPrice: 20000000000n,
                 maxFeePerGas: 20000000000n,
                 maxPriorityFeePerGas: 2000000000n,
                 nextBaseFee: null,
-                gasLimit: 21000n,
-                gasOptions: {
-                    fast: {
-                        maxFeePerGas: 30000000000n,
-                        maxPriorityFeePerGas: 3000000000n,
-                        gasPrice: 30000000000n,
-                        nextBaseFee: null,
-                    },
-                    medium: {
-                        gasPrice: 20000000000n,
-                        maxFeePerGas: 20000000000n,
-                        maxPriorityFeePerGas: 2000000000n,
-                        nextBaseFee: null,
-                    },
-                    slow: {
-                        gasPrice: 10000000000n,
-                        maxFeePerGas: 10000000000n,
-                        maxPriorityFeePerGas: 1000000000n,
-                        nextBaseFee: null,
-                    },
-                },
             },
         });
     });
@@ -107,33 +59,12 @@ describe("estimateFees", () => {
             type: 0,
         });
         expect(result).toEqual({
-            value: 420000000000000n,
+            value: BigInt(mockGasLimit.multipliedBy(mockFeeData.gasPrice).toFixed()),
             parameters: {
                 gasPrice: 20000000000n,
                 maxFeePerGas: 20000000000n,
                 maxPriorityFeePerGas: 2000000000n,
                 nextBaseFee: null,
-                gasLimit: 21000n,
-                gasOptions: {
-                    fast: {
-                        maxFeePerGas: 30000000000n,
-                        maxPriorityFeePerGas: 3000000000n,
-                        gasPrice: 30000000000n,
-                        nextBaseFee: null,
-                    },
-                    medium: {
-                        gasPrice: 20000000000n,
-                        maxFeePerGas: 20000000000n,
-                        maxPriorityFeePerGas: 2000000000n,
-                        nextBaseFee: null,
-                    },
-                    slow: {
-                        gasPrice: 10000000000n,
-                        maxFeePerGas: 10000000000n,
-                        maxPriorityFeePerGas: 1000000000n,
-                        nextBaseFee: null,
-                    },
-                },
             },
         });
     });
@@ -141,35 +72,52 @@ describe("estimateFees", () => {
         mockNodeApi.getFeeData.mockResolvedValue({ ...mockFeeData, gasPrice: null });
         const result = await estimateFees(mockCurrency, mockIntent);
         expect(result).toEqual({
-            value: 0n,
+            value: BigInt(0),
             parameters: {
                 gasPrice: null,
                 maxFeePerGas: 20000000000n,
                 maxPriorityFeePerGas: 2000000000n,
                 nextBaseFee: null,
-                gasLimit: 21000n,
-                gasOptions: {
-                    fast: {
-                        maxFeePerGas: 30000000000n,
-                        maxPriorityFeePerGas: 3000000000n,
-                        gasPrice: 30000000000n,
-                        nextBaseFee: null,
-                    },
-                    medium: {
-                        gasPrice: 20000000000n,
-                        maxFeePerGas: 20000000000n,
-                        maxPriorityFeePerGas: 2000000000n,
-                        nextBaseFee: null,
-                    },
-                    slow: {
-                        gasPrice: 10000000000n,
-                        maxFeePerGas: 10000000000n,
-                        maxPriorityFeePerGas: 1000000000n,
-                        nextBaseFee: null,
-                    },
-                },
             },
         });
     });
+    it.each([
+        [
+            "legacy",
+            {
+                value: 8n,
+                parameters: {
+                    gasPrice: 5n,
+                },
+            },
+        ],
+        [
+            "eip1559",
+            {
+                value: 8n,
+                parameters: {
+                    maxFeePerGas: 2n,
+                    maxPriorityFeePerGas: 3n,
+                },
+            },
+        ],
+    ])("uses the given fees for a %s transaction type", async (type, customFees) => {
+        const getFeeData = jest.spyOn(mockNodeApi, "getFeeData");
+        const getGasEstimation = jest.spyOn(mockNodeApi, "getGasEstimation");
+        expect(await estimateFees({}, { type: `send-${type}` }, customFees)).toEqual(customFees);
+        expect(getFeeData).not.toHaveBeenCalled();
+        expect(getGasEstimation).not.toHaveBeenCalled();
+    });
+    it("ignores malformed or irrelevant custom fees", async () => {
+        const getFeeData = jest.spyOn(mockNodeApi, "getFeeData");
+        const getGasEstimation = jest.spyOn(mockNodeApi, "getGasEstimation");
+        expect(await estimateFees({}, {
+            type: "send-eip1559",
+            amount: 3n,
+            asset: { type: "native" },
+        }, { value: 8n, parameters: { gasPrice: 5n } })).not.toEqual({ value: 8n, parameters: { gasPrice: 5n } });
+        expect(getFeeData).toHaveBeenCalled();
+        expect(getGasEstimation).toHaveBeenCalled();
+    });
 });
 //# sourceMappingURL=estimateFees.test.js.map

package/lib-es/logic/estimateFees.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"estimateFees.test.js","sourceRoot":"","sources":["../../src/logic/estimateFees.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"estimateFees.test.js","sourceRoot":"","sources":["../../src/logic/estimateFees.test.ts"],"names":[],"mappings":"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"}

package/lib-es/logic/index.d.ts

@@ -6,5 +6,4 @@ export * from "./estimateFees";
 export * from "./listOperations";
 export * from "./craftTransaction";
 export * from "./getSequence";
-export * from "./validateIntent";
 //# sourceMappingURL=index.d.ts.map

package/lib-es/logic/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/logic/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/logic/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC"}

package/lib-es/logic/index.js

@@ -6,5 +6,4 @@ export * from "./estimateFees";
 export * from "./listOperations";
 export * from "./craftTransaction";
 export * from "./getSequence";
-export * from "./validateIntent";
 //# sourceMappingURL=index.js.map

package/lib-es/logic/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logic/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logic/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC"}

package/lib-es/types/transaction.d.ts

@@ -85,12 +85,6 @@ export type FeeHistory = {
     oldestBlock: string;
     reward: string[][];
 };
-export type ApiFeeData = {
-    maxFeePerGas: bigint | null;
-    maxPriorityFeePerGas: bigint | null;
-    gasPrice: bigint | null;
-    nextBaseFee: bigint | null;
-};
 export type FeeData = {
     maxFeePerGas: BigNumber | null;
     maxPriorityFeePerGas: BigNumber | null;
@@ -104,9 +98,6 @@ export type FeeDataRaw = {
     nextBaseFee: string | null;
 };
 export type Strategy = "slow" | "medium" | "fast";
-export type ApiGasOptions = {
-    [key in Strategy]: ApiFeeData;
-};
 export type GasOptions = {
     [key in Strategy]: FeeData;
 };

package/lib-es/types/transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/types/transaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/types/transaction.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-evm",
-  "version": "2.28.0-nightly.3",
+  "version": "2.28.0",
   "description": "Ledger EVM Coin integration",
   "keywords": [
     "Ledger",
@@ -55,14 +55,14 @@
     "lodash": "^4.17.21",
     "react-native-get-random-values": "^1.8.0",
     "rxjs": "^7.8.1",
-    "@ledgerhq/coin-framework": "^6.2.0-nightly.1",
-    "@ledgerhq/cryptoassets": "^13.26.0-nightly.1",
-    "@ledgerhq/devices": "8.5.1-nightly.0",
-    "@ledgerhq/domain-service": "^1.2.41-nightly.1",
-    "@ledgerhq/errors": "^6.25.0-nightly.0",
-    "@ledgerhq/evm-tools": "^1.7.4-nightly.1",
-    "@ledgerhq/live-env": "^2.15.0-nightly.1",
-    "@ledgerhq/live-network": "^2.0.16-nightly.1",
+    "@ledgerhq/coin-framework": "^6.2.0",
+    "@ledgerhq/cryptoassets": "^13.26.0",
+    "@ledgerhq/devices": "8.5.0",
+    "@ledgerhq/domain-service": "^1.2.41",
+    "@ledgerhq/errors": "^6.24.0",
+    "@ledgerhq/evm-tools": "^1.7.4",
+    "@ledgerhq/live-env": "^2.14.0",
+    "@ledgerhq/live-network": "^2.0.15",
     "@ledgerhq/live-promise": "^0.1.1",
     "@ledgerhq/logs": "^6.13.0"
   },
@@ -82,9 +82,9 @@
     "prando": "^6.0.1",
     "ts-jest": "^29.1.1",
     "@ledgerhq/disable-network-setup": "^0.0.0",
-    "@ledgerhq/hw-app-eth": "^6.45.16-nightly.1",
-    "@ledgerhq/types-cryptoassets": "^7.26.0-nightly.0",
-    "@ledgerhq/types-live": "^6.82.0-nightly.1"
+    "@ledgerhq/hw-app-eth": "^6.45.16",
+    "@ledgerhq/types-cryptoassets": "^7.25.0",
+    "@ledgerhq/types-live": "^6.82.0"
   },
   "scripts": {
     "clean": "rimraf lib lib-es",
@@ -98,7 +98,7 @@
     "lint:fix": "pnpm lint --fix",
     "typecheck": "tsc --noEmit",
     "test": "jest",
-    "test:debug": "node --inspect-wait ./node_modules/jest/bin/jest.js --runInBand",
+    "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand",
     "test-integ": "jest --config=jest.integ.config.js",
     "unimported": "unimported"
   }

package/src/__tests__/fixtures/accounts.fixtures.ts

@@ -1,9 +1,13 @@
 import BigNumber from "bignumber.js";
+import { hashes as localTokensHashesByChainId } from "@ledgerhq/cryptoassets/data/evm/index";
 import { ERC20Token } from "@ledgerhq/cryptoassets/types";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { AccountShapeInfo } from "@ledgerhq/coin-framework/bridge/jsHelpers";
+import { CryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/type";
+import { setCryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/index";
+import usdtTokenData from "../../__fixtures__/scroll_sepolia-erc20-mock_usdt.json";
+import newTokenData from "../../__fixtures__/scroll_sepolia-erc20-new_token_mock.json";
 import { makeOperation } from "./common.fixtures";
-import "./cryptoAssetsStore.fixtures";
 
 export const currency = getCryptoCurrencyById("scroll_sepolia");
 export const fakeToken: ERC20Token = [
@@ -18,6 +22,10 @@ export const fakeToken: ERC20Token = [
   false, // delisted
 ];
 
+export const localCALHash =
+  localTokensHashesByChainId[
+    currency.ethereumLikeInfo!.chainId as keyof typeof localTokensHashesByChainId
+  ];
 export const getAccountShapeParameters: AccountShapeInfo = {
   address: "0xkvn",
   currency,
@@ -26,6 +34,20 @@ export const getAccountShapeParameters: AccountShapeInfo = {
   index: 0,
 };
 
+// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+setCryptoAssetsStore({
+  findTokenById: (id: string) => {
+    if (id === "scroll_sepolia/erc20/mock_usdt") {
+      return usdtTokenData;
+    } else if (id === "scroll_sepolia/erc20/new_token_mock") {
+      return newTokenData;
+    }
+
+    return undefined;
+  },
+  findTokenByAddressInCurrency: (_address: string, _currencyId: string) => undefined,
+} as CryptoAssetsStore);
+
 export const TMUSDTTransaction = makeOperation({
   hash: "anyHash",
   accountId:

package/src/__tests__/fixtures/common.fixtures.ts

@@ -15,7 +15,6 @@ import { encodeNftId } from "@ledgerhq/coin-framework/nft/nftId";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
 import { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { Account, DerivationMode, Operation, ProtoNFT, TokenAccount } from "@ledgerhq/types-live";
-import "./cryptoAssetsStore.fixtures";
 
 export const makeAccount = (
   address: string,

package/src/__tests__/fixtures/prepareTransaction.fixtures.ts

@@ -1,13 +1,14 @@
 import { ethers } from "ethers";
 import BigNumber from "bignumber.js";
-import { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { getTokenById } from "@ledgerhq/cryptoassets/tokens";
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { Account } from "@ledgerhq/types-live";
+
 import { EvmNftTransaction, Transaction as EvmTransaction } from "../../types";
 import ERC1155ABI from "../../abis/erc1155.abi.json";
 import ERC721ABI from "../../abis/erc721.abi.json";
 import ERC20ABI from "../../abis/erc20.abi.json";
-import usdtTokenData from "../../__fixtures__/scroll_sepolia-erc20-mock_usdt.json";
 
 import { makeAccount, makeTokenAccount } from "./common.fixtures";
 
@@ -18,8 +19,7 @@ const currency: CryptoCurrency = {
   },
 };
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-export const tokenAccount = makeTokenAccount("0xkvn", usdtTokenData as unknown as TokenCurrency);
+export const tokenAccount = makeTokenAccount("0xkvn", getTokenById("ethereum/erc20/usd__coin"));
 export const account = makeAccount("0x6cBCD73CD8e8a42844662f0A0e76D7F79Afd933d", currency, [
   tokenAccount,
 ]);

package/src/__tests__/fixtures/synchronization.fixtures.ts

@@ -4,9 +4,12 @@ import BigNumber from "bignumber.js";
 import { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { encodeSubOperationId } from "@ledgerhq/coin-framework/operation";
+import { setCryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/index";
+import { CryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/type";
 import * as logic from "../../logic";
 import { getCoinConfig } from "../../config";
-import { getCryptoAssetsStore } from "../../cryptoAssetsStore";
+import usdCoinTokenData from "../../__fixtures__/ethereum-erc20-usd__coin.json";
+import usdTetherTokenData from "../../__fixtures__/ethereum-erc20-usd_tether__erc20_.json";
 import {
   makeAccount,
   makeNft,
@@ -56,9 +59,9 @@ export const swapHistory = [
 
 export const tokenCurrencies = [
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  getCryptoAssetsStore().findTokenById("ethereum/erc20/usd__coin") as TokenCurrency,
+  Object.freeze(usdCoinTokenData as TokenCurrency),
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  getCryptoAssetsStore().findTokenById("ethereum/erc20/usd_tether__erc20_") as TokenCurrency,
+  Object.freeze(usdTetherTokenData as TokenCurrency),
 ];
 
 export const tokenAccount = {
@@ -96,6 +99,20 @@ export const coinOperations = [
   }),
 ];
 
+// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+setCryptoAssetsStore({
+  findTokenById: (id: string) => {
+    if (id === "ethereum/erc20/usd__coin") {
+      return usdCoinTokenData;
+    } else if (id === "ethereum/erc20/usd_tether__erc20_") {
+      return usdTetherTokenData;
+    }
+
+    return undefined;
+  },
+  findTokenByAddressInCurrency: (_address: string, _currencyId: string) => undefined,
+} as CryptoAssetsStore);
+
 export const tokenOperations = [
   makeOperation({
     hash: coinOperations[0].hash, // on purpose to make this token op a subOp of coinOp 1

package/src/__tests__/fixtures/transaction.fixtures.ts

@@ -1,5 +1,6 @@
 import BigNumber from "bignumber.js";
-import { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { getTokenById } from "@ledgerhq/cryptoassets/tokens";
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 
 import {
@@ -11,7 +12,6 @@ import {
   EvmNftTransactionRaw,
   EvmNftTransaction,
 } from "../../types";
-import usdtTokenData from "../../__fixtures__/ethereum-erc20-usd__coin.json";
 import { makeAccount, makeTokenAccount } from "./common.fixtures";
 
 export const testData = Object.freeze(Buffer.from("testBufferString").toString("hex"));
@@ -217,8 +217,7 @@ export const currency: CryptoCurrency = Object.freeze({
   },
 });
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-export const tokenCurrency = Object.freeze(usdtTokenData as TokenCurrency);
+export const tokenCurrency = Object.freeze(getTokenById("ethereum/erc20/usd__coin"));
 export const tokenAccount = makeTokenAccount(
   "0x6cBCD73CD8e8a42844662f0A0e76D7F79Afd933d",
   tokenCurrency,

package/src/__tests__/unit/accounts.unit.test.ts

@@ -4,6 +4,8 @@ import { tokens as localTokensByChainId } from "@ledgerhq/cryptoassets/data/evm/
 import { fromAccountRaw, toAccountRaw } from "@ledgerhq/coin-framework/serialization/account";
 import { decodeTokenAccountId } from "@ledgerhq/coin-framework/account";
 import { __clearAllLists } from "@ledgerhq/cryptoassets/tokens";
+import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { getCryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/index";
 import * as etherscanAPI from "../../network/explorer/etherscan";
 import { __resetCALHash, getCALHash } from "../../logic";
 import { getAccountShape } from "../../bridge/synchronization";
@@ -17,6 +19,10 @@ import {
   NTMTransaction,
   TMUSDTTransaction,
 } from "../fixtures/accounts.fixtures";
+import usdtTokenData from "../../__fixtures__/scroll_sepolia-erc20-mock_usdt.json";
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+const USDT_TOKEN = usdtTokenData as TokenCurrency;
 
 jest.mock("axios");
 const mockedAxios = jest.mocked(axios);
@@ -67,6 +73,9 @@ describe("EVM Family", () => {
     });
 
     it("should add an account and find no token account without a preload first", async () => {
+      const store = getCryptoAssetsStore();
+      jest.spyOn(store, "findTokenById").mockImplementation((_id: string) => undefined);
+
       const { subAccounts } = await getAccountShape(getAccountShapeParameters, {
         paginationConfig: {},
       });
@@ -75,6 +84,15 @@ describe("EVM Family", () => {
     });
 
     it("should preload currency and add an account with 1 token account in it when there is nothing new in remote CAL", async () => {
+      const store = getCryptoAssetsStore();
+      jest.spyOn(store, "findTokenById").mockImplementation((id: string) => {
+        if (id === "scroll_sepolia/erc20/mock_usdt") {
+          return USDT_TOKEN;
+        }
+
+        return undefined;
+      });
+
       mockedAxios.get.mockImplementationOnce(() => {
         throw new axios.AxiosError("", "", undefined, undefined, { status: 304 } as AxiosResponse);
       });
@@ -190,6 +208,15 @@ describe("EVM Family", () => {
     });
 
     it("should preload again a currency and get the same account with 2 tokens accounts even with a failing CAL service", async () => {
+      const store = getCryptoAssetsStore();
+      jest.spyOn(store, "findTokenById").mockImplementation((id: string) => {
+        if (id === "scroll_sepolia/erc20/mock_usdt") {
+          return USDT_TOKEN;
+        }
+
+        return undefined;
+      });
+
       mockedAxios.get.mockImplementationOnce(async (url, { params } = {}) => {
         if (
           url === "https://crypto-assets-service.api.ledger.com/v1/tokens" &&
@@ -240,6 +267,15 @@ describe("EVM Family", () => {
     });
 
     it("should hydrate the tokens necessary to deserialize an account with 1 token account when there is nothing new in remote CAL", async () => {
+      const store = getCryptoAssetsStore();
+      jest.spyOn(store, "findTokenById").mockImplementation((id: string) => {
+        if (id === "scroll_sepolia/erc20/mock_usdt") {
+          return USDT_TOKEN;
+        }
+
+        return undefined;
+      });
+
       const preloaded = await preload(currency);
       await hydrate(preloaded, currency);
       const account = await getAccountShape(getAccountShapeParameters, {