@cardano-sdk/e2e 0.16.5 → 0.16.6-patch.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.16.5",
+  "version": "0.16.6-patch.1",
   "description": "End to end tests for the cardano-js-sdk packages.",
   "engines": {
     "node": ">=16.0"
@@ -81,19 +81,18 @@
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^6.0.0",
     "@cardano-ogmios/client": "5.6.0",
-    "@cardano-sdk/cardano-services": "~0.14.4",
-    "@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.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.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.1",
+    "@cardano-sdk/cardano-services": "~0.14.2",
+    "@cardano-sdk/cardano-services-client": "~0.10.2",
+    "@cardano-sdk/core": "~0.15.2",
+    "@cardano-sdk/crypto": "~0.1.8",
+    "@cardano-sdk/hardware-ledger": "~0.2.15-patch.1",
+    "@cardano-sdk/key-management": "~0.7.12-patch.1",
+    "@cardano-sdk/ogmios": "~0.12.8",
+    "@cardano-sdk/tx-construction": "~0.8.7-patch.1",
+    "@cardano-sdk/util": "~0.12.1",
+    "@cardano-sdk/util-dev": "~0.13.6",
+    "@cardano-sdk/util-rxjs": "~0.5.2",
+    "@cardano-sdk/wallet": "~0.17.6-patch.1",
     "@vespaiach/axios-fetch-adapter": "^0.3.0",
     "axios": "^0.27.2",
     "bunyan": "^1.8.15",
@@ -123,10 +122,10 @@
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
-    "@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.6",
+    "@cardano-sdk/dapp-connector": "~0.9.9",
+    "@cardano-sdk/projection": "~0.6.12",
+    "@cardano-sdk/projection-typeorm": "~0.3.8",
+    "@cardano-sdk/web-extension": "~0.13.7-patch.1",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -148,10 +147,8 @@
     "babel-loader": "^8.2.5",
     "blake2b-no-wasm": "2.1.4",
     "buffer": "^6.0.3",
-    "chromedriver": "114.0.1",
+    "chromedriver": "^114.0.0",
     "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",
@@ -177,5 +174,5 @@
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "5e75bfbd24896ea0ac7a890466b56afb48857926"
+  "gitHead": "343f43d15e3733575be8054e51f504308de7571d"
 }

package/src/tools/multi-delegation-data-gen/example.json

@@ -1,5 +1,4 @@
 {
-  "changeAddressResolver": "static",
   "startingFunds": 1000000000000,
   "stakeDistribution": [
     0.2,

package/src/tools/multi-delegation-data-gen/index.ts

@@ -18,8 +18,7 @@ import {
 } from './utils';
 
 import { Cardano } from '@cardano-sdk/core';
-import { DynamicChangeAddressResolver, PersonalWallet } from '@cardano-sdk/wallet';
-import { roundRobinRandomImprove } from '@cardano-sdk/input-selection';
+import { PersonalWallet } from '@cardano-sdk/wallet';
 import { walletReady } from '../../';
 import chalk from 'chalk';
 
@@ -72,15 +71,9 @@ const monitor = new TerminalProgressMonitor();
 
     const stakeAddresses = await generateStakeAddresses(delegationWallet, config.stakeDistribution.length, monitor);
 
-    const pools = await delegateToMultiplePools(delegationWallet, stakeAddresses, monitor);
-    const portfolio = await distributeStake(
-      delegationWallet,
-      config.startingFunds,
-      config.stakeDistribution,
-      stakeAddresses,
-      monitor,
-      pools
-    );
+    await delegateToMultiplePools(delegationWallet, stakeAddresses, monitor);
+
+    await distributeStake(delegationWallet, config.startingFunds, config.stakeDistribution, stakeAddresses, monitor);
 
     monitor.startTask('Waiting for delegation to be updated on the wallet.');
     await rewardAccountStatuses(delegationWallet.delegation.rewardAccounts$, [
@@ -89,21 +82,6 @@ const monitor = new TerminalProgressMonitor();
     ]);
     monitor.endTask('Delegation updated.', TaskResult.Success);
 
-    if (config.changeAddressResolver === 'dynamic') {
-      monitor.logInfo(`Using dynamic change address resolution: Portfolio: ${JSON.stringify(portfolio)}`);
-      const selector = roundRobinRandomImprove({
-        changeAddressResolver: new DynamicChangeAddressResolver(
-          delegationWallet.addresses$,
-          delegationWallet.delegation.distribution$,
-          async () => portfolio,
-          console
-        )
-      });
-      delegationWallet.setInputSelector(selector);
-    } else {
-      monitor.logInfo('Using static change address resolution');
-    }
-
     monitor.logInfo('Setup phase ended. Starting interactions...');
 
     // Initial setup done, log starting state.

package/src/tools/multi-delegation-data-gen/utils/config.ts

@@ -23,14 +23,6 @@ convict.addFormat({
   }
 });
 
-convict.addFormat({
-  name: 'changeAddressResolver',
-  validate(val) {
-    if (val !== 'static' && val !== 'dynamic')
-      throw new TypeError('changeAddressResolver must be set to either static or dynamic');
-  }
-});
-
 export type ValueTransferConfig = {
   amount: { max: number; min: number };
   count: { max: number; min: number };
@@ -38,11 +30,6 @@ export type ValueTransferConfig = {
 };
 
 export const configLoader = convict({
-  changeAddressResolver: {
-    default: 'static',
-    doc: 'Whether to use the static or dynamic strategy to resolve change addresses.',
-    format: 'changeAddressResolver'
-  },
   iterations: {
     default: 10,
     doc: 'How many iterations will be executed before stopping the test.',

package/src/tools/multi-delegation-data-gen/utils/utils.ts

@@ -263,16 +263,14 @@ export const generateStakeAddresses = async (
  * @param stakeDistribution The stake distribution to be followed.
  * @param stakeAddresses The list of stake addresses.
  * @param monitor The progress monitor.
- * @param pools The pools we are delegating to.
  */
 export const distributeStake = async (
   delegationWallet: PersonalWallet,
   startingFunds: number,
   stakeDistribution: Array<number>,
   stakeAddresses: Array<GroupedAddress>,
-  monitor: TerminalProgressMonitor,
-  pools: Array<Cardano.StakePool>
-): Promise<Cardano.Cip17DelegationPortfolio> => {
+  monitor: TerminalProgressMonitor
+) => {
   // TODO: Replace with delegatePortfolio once LW-6702 is merged.
   const totalWeight = stakeDistribution.reduce((sum, current) => sum + current, 0);
   const stakeDistributionSsPercent = stakeDistribution.map((value) => value / totalWeight);
@@ -280,11 +278,6 @@ export const distributeStake = async (
 
   const txBuilder = delegationWallet.createTxBuilder();
 
-  const portfolio: Cardano.Cip17DelegationPortfolio = {
-    name: 'Portfolio',
-    pools: stakeDistributionSsPercent.map((weight, index) => ({ id: pools[index].hexId, weight }))
-  };
-
   let i = 0;
   const startingFundsMinusFee = startingFunds - 5_000_000;
   for (const { address } of stakeAddresses) {
@@ -298,8 +291,6 @@ export const distributeStake = async (
   await submitAndConfirm(delegationWallet, signedTx);
 
   monitor.endTask('Funds distributed', TaskResult.Success);
-
-  return portfolio;
 };
 
 /**

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

@@ -1,3 +1,4 @@
+/* eslint-disable max-statements */
 import { AddressType, KeyRole } from '@cardano-sdk/key-management';
 import { Cardano } from '@cardano-sdk/core';
 import {
@@ -12,72 +13,24 @@ 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({
@@ -92,13 +45,9 @@ describe('cache invalidation', () => {
     await waitForWalletStateSettle(wallet1.wallet);
   });
 
-  afterAll(async () => {
-    wallet1.wallet.shutdown();
-    await testProviderServer.stop();
-    await testProviderServer.remove();
-  });
+  afterAll(() => wallet1.wallet.shutdown());
 
-  test('cache is invalidated on epoch rollover', async () => {
+  test.skip('cache is invalidated on epoch rollover', async () => {
     const wallet = wallet1.wallet;
 
     await walletReady(wallet);