@cardano-sdk/e2e 0.16.4 → 0.16.5-patch.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.16.4",
+  "version": "0.16.5-patch.0",
   "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.13",
-    "@cardano-sdk/input-selection": "~0.11.0",
-    "@cardano-sdk/key-management": "~0.7.11",
-    "@cardano-sdk/ogmios": "~0.12.10",
-    "@cardano-sdk/tx-construction": "~0.9.0",
-    "@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/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.14-patch.0",
+    "@cardano-sdk/key-management": "~0.7.11-patch.0",
+    "@cardano-sdk/ogmios": "~0.12.8",
+    "@cardano-sdk/tx-construction": "~0.8.6-patch.0",
+    "@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.5-patch.0",
     "@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.5",
+    "@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.6-patch.0",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -148,7 +147,7 @@
     "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",
     "eslint": "^7.32.0",
     "events": "^3.3.0",
@@ -175,5 +174,5 @@
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "a036575fda25ab17463821ef0e22f480f273d66d"
+  "gitHead": "beb492c9438e51263926b3ea07e1f1f99d7dc856"
 }

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/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();