@cardano-sdk/e2e 0.43.0 → 0.44.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "description": "End to end tests for the cardano-js-sdk packages.",
   "repository": "https://github.com/input-output-hk/cardano-js-sdk",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
     "test:ogmios": "jest -c jest.config.js --forceExit --selectProjects ogmios --runInBand --verbose",
     "test:pg-boss": "jest -c jest.config.js --forceExit --selectProjects pg-boss --runInBand --verbose",
     "test:providers": "jest -c jest.config.js --forceExit --selectProjects providers --runInBand --verbose",
-    "test:wallet": "yarn wait-for-network-init ; yarn test:wallet:epoch0 && yarn test:ws && { yarn wait-for-network-epoch-3 ; yarn test:wallet:epoch3 ; }",
+    "test:wallet": "yarn wait-for-network-init ; yarn test:wallet:epoch0 && { yarn wait-for-network-epoch-3 ; yarn test:wallet:epoch3 && yarn test:ws ; }",
     "test:wallet:epoch0": "jest -c jest.config.js --forceExit --selectProjects wallet_epoch_0 --runInBand --verbose",
     "test:wallet:epoch3": "jest -c jest.config.js --forceExit --selectProjects wallet_epoch_3 --runInBand --verbose",
     "test:wallet-real-ada": "NETWORK_SPEED=slow jest -c jest.config.js --forceExit --selectProjects wallet-real-ada --runInBand --verbose",
@@ -76,20 +76,20 @@
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.2",
     "@cardano-ogmios/client": "6.5.0",
-    "@cardano-sdk/cardano-services": "~0.30.0",
-    "@cardano-sdk/cardano-services-client": "~0.20.9",
-    "@cardano-sdk/core": "~0.40.0",
+    "@cardano-sdk/cardano-services": "~0.31.0",
+    "@cardano-sdk/cardano-services-client": "~0.21.0",
+    "@cardano-sdk/core": "~0.41.0",
     "@cardano-sdk/crypto": "~0.1.30",
-    "@cardano-sdk/hardware-ledger": "~0.12.4",
-    "@cardano-sdk/hardware-trezor": "~0.6.4",
-    "@cardano-sdk/input-selection": "~0.13.20",
-    "@cardano-sdk/key-management": "~0.24.3",
-    "@cardano-sdk/ogmios": "~0.18.0",
-    "@cardano-sdk/tx-construction": "~0.21.5",
+    "@cardano-sdk/hardware-ledger": "~0.12.6",
+    "@cardano-sdk/hardware-trezor": "~0.6.6",
+    "@cardano-sdk/input-selection": "~0.13.22",
+    "@cardano-sdk/key-management": "~0.24.5",
+    "@cardano-sdk/ogmios": "~0.18.2",
+    "@cardano-sdk/tx-construction": "~0.21.7",
     "@cardano-sdk/util": "~0.15.5",
-    "@cardano-sdk/util-dev": "~0.23.0",
-    "@cardano-sdk/util-rxjs": "~0.7.33",
-    "@cardano-sdk/wallet": "~0.44.4",
+    "@cardano-sdk/util-dev": "~0.23.2",
+    "@cardano-sdk/util-rxjs": "~0.7.35",
+    "@cardano-sdk/wallet": "~0.44.6",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@shiroyasha9/axios-fetch-adapter": "1.0.3",
     "axios": "^1.7.4",
@@ -119,10 +119,10 @@
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
-    "@cardano-sdk/dapp-connector": "~0.12.37",
-    "@cardano-sdk/projection": "~0.12.0",
-    "@cardano-sdk/projection-typeorm": "~0.9.0",
-    "@cardano-sdk/web-extension": "~0.34.3",
+    "@cardano-sdk/dapp-connector": "~0.12.39",
+    "@cardano-sdk/projection": "~0.12.2",
+    "@cardano-sdk/projection-typeorm": "~0.9.2",
+    "@cardano-sdk/web-extension": "~0.34.5",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -182,5 +182,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "58513e2ae961e81bd0f168e3d65f29b15aa4ff87"
+  "gitHead": "7b57a20fa480214f31a2773e7da732f2572243ce"
 }

package/src/factories.ts

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+// cSpell:ignore dcspark ledgerjs multiplatform shiroyasha vespaiach
 import * as CML from '@dcspark/cardano-multiplatform-lib-nodejs';
 import * as Crypto from '@cardano-sdk/crypto';
 import {
@@ -64,9 +65,10 @@ const customHttpFetchAdapter = isNodeJs ? undefined : require('@shiroyasha9/axio
 const HTTP_PROVIDER = 'http';
 const OGMIOS_PROVIDER = 'ogmios';
 const STUB_PROVIDER = 'stub';
-const MISSING_URL_PARAM = 'Missing URL';
 const WS_PROVIDER = 'ws';
 
+const MISSING_URL_PARAM = 'Missing URL';
+
 export type CreateKeyAgent = (dependencies: KeyAgentDependencies) => Promise<AsyncKeyAgent>;
 export const keyManagementFactory = new ProviderFactory<CreateKeyAgent>();
 export const assetProviderFactory = new ProviderFactory<AssetProvider>();
@@ -93,6 +95,25 @@ addressDiscoveryFactory.register(
 bip32Ed25519Factory.register('CML', async () => new Crypto.CmlBip32Ed25519(CML));
 bip32Ed25519Factory.register('Sodium', async () => new Crypto.SodiumBip32Ed25519());
 
+// Web Socket
+
+let wsClient: CardanoWsClient;
+
+const getWsClient = async (logger: Logger) => {
+  if (wsClient) return wsClient;
+
+  const env = getEnv(walletVariables);
+  const chainHistoryProvider = await chainHistoryProviderFactory.create(
+    HTTP_PROVIDER,
+    env.TEST_CLIENT_CHAIN_HISTORY_PROVIDER_PARAMS,
+    logger
+  );
+
+  if (env.WS_PROVIDER_URL === undefined) throw new Error(`${networkInfoHttpProvider.name}: ${MISSING_URL_PARAM}`);
+
+  return (wsClient = new CardanoWsClient({ chainHistoryProvider, logger }, { url: new URL(env.WS_PROVIDER_URL) }));
+};
+
 // Asset providers
 
 assetProviderFactory.register(HTTP_PROVIDER, async (params: any, logger: Logger): Promise<AssetProvider> => {
@@ -120,6 +141,11 @@ chainHistoryProviderFactory.register(
   }
 );
 
+chainHistoryProviderFactory.register(
+  WS_PROVIDER,
+  async (_params: any, logger: Logger) => (await getWsClient(logger)).chainHistoryProvider
+);
+
 networkInfoProviderFactory.register(
   HTTP_PROVIDER,
   async (params: any, logger: Logger): Promise<NetworkInfoProvider> => {
@@ -131,15 +157,10 @@ networkInfoProviderFactory.register(
   }
 );
 
-networkInfoProviderFactory.register(WS_PROVIDER, (_params: any, logger: Logger): Promise<NetworkInfoProvider> => {
-  const env = getEnv(walletVariables);
-
-  if (env.WS_PROVIDER_URL === undefined) throw new Error(`${networkInfoHttpProvider.name}: ${MISSING_URL_PARAM}`);
-
-  const wsClient = new CardanoWsClient({ logger }, { url: new URL(env.WS_PROVIDER_URL) });
-
-  return Promise.resolve(wsClient.networkInfoProvider);
-});
+networkInfoProviderFactory.register(
+  WS_PROVIDER,
+  async (_params: any, logger: Logger) => (await getWsClient(logger)).networkInfoProvider
+);
 
 rewardsProviderFactory.register(HTTP_PROVIDER, async (params: any, logger: Logger): Promise<RewardsProvider> => {
   if (params.baseUrl === undefined) throw new Error(`${rewardsHttpProvider.name}: ${MISSING_URL_PARAM}`);
@@ -191,6 +212,11 @@ utxoProviderFactory.register(HTTP_PROVIDER, async (params: any, logger: Logger):
   });
 });
 
+utxoProviderFactory.register(
+  WS_PROVIDER,
+  async (_params: any, logger: Logger) => (await getWsClient(logger)).utxoProvider
+);
+
 handleProviderFactory.register(HTTP_PROVIDER, async (params: any, logger: Logger): Promise<HandleProvider> => {
   if (params.baseUrl === undefined) throw new Error(`${handleHttpProvider.name}: ${MISSING_URL_PARAM}`);
 

package/test/k6/scenarios/wallets.test.js

@@ -245,7 +245,7 @@ const syncWallet = ({ wallet, poolAddress }) => {
   if (RUN_MODE === RunMode.Restore) {
     sdkCom.stakePoolSearch(poolAddress);
   }
-  sdkCom.stats();
+  sdkCom.stakePoolStats();
 
   // Consider the wallet synced by tracking its first address
   syncedWallets.add(addresses[0]);

package/test/k6/scenarios/web-socket.test.js

@@ -1,15 +1,25 @@
+// cSpell:ignore loadimpact
+
 import * as k6Utils from '../../../../util-dev/dist/cjs/k6-utils.js';
 import { Counter, Trend } from 'k6/metrics';
+import { SharedArray } from 'k6/data';
 import { check } from 'k6';
 import ws from 'k6/ws';
 
-// eslint-disable-next-line no-undef
-const { WALLETS } = Object.assign({ WALLETS: '10000' }, __ENV);
-// eslint-disable-next-line no-undef
-const dut = k6Utils.getDut(__ENV);
+const { HD_ACTIVE_ADDR_COUNT, HD_MAX_TX_HISTORY, TARGET_NET, WALLETS } = Object.assign(
+  { HD_ACTIVE_ADDR_COUNT: '10', HD_MAX_TX_HISTORY: '100', TARGET_NET: 'mainnet', WALLETS: '100' },
+  // eslint-disable-next-line no-undef
+  __ENV
+);
 
+// eslint-disable-next-line no-undef
+const dut = k6Utils.getDut(__ENV, { networks: ['mainnet', 'preprod'] });
 const url = `wss://${dut}/ws`;
 
+const activeAddrCount = Number.parseInt(HD_ACTIVE_ADDR_COUNT, 10);
+const maxTxHistory = Number.parseInt(HD_MAX_TX_HISTORY, 10);
+const numWallets = Number.parseInt(WALLETS, 10);
+
 export const options = {
   ext: {
     loadimpact: {
@@ -21,28 +31,84 @@ export const options = {
     connections: {
       executor: 'ramping-vus',
       gracefulRampDown: '0s',
-      gracefulStop: '120s',
-      stages: [{ duration: '3s', target: Number.parseInt(WALLETS, 10) }],
-      startVUs: 10
+      gracefulStop: '10m',
+      stages: [{ duration: '3s', target: numWallets }],
+      startVUs: 1
     }
   }
 };
 
+/** Wallet addresses extracted from the JSON dump file */
+const fileName = `../../dump/addresses/${TARGET_NET}.json`;
+// eslint-disable-next-line no-undef
+const walletsOrig = new SharedArray('walletsData', () => JSON.parse(open(fileName)));
+
+export const setup = () => {
+  check(
+    undefined,
+    Object.fromEntries(
+      [`Number of wallets: ${numWallets}`, `Max transactions per wallet: ${maxTxHistory}`].map((_) => [_, () => true])
+    )
+  );
+
+  // Remove "big transaction history wallets"
+  const filteredWallets = walletsOrig.filter(({ tx_count }) => tx_count < maxTxHistory);
+  // Create chunks of `activeAddrCount` addresses per HD wallet
+  const wallets = k6Utils.chunkArray(filteredWallets, activeAddrCount);
+
+  return { wallets: wallets.slice(0, numWallets) };
+};
+
 const operationalTrend = new Trend('_operational', true);
+const syncTrend = new Trend('_sync', true);
+const syncCount = new Counter('_sync_count');
+const transactionsTrend = new Trend('_transactions_per_wallet');
 const unexpectedCloseCounter = new Counter('_unexpected_close');
 
-export const run = () => {
+const getDummyAddr = (addr, idx, suffix = 'mh') => {
+  const last3Chars = addr.slice(-3);
+  const updateChars = last3Chars !== `${suffix}${idx}` ? `${suffix}${idx}` : `${idx}${suffix}`;
+  return addr.slice(0, -3) + updateChars;
+};
+
+export const run = ({ wallets }) => {
   const begin = Date.now();
+  // eslint-disable-next-line no-undef
+  const vu = __VU;
+  const wallet = wallets[vu % wallets.length]; // each wallet is a collection of addresses
 
   const res = ws.connect(url, null, (socket) => {
     let closed = false;
-    let firstMessage = true;
+    let requestId = 0;
+    let transactionsCount = 0;
 
-    socket.on('message', () => {
-      if (firstMessage) {
-        operationalTrend.add(Date.now() - begin);
-        firstMessage = false;
+    const nextAddress = () => {
+      // Simplified address discovery with 50 fake addresses
+      if (++requestId > wallet.length + 50) {
+        transactionsTrend.add(transactionsCount);
+        syncTrend.add(Date.now() - begin);
+        syncCount.add(1);
+
+        return socket.setTimeout(() => {
+          closed = true;
+          socket.close();
+        }, 1000);
       }
+
+      const address =
+        requestId <= wallet.length
+          ? wallet[requestId - 1].address
+          : getDummyAddr(wallet[0].address, requestId - wallet.length);
+
+      socket.send(JSON.stringify({ requestId, txsByAddresses: { addresses: [address], lower: 0 } }));
+    };
+
+    socket.on('message', (message) => {
+      const { clientId, responseTo, transactions } = JSON.parse(message);
+
+      if (clientId) operationalTrend.add(Date.now() - begin);
+      if (clientId || responseTo) nextAddress();
+      if (transactions) transactionsCount += transactions.length;
     });
 
     // Count unexpected close
@@ -51,13 +117,11 @@ export const run = () => {
     });
 
     // Heartbeat
-    socket.setTimeout(() => socket.send('{}'), 30 * 1000);
-
-    // End the test after 80"
-    socket.setTimeout(() => {
-      closed = true;
-      socket.close();
-    }, 80 * 1000);
+    const heartbeat = () => {
+      socket.send('{}');
+      socket.setTimeout(heartbeat, 30 * 1000);
+    };
+    heartbeat();
   });
 
   check(res, { 'status is 101': (r) => r && r.status === 101 });

package/test/long-running/webSocket.test.ts

@@ -1,13 +1,15 @@
-import { CardanoWsClient } from '@cardano-sdk/cardano-services-client';
+import { CardanoWsClient, chainHistoryHttpProvider } from '@cardano-sdk/cardano-services-client';
 import { getEnv, walletVariables } from '../../src';
 import { logger } from '@cardano-sdk/util-dev';
 
 const env = getEnv([...walletVariables]);
 
 describe('Web Socket', () => {
+  const chainHistoryProvider = chainHistoryHttpProvider({ logger, ...env.TEST_CLIENT_CHAIN_HISTORY_PROVIDER_PARAMS });
   let client: CardanoWsClient;
 
-  const openClient = () => (client = new CardanoWsClient({ logger }, { url: new URL(env.WS_PROVIDER_URL) }));
+  const openClient = () =>
+    (client = new CardanoWsClient({ chainHistoryProvider, logger }, { url: new URL(env.WS_PROVIDER_URL) }));
 
   const closeClient = () => (client ? client.close() : Promise.resolve());
 

package/test/wallet_epoch_3/PersonalWallet/conwayTransactions.test.ts

@@ -451,8 +451,8 @@ describe('PersonalWallet/conwayTransactions', () => {
   });
 
   describe('with proposal procedure', () => {
-    let actionId: Cardano.GovernanceActionId;
     let confirmedTx: Cardano.HydratedTx;
+    let id: Cardano.TransactionId;
     let proposalProcedures: Cardano.ProposalProcedure[];
 
     beforeAll(async () => {
@@ -519,10 +519,7 @@ describe('PersonalWallet/conwayTransactions', () => {
         .customize(({ txBody }) => ({ ...txBody, proposalProcedures }))
         .build()
         .sign();
-      const [id, tx] = await submitAndConfirm(wallet, signedTx.tx, 1);
-      confirmedTx = tx;
-
-      actionId = { actionIndex: 0, id };
+      [id, confirmedTx] = await submitAndConfirm(wallet, signedTx.tx, 1);
     });
 
     it('parameter_change_action correctly submits protocol parameters update', () => {
@@ -533,7 +530,10 @@ describe('PersonalWallet/conwayTransactions', () => {
       const votingProcedures: Cardano.VotingProcedures = [
         {
           voter: { __typename: VoterType.dRepKeyHash, credential: dRepCredential },
-          votes: [{ actionId, votingProcedure: { anchor, vote: Vote.abstain } }]
+          votes: [
+            { actionId: { actionIndex: 0, id }, votingProcedure: { anchor, vote: Vote.abstain } },
+            { actionId: { actionIndex: 1, id }, votingProcedure: { anchor: null, vote: Vote.yes } }
+          ]
         }
       ];
       const signedTx = await dRepWallet