@cardano-sdk/e2e 0.16.4 → 0.16.5

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.16.5](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/e2e@0.16.4...@cardano-sdk/e2e@0.16.5) (2023-07-05)
+
+### Bug Fixes
+
+* **wallet:** discovery should search for 1/0 too ([cdf79cb](https://github.com/input-output-hk/cardano-js-sdk/commit/cdf79cbaf8925e72e52ad859ef78a0a112729b81))
+
 ## [0.16.4](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/e2e@0.16.3...@cardano-sdk/e2e@0.16.4) (2023-07-04)
 
 **Note:** Version bump only for package @cardano-sdk/e2e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.16.4",
+  "version": "0.16.5",
   "description": "End to end tests for the cardano-js-sdk packages.",
   "engines": {
     "node": ">=16.0"
@@ -85,15 +85,15 @@
     "@cardano-sdk/cardano-services-client": "~0.10.4",
     "@cardano-sdk/core": "~0.15.3",
     "@cardano-sdk/crypto": "~0.1.9",
-    "@cardano-sdk/hardware-ledger": "~0.2.13",
-    "@cardano-sdk/input-selection": "~0.11.0",
-    "@cardano-sdk/key-management": "~0.7.11",
+    "@cardano-sdk/hardware-ledger": "~0.2.14",
+    "@cardano-sdk/input-selection": "~0.11.1",
+    "@cardano-sdk/key-management": "~0.8.0",
     "@cardano-sdk/ogmios": "~0.12.10",
-    "@cardano-sdk/tx-construction": "~0.9.0",
+    "@cardano-sdk/tx-construction": "~0.9.1",
     "@cardano-sdk/util": "~0.13.0",
     "@cardano-sdk/util-dev": "~0.13.7",
     "@cardano-sdk/util-rxjs": "~0.5.3",
-    "@cardano-sdk/wallet": "~0.18.0",
+    "@cardano-sdk/wallet": "~0.18.1",
     "@vespaiach/axios-fetch-adapter": "^0.3.0",
     "axios": "^0.27.2",
     "bunyan": "^1.8.15",
@@ -126,7 +126,7 @@
     "@cardano-sdk/dapp-connector": "~0.9.10",
     "@cardano-sdk/projection": "~0.6.14",
     "@cardano-sdk/projection-typeorm": "~0.3.10",
-    "@cardano-sdk/web-extension": "~0.13.5",
+    "@cardano-sdk/web-extension": "~0.13.6",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -150,6 +150,8 @@
     "buffer": "^6.0.3",
     "chromedriver": "114.0.1",
     "copy-webpack-plugin": "^10.2.4",
+    "dockerode": "^3.3.1",
+    "dockerode-utils": "^0.0.7",
     "eslint": "^7.32.0",
     "events": "^3.3.0",
     "expect-webdriverio": "^3.2.1",
@@ -175,5 +177,5 @@
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "a036575fda25ab17463821ef0e22f480f273d66d"
+  "gitHead": "5e75bfbd24896ea0ac7a890466b56afb48857926"
 }

package/test/long-running/cache-invalidation.test.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-statements */
 import { AddressType, KeyRole } from '@cardano-sdk/key-management';
 import { Cardano } from '@cardano-sdk/core';
 import {
@@ -13,24 +12,72 @@ import {
   walletReady,
   walletVariables
 } from '../../src';
+import { containerExec } from 'dockerode-utils';
+import { getRandomPort } from 'get-port-please';
 import { logger } from '@cardano-sdk/util-dev';
+import Docker from 'dockerode';
+import path from 'path';
 
-const env = getEnv(walletVariables);
 const vrf = Cardano.VrfVkHex('2ee5a4c423224bb9c42107fc18a60556d6a83cec1d9dd37a71f56af7198fc759');
 
-const wallet1Params: KeyAgentFactoryProps = {
-  accountIndex: 0,
-  chainId: env.KEY_MANAGEMENT_PARAMS.chainId,
-  mnemonic:
-    // eslint-disable-next-line max-len
-    'phrase raw learn suspect inmate powder combine apology regular hero gain chronic fruit ritual short screen goddess odor keen creek brand today kit machine',
-  passphrase: 'some_passphrase'
-};
-
 describe('cache invalidation', () => {
+  let testProviderServer: Docker.Container;
   let wallet1: TestWallet;
 
   beforeAll(async () => {
+    const port = await getRandomPort();
+
+    // Get environment from original provider server container
+    const docker = new Docker();
+    const originalProviderServer = docker.getContainer('local-network-e2e-provider-server-1');
+    const cmdOutput = await containerExec(originalProviderServer, [
+      'node',
+      '-e',
+      'console.log(`sdk_token${JSON.stringify(process.env)}sdk_token`)'
+    ]);
+    const matchResult = cmdOutput[0].match(/sdk_token(.*)sdk_token/);
+
+    if (!matchResult) throw new Error('Error getting original container environment');
+
+    const [, encodedEnv] = matchResult;
+
+    const Env = Object.entries({
+      ...JSON.parse(encodedEnv),
+      DISABLE_DB_CACHE: 'false',
+      LOGGER_MIN_SEVERITY: 'debug'
+    }).map(([key, value]) => `${key}=${value}`);
+
+    const network = docker.getNetwork('local-network-e2e_default');
+
+    // Test container
+    testProviderServer = await docker.createContainer({
+      Env,
+      HostConfig: {
+        Binds: [`${path.join(__dirname, '..', '..', '..', '..', 'compose', 'placeholder-secrets')}:/run/secrets`],
+        PortBindings: { '3000/tcp': [{ HostPort: port.toString() }] }
+      },
+      Image: 'local-network-e2e-provider-server',
+      name: 'local-network-e2e-provider-server-test'
+    });
+
+    await network.connect({ Container: testProviderServer.id });
+    await testProviderServer.start();
+
+    const override = Object.fromEntries(
+      Object.entries(process.env)
+        .filter(([key]) => walletVariables.includes(key as typeof walletVariables[number]))
+        .map(([key, value]) => [key, value?.replace('localhost:4000/', `localhost:${port}/`)])
+    );
+    const env = getEnv(walletVariables, { override });
+    const wallet1Params: KeyAgentFactoryProps = {
+      accountIndex: 0,
+      chainId: env.KEY_MANAGEMENT_PARAMS.chainId,
+      mnemonic:
+        // eslint-disable-next-line max-len
+        'phrase raw learn suspect inmate powder combine apology regular hero gain chronic fruit ritual short screen goddess odor keen creek brand today kit machine',
+      passphrase: 'some_passphrase'
+    };
+
     jest.setTimeout(180_000);
 
     wallet1 = await getWallet({
@@ -45,9 +92,13 @@ describe('cache invalidation', () => {
     await waitForWalletStateSettle(wallet1.wallet);
   });
 
-  afterAll(() => wallet1.wallet.shutdown());
+  afterAll(async () => {
+    wallet1.wallet.shutdown();
+    await testProviderServer.stop();
+    await testProviderServer.remove();
+  });
 
-  test.skip('cache is invalidated on epoch rollover', async () => {
+  test('cache is invalidated on epoch rollover', async () => {
     const wallet = wallet1.wallet;
 
     await walletReady(wallet);

package/test/wallet/PersonalWallet/multiAddress.test.ts

@@ -17,7 +17,8 @@ import { isNotNil } from '@cardano-sdk/util';
 
 const env = getEnv(walletVariables);
 const logger = createLogger();
-const PAYMENT_ADDRESSES_TO_GENERATE = 60;
+const PAYMENT_INDICES_TO_GENERATE = 30;
+const PAYMENT_ADDRESSES_TO_GENERATE = PAYMENT_INDICES_TO_GENERATE * 2; // External + Internal address for each payment derivation index
 const COINS_PER_ADDRESS = 3_000_000n;
 
 describe('PersonalWallet/multiAddress', () => {
@@ -49,17 +50,28 @@ describe('PersonalWallet/multiAddress', () => {
     const addressesToBeDiscovered = new Array<GroupedAddress>();
 
     // Deposit some tADA at some generated addresses from the previously generated mnemonics.
-    for (let i = 0; i < PAYMENT_ADDRESSES_TO_GENERATE; ++i) {
-      const address = await multiAddressKeyAgent.deriveAddress(
-        {
-          index: i,
-          type: AddressType.External
-        },
-        0
-      );
-
-      addressesToBeDiscovered.push(address);
-      txBuilder.addOutput(txBuilder.buildOutput().address(address.address).coin(3_000_000n).toTxOut());
+    for (let i = 0; i < PAYMENT_INDICES_TO_GENERATE; ++i) {
+      const [addressExternal, addressInternal] = await Promise.all([
+        multiAddressKeyAgent.deriveAddress(
+          {
+            index: i,
+            type: AddressType.External
+          },
+          0
+        ),
+        multiAddressKeyAgent.deriveAddress(
+          {
+            index: i,
+            type: AddressType.Internal
+          },
+          0
+        )
+      ]);
+
+      addressesToBeDiscovered.push(addressExternal, addressInternal);
+
+      txBuilder.addOutput(txBuilder.buildOutput().address(addressExternal.address).coin(3_000_000n).toTxOut());
+      txBuilder.addOutput(txBuilder.buildOutput().address(addressInternal.address).coin(3_000_000n).toTxOut());
     }
 
     const { tx: signedTx } = await txBuilder.build().sign();