@ledgerhq/coin-tester-evm 1.7.0-nightly.9 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-tester-evm",
-  "version": "1.7.0-nightly.9",
+  "version": "1.7.0",
   "description": "Ledger EVM Coin Tester",
   "main": "src/scenarii.test.ts",
   "keywords": [
@@ -51,15 +51,15 @@
     "dotenv": "^16.4.5",
     "ethers": "6.15.0",
     "msw": "^2.2.1",
-    "@ledgerhq/coin-framework": "^6.4.0-nightly.5",
-    "@ledgerhq/coin-tester": "^0.10.0-nightly.1",
-    "@ledgerhq/cryptoassets": "^13.28.0-nightly.3",
-    "@ledgerhq/coin-evm": "^2.30.0-nightly.5",
-    "@ledgerhq/live-common": "^34.48.0-nightly.8",
+    "@ledgerhq/coin-evm": "^2.30.0",
+    "@ledgerhq/coin-framework": "^6.4.0",
+    "@ledgerhq/coin-tester": "^0.9.3",
+    "@ledgerhq/cryptoassets": "^13.28.0",
+    "@ledgerhq/live-common": "^34.48.0",
     "@ledgerhq/live-config": "^3.2.0",
-    "@ledgerhq/live-signer-evm": "^0.7.5-nightly.6",
-    "@ledgerhq/types-live": "^6.84.0-nightly.1",
-    "@ledgerhq/types-cryptoassets": "^7.27.0-nightly.0"
+    "@ledgerhq/live-signer-evm": "^0.7.5",
+    "@ledgerhq/types-cryptoassets": "^7.26.0",
+    "@ledgerhq/types-live": "^6.84.0"
   },
   "devDependencies": {
     "@swc/core": "1.4.11",
@@ -71,8 +71,7 @@
     "rimraf": "^5.0.5",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3",
-    "@ledgerhq/hw-transport": "^6.31.10"
+    "typescript": "^5.3.3"
   },
   "scripts": {
     "clean": "rimraf lib lib-es",

package/src/helpers.ts

@@ -1,20 +1,8 @@
-import type Transport from "@ledgerhq/hw-transport";
 import { ethers } from "ethers";
-import { AccountBridge, CurrencyBridge, NFTStandard } from "@ledgerhq/types-live";
+import { NFTStandard } from "@ledgerhq/types-live";
 import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { ERC20_ABI, ERC721_ABI, ERC1155_ABI } from "@ledgerhq/coin-evm/abis/index";
-import { BridgeStrategy } from "@ledgerhq/coin-tester/types";
-import { Transaction as EvmTransaction } from "@ledgerhq/coin-evm/types/transaction";
-import { GetAddressFn } from "@ledgerhq/coin-framework/bridge/getAddressWrapper";
-import { LegacySignerEth } from "@ledgerhq/live-signer-evm";
-import { EvmSigner } from "@ledgerhq/coin-evm/types/signer";
-import { SignerContext } from "@ledgerhq/coin-framework/signer";
-import { buildAccountBridge, buildCurrencyBridge } from "@ledgerhq/coin-evm/bridge/js";
-import resolver from "@ledgerhq/coin-evm/hw-getAddress";
-import { Signer, createSigner } from "@ledgerhq/live-common/bridge/generic-alpaca/signer/Eth";
-import { getAlpacaCurrencyBridge } from "@ledgerhq/live-common/bridge/generic-alpaca/currencyBridge";
-import { getAlpacaAccountBridge } from "@ledgerhq/live-common/bridge/generic-alpaca/accountBridge";
 
 export const ethereum = getCryptoCurrencyById("ethereum");
 export const sonic = getCryptoCurrencyById("sonic");
@@ -26,35 +14,6 @@ export const ERC721Interface = new ethers.Interface(ERC721_ABI);
 export const ERC1155Interface = new ethers.Interface(ERC1155_ABI);
 export const VITALIK = "0x6bfD74C0996F269Bcece59191EFf667b3dFD73b9";
 
-export function getBridges(
-  strategy: BridgeStrategy,
-  transport: Transport,
-  network: string,
-): {
-  currencyBridge: CurrencyBridge;
-  accountBridge: AccountBridge<EvmTransaction>;
-  getAddress: GetAddressFn;
-} {
-  if (strategy === "legacy") {
-    const context: SignerContext<EvmSigner> = (_, fn) => fn(new LegacySignerEth(transport));
-
-    return {
-      currencyBridge: buildCurrencyBridge(context),
-      accountBridge: buildAccountBridge(context),
-      getAddress: resolver(context),
-    };
-  }
-
-  const context: SignerContext<Signer> = (_, fn) => fn(createSigner(transport));
-  const getAddress = resolver(context);
-
-  return {
-    currencyBridge: getAlpacaCurrencyBridge(network, "local", { context, getAddress }),
-    accountBridge: getAlpacaAccountBridge(network, "local", { context, getAddress }),
-    getAddress,
-  };
-}
-
 export const impersonnateAccount = async ({
   provider,
   addressToImpersonnate,

package/src/scenarii/blast.ts

@@ -15,8 +15,6 @@ import { blast, callMyDealer, VITALIK } from "../helpers";
 import { defaultNanoApp } from "../scenarii.test";
 import { killAnvil, spawnAnvil } from "../anvil";
 import resolver from "@ledgerhq/coin-evm/hw-getAddress";
-import { SignerContext } from "@ledgerhq/coin-framework/signer";
-import { EvmSigner } from "@ledgerhq/coin-evm/types/signer";
 
 type BlastScenarioTransaction = ScenarioTransaction<EvmTransaction, Account>;
 
@@ -72,11 +70,12 @@ export const scenarioBlast: Scenario<EvmTransaction, Account> = {
     ]);
 
     const provider = new ethers.JsonRpcProvider("http://127.0.0.1:8545");
-    const signerContext: SignerContext<EvmSigner> = (_, fn) => fn(new LegacySignerEth(transport));
+    const signerContext: Parameters<typeof resolver>[0] = (deviceId, fn) =>
+      fn(new LegacySignerEth(transport));
 
     const lastBlockNumber = await provider.getBlockNumber();
     // start indexing at next block
-    setBlock(lastBlockNumber + 1);
+    await setBlock(lastBlockNumber + 1);
 
     setCoinConfig(() => ({
       info: {

package/src/scenarii/ethereum.ts

@@ -2,21 +2,25 @@ 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 { LegacySignerEth } from "@ledgerhq/live-signer-evm";
 import { Account } from "@ledgerhq/types-live";
 import { BigNumber } from "bignumber.js";
 import { ethers } from "ethers";
 import { makeAccount } from "@ledgerhq/coin-evm/__tests__/fixtures/common.fixtures";
+import { buildAccountBridge, buildCurrencyBridge } from "@ledgerhq/coin-evm/bridge/js";
 import { getCoinConfig, setCoinConfig } from "@ledgerhq/coin-evm/config";
+import resolver from "@ledgerhq/coin-evm/hw-getAddress";
 import {
   EvmNftTransaction,
   Transaction as EvmTransaction,
 } from "@ledgerhq/coin-evm/types/transaction";
 import { killAnvil, spawnAnvil } from "../anvil";
-import { callMyDealer, ethereum, VITALIK, getBridges } from "../helpers";
+import { callMyDealer, ethereum, VITALIK } from "../helpers";
 import { indexBlocks, initMswHandlers, resetIndexer, setBlock } from "../indexer";
 import { defaultNanoApp } from "../scenarii.test";
+import { getAlpacaCurrencyBridge } from "@ledgerhq/live-common/bridge/generic-alpaca/currencyBridge";
+import { getAlpacaAccountBridge } from "@ledgerhq/live-common/bridge/generic-alpaca/accountBridge";
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
-import { BridgeStrategy } from "@ledgerhq/coin-tester/types";
 
 type EthereumScenarioTransaction = ScenarioTransaction<EvmTransaction, Account>;
 
@@ -28,10 +32,8 @@ const cloneXTokenId = "951";
 
 const makeScenarioTransactions = ({
   address,
-  strategy,
 }: {
   address: string;
-  strategy: BridgeStrategy;
 }): EthereumScenarioTransaction[] => {
   const scenarioSendEthTransaction: EthereumScenarioTransaction = {
     name: "Send 1 ETH",
@@ -125,9 +127,8 @@ const makeScenarioTransactions = ({
   return [
     scenarioSendEthTransaction,
     scenarioSendUSDCTransaction,
-    ...(strategy === "legacy"
-      ? [scenarioSendERC721Transaction, scenarioSendERC1155Transaction]
-      : []),
+    scenarioSendERC721Transaction,
+    scenarioSendERC1155Transaction,
   ];
 };
 
@@ -139,6 +140,9 @@ export const scenarioEthereum: Scenario<EvmTransaction, Account> = {
       spawnAnvil("https://ethereum-rpc.publicnode.com"),
     ]);
 
+    const signerContext: Parameters<typeof resolver>[0] = (_, fn) =>
+      fn(new LegacySignerEth(transport));
+
     setCoinConfig(() => ({
       info: {
         status: {
@@ -186,11 +190,15 @@ export const scenarioEthereum: Scenario<EvmTransaction, Account> = {
     initMswHandlers(getCoinConfig(ethereum).info);
 
     const onSignerConfirmation = getOnSpeculosConfirmation();
-    const { currencyBridge, accountBridge, getAddress } = getBridges(
-      strategy,
-      transport,
-      "ethereum",
-    );
+    const currencyBridge =
+      strategy === "legacy"
+        ? buildCurrencyBridge(signerContext)
+        : getAlpacaCurrencyBridge("ethereum", "local");
+    const accountBridge =
+      strategy === "legacy"
+        ? buildAccountBridge(signerContext)
+        : getAlpacaAccountBridge("ethereum", "local");
+    const getAddress = resolver(signerContext);
     const { address } = await getAddress("", {
       path: "44'/60'/0'/0/0",
       currency: ethereum,
@@ -246,25 +254,25 @@ export const scenarioEthereum: Scenario<EvmTransaction, Account> = {
       onSignerConfirmation,
     };
   },
-  beforeAll: (account, strategy) => {
+  beforeAll: account => {
     expect(account.balance.toFixed()).toBe(ethers.parseEther("10000").toString());
     expect(account.subAccounts?.[0].type).toBe("TokenAccount");
     expect(account.subAccounts?.[0].balance.toFixed()).toBe(
       ethers.parseUnits("100", USDC_ON_ETHEREUM.units[0].magnitude).toString(),
     );
-    expect(account.nfts?.length).toBe(strategy === "legacy" ? 2 : 0);
+    expect(account.nfts?.length).toBe(2);
   },
-  getTransactions: (address, strategy) => makeScenarioTransactions({ address, strategy }),
+  getTransactions: address => makeScenarioTransactions({ address }),
   beforeSync: async () => {
     await indexBlocks();
   },
-  afterAll: (account, strategy) => {
+  afterAll: account => {
     expect(account.subAccounts?.length).toBe(1);
     expect(account.subAccounts?.[0].balance.toFixed()).toBe(
       ethers.parseUnits("20", USDC_ON_ETHEREUM.units[0].magnitude).toString(),
     );
     expect(account.nfts?.length).toBe(0);
-    expect(account.operations.length).toBe(strategy === "legacy" ? 7 : 3);
+    expect(account.operations.length).toBe(7);
   },
   teardown: async () => {
     resetIndexer();

package/src/scenarii/polygon.ts

@@ -1,3 +1,4 @@
+import { LegacySignerEth } from "@ledgerhq/live-signer-evm";
 import { BigNumber } from "bignumber.js";
 import { ethers } from "ethers";
 import { Account } from "@ledgerhq/types-live";
@@ -6,14 +7,17 @@ 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";
 import { resetIndexer, initMswHandlers, setBlock, indexBlocks } from "../indexer";
+import { buildAccountBridge, buildCurrencyBridge } from "@ledgerhq/coin-evm/bridge/js";
 import { Transaction as EvmTransaction } from "@ledgerhq/coin-evm/types/transaction";
 import { getCoinConfig, setCoinConfig } from "@ledgerhq/coin-evm/config";
 import { makeAccount } from "@ledgerhq/coin-evm/__tests__/fixtures/common.fixtures";
-import { callMyDealer, getBridges, polygon, VITALIK } from "../helpers";
+import { callMyDealer, polygon, VITALIK } from "../helpers";
 import { defaultNanoApp } from "../scenarii.test";
 import { killAnvil, spawnAnvil } from "../anvil";
+import resolver from "@ledgerhq/coin-evm/hw-getAddress";
+import { getAlpacaCurrencyBridge } from "@ledgerhq/live-common/bridge/generic-alpaca/currencyBridge";
+import { getAlpacaAccountBridge } from "@ledgerhq/live-common/bridge/generic-alpaca/accountBridge";
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
-import { BridgeStrategy } from "@ledgerhq/coin-tester/types";
 
 type PolygonScenarioTransaction = ScenarioTransaction<EvmTransaction, Account>;
 
@@ -23,13 +27,7 @@ const yootTokenId = "1988";
 const emberContract = "0xa5511E9941E303101b50675926Fd4d9c1A8a8805";
 const platinumTokenId = "4";
 
-const makeScenarioTransactions = ({
-  address,
-  strategy,
-}: {
-  address: string;
-  strategy: BridgeStrategy;
-}) => {
+const makeScenarioTransactions = ({ address }: { address: string }) => {
   const send1MaticTransaction: PolygonScenarioTransaction = {
     name: "Send 1 POL",
     amount: new BigNumber(ethers.parseEther("1").toString()),
@@ -117,7 +115,8 @@ const makeScenarioTransactions = ({
   return [
     send1MaticTransaction,
     send80USDCTransaction,
-    ...(strategy === "legacy" ? [sendERC721Transaction, sendERC1155Transaction] : []),
+    sendERC721Transaction,
+    sendERC1155Transaction,
   ];
 };
 
@@ -130,6 +129,8 @@ export const scenarioPolygon: Scenario<EvmTransaction, Account> = {
     ]);
 
     const provider = new ethers.JsonRpcProvider("http://127.0.0.1:8545");
+    const signerContext: Parameters<typeof resolver>[0] = (_, fn) =>
+      fn(new LegacySignerEth(transport));
 
     const lastBlockNumber = await provider.getBlockNumber();
     // start indexing at next block
@@ -181,11 +182,15 @@ export const scenarioPolygon: Scenario<EvmTransaction, Account> = {
     initMswHandlers(getCoinConfig(polygon).info);
 
     const onSignerConfirmation = getOnSpeculosConfirmation();
-    const { currencyBridge, accountBridge, getAddress } = getBridges(
-      strategy,
-      transport,
-      "polygon",
-    );
+    const currencyBridge =
+      strategy === "legacy"
+        ? buildCurrencyBridge(signerContext)
+        : getAlpacaCurrencyBridge("ethereum", "local");
+    const accountBridge =
+      strategy === "legacy"
+        ? buildAccountBridge(signerContext)
+        : getAlpacaAccountBridge("ethereum", "local");
+    const getAddress = resolver(signerContext);
     const { address } = await getAddress("", {
       path: "44'/60'/0'/0/0",
       currency: polygon,
@@ -231,25 +236,25 @@ export const scenarioPolygon: Scenario<EvmTransaction, Account> = {
 
     return { currencyBridge, accountBridge, account: scenarioAccount, onSignerConfirmation };
   },
-  getTransactions: (address, strategy) => makeScenarioTransactions({ address, strategy }),
+  getTransactions: address => makeScenarioTransactions({ address }),
   beforeSync: async () => {
     await indexBlocks();
   },
-  beforeAll: (account, strategy) => {
+  beforeAll: account => {
     expect(account.balance.toFixed()).toBe(ethers.parseEther("10000").toString());
     expect(account.subAccounts?.[0].type).toBe("TokenAccount");
     expect(account.subAccounts?.[0].balance.toFixed()).toBe(
       ethers.parseUnits("100", USDC_ON_POLYGON.units[0].magnitude).toString(),
     );
-    expect(account.nfts?.length).toBe(strategy === "legacy" ? 2 : 0);
+    expect(account.nfts?.length).toBe(2);
   },
-  afterAll: (account, strategy) => {
+  afterAll: account => {
     expect(account.subAccounts?.length).toBe(1);
     expect(account.subAccounts?.[0].balance.toFixed()).toBe(
       ethers.parseUnits("20", USDC_ON_POLYGON.units[0].magnitude).toString(),
     );
     expect(account.nfts?.length).toBe(0);
-    expect(account.operations.length).toBe(strategy === "legacy" ? 7 : 3);
+    expect(account.operations.length).toBe(7);
   },
   teardown: async () => {
     resetIndexer();

package/src/scenarii/scroll.ts

@@ -15,8 +15,6 @@ import { callMyDealer, scroll, VITALIK } from "../helpers";
 import { defaultNanoApp } from "../scenarii.test";
 import { killAnvil, spawnAnvil } from "../anvil";
 import resolver from "@ledgerhq/coin-evm/hw-getAddress";
-import { SignerContext } from "@ledgerhq/coin-framework/signer";
-import { EvmSigner } from "@ledgerhq/coin-evm/types/signer";
 
 type ScrollScenarioTransaction = ScenarioTransaction<EvmTransaction, Account>;
 
@@ -76,11 +74,12 @@ export const scenarioScroll: Scenario<EvmTransaction, Account> = {
     ]);
 
     const provider = new ethers.JsonRpcProvider("http://127.0.0.1:8545");
-    const signerContext: SignerContext<EvmSigner> = (_, fn) => fn(new LegacySignerEth(transport));
+    const signerContext: Parameters<typeof resolver>[0] = (deviceId, fn) =>
+      fn(new LegacySignerEth(transport));
 
     const lastBlockNumber = await provider.getBlockNumber();
     // start indexing at next block
-    setBlock(lastBlockNumber + 1);
+    await setBlock(lastBlockNumber + 1);
 
     setCoinConfig(() => ({
       info: {

package/src/scenarii/sonic.ts

@@ -1,3 +1,4 @@
+import { LegacySignerEth } from "@ledgerhq/live-signer-evm";
 import { BigNumber } from "bignumber.js";
 import { ethers } from "ethers";
 import { Account } from "@ledgerhq/types-live";
@@ -7,11 +8,15 @@ import { Scenario, ScenarioTransaction } from "@ledgerhq/coin-tester/main";
 import { killSpeculos, spawnSpeculos } from "@ledgerhq/coin-tester/signers/speculos";
 import { resetIndexer, indexBlocks, initMswHandlers, setBlock } from "../indexer";
 import { Transaction as EvmTransaction } from "@ledgerhq/coin-evm/types/transaction";
+import { buildAccountBridge, buildCurrencyBridge } from "@ledgerhq/coin-evm/bridge/js";
 import { getCoinConfig, setCoinConfig } from "@ledgerhq/coin-evm/config";
 import { makeAccount } from "@ledgerhq/coin-evm/__tests__/fixtures/common.fixtures";
-import { VITALIK, callMyDealer, getBridges, sonic } from "../helpers";
+import { VITALIK, callMyDealer, sonic } from "../helpers";
 import { defaultNanoApp } from "../scenarii.test";
 import { killAnvil, spawnAnvil } from "../anvil";
+import resolver from "@ledgerhq/coin-evm/hw-getAddress";
+import { getAlpacaCurrencyBridge } from "@ledgerhq/live-common/bridge/generic-alpaca/currencyBridge";
+import { getAlpacaAccountBridge } from "@ledgerhq/live-common/bridge/generic-alpaca/accountBridge";
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 
 type SonicScenarioTransaction = ScenarioTransaction<EvmTransaction, Account>;
@@ -74,6 +79,9 @@ export const scenarioSonic: Scenario<EvmTransaction, Account> = {
       spawnAnvil("https://sonic-rpc.publicnode.com"),
     ]);
 
+    const signerContext: Parameters<typeof resolver>[0] = (_, fn) =>
+      fn(new LegacySignerEth(transport));
+
     setCoinConfig(() => ({
       info: {
         status: {
@@ -113,7 +121,15 @@ export const scenarioSonic: Scenario<EvmTransaction, Account> = {
     initMswHandlers(getCoinConfig(sonic).info);
 
     const onSignerConfirmation = getOnSpeculosConfirmation();
-    const { currencyBridge, accountBridge, getAddress } = getBridges(strategy, transport, "sonic");
+    const currencyBridge =
+      strategy === "legacy"
+        ? buildCurrencyBridge(signerContext)
+        : getAlpacaCurrencyBridge("sonic", "local");
+    const accountBridge =
+      strategy === "legacy"
+        ? buildAccountBridge(signerContext)
+        : getAlpacaAccountBridge("sonic", "local");
+    const getAddress = resolver(signerContext);
     const { address } = await getAddress("", {
       path: "44'/60'/0'/0/0",
       currency: sonic,

package/src/scenarii.test.ts

@@ -27,65 +27,62 @@ setCryptoAssetsStoreForCoinFramework({
 // https://github.com/LedgerHQ/ledger-live/blob/develop/libs/coin-tester/docker-compose.yml
 export const defaultNanoApp = { firmware: "2.4.2" as const, version: "1.17.0" as const };
 
-describe.each([["legacy"], ["generic-adapter"]] as const)(
-  "EVM Deterministic Tester (%s strategy)",
-  strategy => {
-    it("scenario Ethereum", async () => {
-      try {
-        await executeScenario(scenarioEthereum, strategy);
-      } catch (e) {
-        if (e != "done") {
-          await Promise.all([killSpeculos(), killAnvil()]);
-          throw e;
-        }
+describe("EVM Deterministic Tester", () => {
+  it("scenario Ethereum", async () => {
+    try {
+      await executeScenario(scenarioEthereum);
+    } catch (e) {
+      if (e != "done") {
+        await Promise.all([killSpeculos(), killAnvil()]);
+        throw e;
       }
-    });
+    }
+  });
 
-    it("scenario Sonic", async () => {
-      try {
-        await executeScenario(scenarioSonic, strategy);
-      } catch (e) {
-        if (e != "done") {
-          await Promise.all([killSpeculos(), killAnvil()]);
-          throw e;
-        }
+  it("scenario Sonic", async () => {
+    try {
+      await executeScenario(scenarioSonic);
+    } catch (e) {
+      if (e != "done") {
+        await Promise.all([killSpeculos(), killAnvil()]);
+        throw e;
       }
-    });
+    }
+  });
 
-    it("scenario polygon", async () => {
-      try {
-        await executeScenario(scenarioPolygon, strategy);
-      } catch (e) {
-        if (e != "done") {
-          await Promise.all([killSpeculos(), killAnvil()]);
-          throw e;
-        }
+  it("scenario polygon", async () => {
+    try {
+      await executeScenario(scenarioPolygon);
+    } catch (e) {
+      if (e != "done") {
+        await Promise.all([killSpeculos(), killAnvil()]);
+        throw e;
       }
-    });
+    }
+  });
 
-    it.skip("scenario scroll", async () => {
-      try {
-        await executeScenario(scenarioScroll);
-      } catch (e) {
-        if (e != "done") {
-          await Promise.all([killSpeculos(), killAnvil()]);
-          throw e;
-        }
+  it.skip("scenario scroll", async () => {
+    try {
+      await executeScenario(scenarioScroll);
+    } catch (e) {
+      if (e != "done") {
+        await Promise.all([killSpeculos(), killAnvil()]);
+        throw e;
       }
-    });
+    }
+  });
 
-    it.skip("scenario blast", async () => {
-      try {
-        await executeScenario(scenarioBlast);
-      } catch (e) {
-        if (e != "done") {
-          await Promise.all([killSpeculos(), killAnvil()]);
-          throw e;
-        }
+  it.skip("scenario blast", async () => {
+    try {
+      await executeScenario(scenarioBlast);
+    } catch (e) {
+      if (e != "done") {
+        await Promise.all([killSpeculos(), killAnvil()]);
+        throw e;
       }
-    });
-  },
-);
+    }
+  });
+});
 
 ["exit", "SIGINT", "SIGQUIT", "SIGTERM", "SIGUSR1", "SIGUSR2", "uncaughtException"].map(e =>
   process.on(e, async () => {