@ledgerhq/coin-tester-evm 1.9.0-nightly.3 → 1.9.0-nightly.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-tester-evm",
-  "version": "1.9.0-nightly.3",
+  "version": "1.9.0-nightly.4",
   "description": "Ledger EVM Coin Tester",
   "main": "src/scenarii.test.ts",
   "keywords": [
@@ -51,13 +51,13 @@
     "dotenv": "^16.4.5",
     "ethers": "6.15.0",
     "msw": "^2.2.1",
-    "@ledgerhq/coin-evm": "^2.33.0-nightly.1",
-    "@ledgerhq/coin-framework": "^6.7.0-nightly.1",
+    "@ledgerhq/coin-evm": "^2.33.0-nightly.2",
+    "@ledgerhq/coin-framework": "^6.7.0-nightly.2",
     "@ledgerhq/coin-tester": "^0.10.1",
-    "@ledgerhq/cryptoassets": "^13.31.0-nightly.1",
-    "@ledgerhq/live-common": "^34.51.0-nightly.3",
+    "@ledgerhq/cryptoassets": "^13.31.0-nightly.2",
+    "@ledgerhq/live-common": "^34.51.0-nightly.4",
     "@ledgerhq/live-config": "^3.2.0",
-    "@ledgerhq/live-signer-evm": "^0.8.2-nightly.1",
+    "@ledgerhq/live-signer-evm": "^0.8.2-nightly.2",
     "@ledgerhq/types-cryptoassets": "^7.29.0-nightly.0",
     "@ledgerhq/types-live": "^6.87.0-nightly.1"
   },

package/src/scenarii/blast.ts

@@ -2,7 +2,7 @@ import { LegacySignerEth } from "@ledgerhq/live-signer-evm";
 import { BigNumber } from "bignumber.js";
 import { ethers } from "ethers";
 import { Account } from "@ledgerhq/types-live";
-import { getTokenById } from "@ledgerhq/cryptoassets/tokens";
+import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 import { Scenario, ScenarioTransaction } from "@ledgerhq/coin-tester/main";
 import { encodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
 import { killSpeculos, spawnSpeculos } from "@ledgerhq/coin-tester/signers/speculos";
@@ -39,7 +39,8 @@ const makeScenarioTransactions = ({ address }: { address: string }): BlastScenar
     },
   };
 
-  const MIM_ON_BLAST = getTokenById(TOKEN_ID);
+  const MIM_ON_BLAST = findTokenById(TOKEN_ID);
+  if (!MIM_ON_BLAST) throw new Error("MIM on Blast token not found");
   const scenarioSendMIMTransaction: BlastScenarioTransaction = {
     name: "Send 80 MIM",
     amount: new BigNumber(ethers.parseUnits("80", MIM_ON_BLAST.units[0].magnitude).toString()),
@@ -109,7 +110,8 @@ export const scenarioBlast: Scenario<EvmTransaction, Account> = {
 
     const scenarioAccount = makeAccount(address, blast);
 
-    const MIM_ON_BLAST = getTokenById(TOKEN_ID);
+    const MIM_ON_BLAST = findTokenById(TOKEN_ID);
+    if (!MIM_ON_BLAST) throw new Error("MIM on Blast token not found");
     await callMyDealer({
       provider,
       drug: MIM_ON_BLAST,
@@ -130,7 +132,8 @@ export const scenarioBlast: Scenario<EvmTransaction, Account> = {
     await indexBlocks();
   },
   beforeAll: account => {
-    const MIM_ON_BLAST = getTokenById(TOKEN_ID);
+    const MIM_ON_BLAST = findTokenById(TOKEN_ID);
+    if (!MIM_ON_BLAST) throw new Error("MIM on Blast token not found");
     expect(account.balance.toFixed()).toBe(ethers.parseEther("10000").toString());
     expect(account.subAccounts?.[0]?.type).toBe("TokenAccount");
     expect(account.subAccounts?.[0]?.balance?.toFixed()).toBe(
@@ -138,7 +141,8 @@ export const scenarioBlast: Scenario<EvmTransaction, Account> = {
     );
   },
   afterAll: account => {
-    const MIM_ON_BLAST = getTokenById(TOKEN_ID);
+    const MIM_ON_BLAST = findTokenById(TOKEN_ID);
+    if (!MIM_ON_BLAST) throw new Error("MIM on Blast token not found");
     expect(account.subAccounts?.length).toBe(1);
     expect(account.subAccounts?.[0].balance.toFixed()).toBe(
       ethers.parseUnits("20", MIM_ON_BLAST.units[0].magnitude).toString(),

package/src/scenarii/core.ts

@@ -8,7 +8,7 @@ import { encodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
 import { SignerContext } from "@ledgerhq/coin-framework/signer";
 import { Scenario, ScenarioTransaction } from "@ledgerhq/coin-tester/main";
 import { killSpeculos, spawnSpeculos } from "@ledgerhq/coin-tester/signers/speculos";
-import { getTokenById } from "@ledgerhq/cryptoassets/tokens";
+import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import { LegacySignerEth } from "@ledgerhq/live-signer-evm";
 import { Account } from "@ledgerhq/types-live";
@@ -21,9 +21,11 @@ import { defaultNanoApp } from "../scenarii.test";
 
 type CoreScenarioTransaction = ScenarioTransaction<EvmTransaction, Account>;
 
-const STCORE_ON_CORE = getTokenById(
+const stcoreOnCore = findTokenById(
   "core/erc20/liquid_staked_core_0xb3a8f0f0da9ffc65318aa39e55079796093029ad",
 );
+if (!stcoreOnCore) throw new Error("stCORE on Core token not found");
+const STCORE_ON_CORE = stcoreOnCore;
 
 const makeScenarioTransactions = ({ address }: { address: string }): CoreScenarioTransaction[] => {
   const scenarioSendSTransaction: CoreScenarioTransaction = {

package/src/scenarii/ethereum.ts

@@ -1,7 +1,7 @@
 import { encodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
 import { Scenario, ScenarioTransaction } from "@ledgerhq/coin-tester/main";
 import { killSpeculos, spawnSpeculos } from "@ledgerhq/coin-tester/signers/speculos";
-import { getTokenById } from "@ledgerhq/cryptoassets/tokens";
+import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 import { Account } from "@ledgerhq/types-live";
 import { BigNumber } from "bignumber.js";
 import { ethers } from "ethers";
@@ -20,7 +20,9 @@ import { BridgeStrategy } from "@ledgerhq/coin-tester/types";
 
 type EthereumScenarioTransaction = ScenarioTransaction<EvmTransaction, Account>;
 
-const USDC_ON_ETHEREUM = getTokenById("ethereum/erc20/usd__coin");
+const usdcOnEthereum = findTokenById("ethereum/erc20/usd__coin");
+if (!usdcOnEthereum) throw new Error("USDC on Ethereum token not found");
+const USDC_ON_ETHEREUM = usdcOnEthereum;
 const boredApeContract = "0xBC4CA0EdA7647A8aB7C2061c2E118A18a936f13D";
 const boredApeTokenId = "3368";
 const cloneXContract = "0x348FC118bcC65a92dC033A951aF153d14D945312";

package/src/scenarii/polygon.ts

@@ -1,7 +1,7 @@
 import { BigNumber } from "bignumber.js";
 import { ethers } from "ethers";
 import { Account } from "@ledgerhq/types-live";
-import { getTokenById } from "@ledgerhq/cryptoassets/tokens";
+import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 import { Scenario, ScenarioTransaction } from "@ledgerhq/coin-tester/main";
 import { encodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
 import { killSpeculos, spawnSpeculos } from "@ledgerhq/coin-tester/signers/speculos";
@@ -17,7 +17,9 @@ import { BridgeStrategy } from "@ledgerhq/coin-tester/types";
 
 type PolygonScenarioTransaction = ScenarioTransaction<EvmTransaction, Account>;
 
-const USDC_ON_POLYGON = getTokenById("polygon/erc20/usd_coin_(pos)");
+const usdcOnPolygon = findTokenById("polygon/erc20/usd_coin_(pos)");
+if (!usdcOnPolygon) throw new Error("USDC on Polygon token not found");
+const USDC_ON_POLYGON = usdcOnPolygon;
 const yootContract = "0x670fd103b1a08628e9557cD66B87DeD841115190";
 const yootTokenId = "1988";
 const emberContract = "0xa5511E9941E303101b50675926Fd4d9c1A8a8805";

package/src/scenarii/scroll.ts

@@ -2,7 +2,7 @@ import { LegacySignerEth } from "@ledgerhq/live-signer-evm";
 import { BigNumber } from "bignumber.js";
 import { ethers } from "ethers";
 import { Account } from "@ledgerhq/types-live";
-import { getTokenById } from "@ledgerhq/cryptoassets/tokens";
+import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 import { Scenario, ScenarioTransaction } from "@ledgerhq/coin-tester/main";
 import { encodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
 import { killSpeculos, spawnSpeculos } from "@ledgerhq/coin-tester/signers/speculos";
@@ -43,7 +43,8 @@ const makeScenarioTransactions = ({
     },
   };
 
-  const USDC_ON_SCROLL = getTokenById("scroll/erc20/usd_coin");
+  const USDC_ON_SCROLL = findTokenById("scroll/erc20/usd_coin");
+  if (!USDC_ON_SCROLL) throw new Error("USDC on Scroll token not found");
   const scenarioSendUSDCTransaction: ScrollScenarioTransaction = {
     name: "Send USDC",
     amount: new BigNumber(ethers.parseUnits("80", USDC_ON_SCROLL.units[0].magnitude).toString()),
@@ -113,7 +114,8 @@ export const scenarioScroll: Scenario<EvmTransaction, Account> = {
 
     const scenarioAccount = makeAccount(address, scroll);
 
-    const USDC_ON_SCROLL = getTokenById(TOKEN_ID);
+    const USDC_ON_SCROLL = findTokenById(TOKEN_ID);
+    if (!USDC_ON_SCROLL) throw new Error("USDC on Scroll token not found");
     await callMyDealer({
       provider,
       drug: USDC_ON_SCROLL,
@@ -134,7 +136,8 @@ export const scenarioScroll: Scenario<EvmTransaction, Account> = {
     await indexBlocks();
   },
   beforeAll: account => {
-    const USDC_ON_SCROLL = getTokenById(TOKEN_ID);
+    const USDC_ON_SCROLL = findTokenById(TOKEN_ID);
+    if (!USDC_ON_SCROLL) throw new Error("USDC on Scroll token not found");
     expect(account.balance.toFixed()).toBe(ethers.parseEther("10000").toString());
     expect(account.subAccounts?.[0]?.type).toBe("TokenAccount");
     expect(account.subAccounts?.[0]?.balance?.toFixed()).toBe(
@@ -142,7 +145,8 @@ export const scenarioScroll: Scenario<EvmTransaction, Account> = {
     );
   },
   afterAll: account => {
-    const USDC_ON_SCROLL = getTokenById(TOKEN_ID);
+    const USDC_ON_SCROLL = findTokenById(TOKEN_ID);
+    if (!USDC_ON_SCROLL) throw new Error("USDC on Scroll token not found");
     expect(account.subAccounts?.length).toBe(1);
     expect(account.subAccounts?.[0].balance.toFixed()).toBe(
       ethers.parseUnits("20", USDC_ON_SCROLL.units[0].magnitude).toString(),

package/src/scenarii/sonic.ts

@@ -1,7 +1,7 @@
 import { BigNumber } from "bignumber.js";
 import { ethers } from "ethers";
 import { Account } from "@ledgerhq/types-live";
-import { getTokenById } from "@ledgerhq/cryptoassets/tokens";
+import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 import { encodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
 import { Scenario, ScenarioTransaction } from "@ledgerhq/coin-tester/main";
 import { killSpeculos, spawnSpeculos } from "@ledgerhq/coin-tester/signers/speculos";
@@ -16,9 +16,11 @@ import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 
 type SonicScenarioTransaction = ScenarioTransaction<EvmTransaction, Account>;
 
-const USDC_ON_SONIC = getTokenById(
+const usdcOnSonic = findTokenById(
   "sonic/erc20/bridged_usdc_sonic_labs_0x29219dd400f2bf60e5a23d13be72b486d4038894",
 );
+if (!usdcOnSonic) throw new Error("USDC on Sonic token not found");
+const USDC_ON_SONIC = usdcOnSonic;
 
 const makeScenarioTransactions = ({ address }: { address: string }): SonicScenarioTransaction[] => {
   const scenarioSendSTransaction: SonicScenarioTransaction = {

package/src/scenarii.test.ts

@@ -8,19 +8,13 @@ import { scenarioBlast } from "./scenarii/blast";
 import { scenarioSonic } from "./scenarii/sonic";
 import { scenarioCore } from "./scenarii/core";
 import { setCryptoAssetsStore as setCryptoAssetsStoreForCoinFramework } from "@ledgerhq/coin-framework/crypto-assets/index";
-import type { CryptoAssetsStore } from "@ledgerhq/types-live";
-import * as legacy from "@ledgerhq/cryptoassets/tokens";
+import { legacyCryptoAssetsStore } from "@ledgerhq/cryptoassets/tokens";
 
 global.console = require("console");
 jest.setTimeout(100_000);
 
 //TODO mock call to CAL when available
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-setCryptoAssetsStoreForCoinFramework({
-  getTokenById: legacy.getTokenById,
-  findTokenById: legacy.findTokenById,
-  findTokenByAddressInCurrency: legacy.findTokenByAddressInCurrency,
-} as CryptoAssetsStore);
+setCryptoAssetsStoreForCoinFramework(legacyCryptoAssetsStore);
 
 // Note this config runs with NanoX
 // https://github.com/LedgerHQ/ledger-live/blob/develop/libs/coin-tester/docker-compose.yml