@cardano-sdk/e2e 0.44.2 → 0.44.4

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.44.4](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/e2e@0.44.3...@cardano-sdk/e2e@0.44.4) (2024-10-11)
+
+**Note:** Version bump only for package @cardano-sdk/e2e
+
+## [0.44.3](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/e2e@0.44.2...@cardano-sdk/e2e@0.44.3) (2024-10-09)
+
+**Note:** Version bump only for package @cardano-sdk/e2e
+
 ## [0.44.2](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/e2e@0.44.1...@cardano-sdk/e2e@0.44.2) (2024-10-07)
 
 **Note:** Version bump only for package @cardano-sdk/e2e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.44.2",
+  "version": "0.44.4",
   "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",
@@ -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.31.1",
-    "@cardano-sdk/cardano-services-client": "~0.21.1",
+    "@cardano-sdk/cardano-services": "~0.31.3",
+    "@cardano-sdk/cardano-services-client": "~0.21.3",
     "@cardano-sdk/core": "~0.41.0",
     "@cardano-sdk/crypto": "~0.1.30",
     "@cardano-sdk/hardware-ledger": "~0.12.8",
     "@cardano-sdk/hardware-trezor": "~0.6.7",
     "@cardano-sdk/input-selection": "~0.13.23",
     "@cardano-sdk/key-management": "~0.24.6",
-    "@cardano-sdk/ogmios": "~0.18.3",
+    "@cardano-sdk/ogmios": "~0.18.5",
     "@cardano-sdk/tx-construction": "~0.21.8",
     "@cardano-sdk/util": "~0.15.5",
-    "@cardano-sdk/util-dev": "~0.23.3",
+    "@cardano-sdk/util-dev": "~0.23.5",
     "@cardano-sdk/util-rxjs": "~0.7.36",
-    "@cardano-sdk/wallet": "~0.44.8",
+    "@cardano-sdk/wallet": "~0.44.10",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@shiroyasha9/axios-fetch-adapter": "1.0.3",
     "axios": "^1.7.4",
@@ -120,9 +120,9 @@
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
     "@cardano-sdk/dapp-connector": "~0.12.40",
-    "@cardano-sdk/projection": "~0.12.3",
-    "@cardano-sdk/projection-typeorm": "~0.9.3",
-    "@cardano-sdk/web-extension": "~0.34.7",
+    "@cardano-sdk/projection": "~0.12.5",
+    "@cardano-sdk/projection-typeorm": "~0.9.5",
+    "@cardano-sdk/web-extension": "~0.34.9",
     "@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": "31dd8a464d9212571fecff0233c152b84530ec31"
+  "gitHead": "2e0e2c79bf24475ca7ceaefa16118b283c43e21f"
 }

package/src/scripts/generate-dotenv.sh

@@ -1,15 +1,31 @@
 #!/bin/bash
 
 set -e
-set -x
-set -o
 
-case $2 in
+target="${ENVIRONMENT}-${NETWORK}"
+
+case $CLUSTER in
   any)
-    environment="$1"
+    environment="${target}"
+    ;;
+  *)
+    environment="${target}.${CLUSTER}"
+    ;;
+esac
+
+case $NETWORK in
+  preprod)
+    networkMagic=1
+    ;;
+  preview)
+    networkMagic=2
+    ;;
+  sanchonet)
+    networkMagic=4
     ;;
   *)
-    environment="$1.$2"
+    echo "${NETWORK}: Unknown network"
+    exit 1
     ;;
 esac
 
@@ -17,32 +33,47 @@ domain="${environment}.lw.iog.io"
 url="https://${domain}/"
 
 # Construct the environment file content
-envFileContent="
-# Logger
+envFileContent="\
 LOGGER_MIN_SEVERITY=info
 
-# Key management setup - required by getWallet
-KEY_MANAGEMENT_PROVIDER=inMemory
-
-# Providers setup - required by getWallet
 TEST_CLIENT_ASSET_PROVIDER=http
 TEST_CLIENT_ASSET_PROVIDER_PARAMS='{\"baseUrl\":\"${url}\"}'
-TEST_CLIENT_CHAIN_HISTORY_PROVIDER=http
+TEST_CLIENT_CHAIN_HISTORY_PROVIDER=ws
 TEST_CLIENT_CHAIN_HISTORY_PROVIDER_PARAMS='{\"baseUrl\":\"${url}\"}'
 TEST_CLIENT_HANDLE_PROVIDER=http
 TEST_CLIENT_HANDLE_PROVIDER_PARAMS='{\"baseUrl\":\"${url}\"}'
-TEST_CLIENT_NETWORK_INFO_PROVIDER=http
+TEST_CLIENT_NETWORK_INFO_PROVIDER=ws
 TEST_CLIENT_NETWORK_INFO_PROVIDER_PARAMS='{\"baseUrl\":\"${url}\"}'
 TEST_CLIENT_REWARDS_PROVIDER=http
 TEST_CLIENT_REWARDS_PROVIDER_PARAMS='{\"baseUrl\":\"${url}\"}'
 TEST_CLIENT_TX_SUBMIT_PROVIDER=http
 TEST_CLIENT_TX_SUBMIT_PROVIDER_PARAMS='{\"baseUrl\":\"${url}\"}'
-TEST_CLIENT_UTXO_PROVIDER=http
+TEST_CLIENT_UTXO_PROVIDER=ws
 TEST_CLIENT_UTXO_PROVIDER_PARAMS='{\"baseUrl\":\"${url}\"}'
 TEST_CLIENT_STAKE_POOL_PROVIDER=http
 TEST_CLIENT_STAKE_POOL_PROVIDER_PARAMS='{\"baseUrl\":\"${url}\"}'
 WS_PROVIDER_URL='wss://${domain}/ws'
-"
+
+KEY_MANAGEMENT_PROVIDER=inMemory
+KEY_MANAGEMENT_PARAMS='{
+  \"bip32Ed25519\": \"Sodium\",
+  \"accountIndex\": 0,
+  \"chainId\": {
+    \"networkId\": 0,
+    \"networkMagic\": ${networkMagic}
+  },
+  \"passphrase\": \"some_passphrase\",
+  \"mnemonic\": \"${MNEMONIC}\"
+}'"
 
 # Write the environment file content to the specified file
 echo "$envFileContent" > .env
+
+# Dump inputs and outputs
+echo "
+Target environment: ${ENVIRONMENT}
+Target network:     ${NETWORK}
+Target cluster:     ${CLUSTER}
+
+Result .env:"
+cat .env

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

@@ -6,8 +6,16 @@ import { SharedArray } from 'k6/data';
 import { check } from 'k6';
 import ws from 'k6/ws';
 
-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' },
+const parameters = Object.assign(
+  {
+    CONNECTIONS_SECONDS: '3',
+    HD_ACTIVE_ADDR_COUNT: '10',
+    HD_MAX_TX_HISTORY: '100',
+    IDLE_SECONDS: '60',
+    TARGET_NET: 'mainnet',
+    WALLET_RESTORATION: 'false',
+    WALLETS: '100'
+  },
   // eslint-disable-next-line no-undef
   __ENV
 );
@@ -16,9 +24,12 @@ const { HD_ACTIVE_ADDR_COUNT, HD_MAX_TX_HISTORY, TARGET_NET, WALLETS } = Object.
 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);
+const activeAddrCount = Number.parseInt(parameters.HD_ACTIVE_ADDR_COUNT, 10);
+const idleSeconds = Number.parseInt(parameters.IDLE_SECONDS, 10);
+const connectionsSeconds = Number.parseInt(parameters.CONNECTIONS_SECONDS, 10);
+const maxTxHistory = Number.parseInt(parameters.HD_MAX_TX_HISTORY, 10);
+const numWallets = Number.parseInt(parameters.WALLETS, 10);
+const walletRestoration = parameters.WALLETS === 'true';
 
 export const options = {
   ext: {
@@ -31,15 +42,15 @@ export const options = {
     connections: {
       executor: 'ramping-vus',
       gracefulRampDown: '0s',
-      gracefulStop: '10m',
-      stages: [{ duration: '3s', target: numWallets }],
+      gracefulStop: '60m',
+      stages: [{ duration: `${connectionsSeconds}s`, target: numWallets }],
       startVUs: 1
     }
   }
 };
 
 /** Wallet addresses extracted from the JSON dump file */
-const fileName = `../../dump/addresses/${TARGET_NET}.json`;
+const fileName = `../../dump/addresses/${parameters.TARGET_NET}.json`;
 // eslint-disable-next-line no-undef
 const walletsOrig = new SharedArray('walletsData', () => JSON.parse(open(fileName)));
 
@@ -77,7 +88,9 @@ export const run = ({ wallets }) => {
   const vu = __VU;
   const wallet = wallets[vu % wallets.length]; // each wallet is a collection of addresses
 
+  // eslint-disable-next-line sonarjs/cognitive-complexity
   const res = ws.connect(url, null, (socket) => {
+    let blockNo = 0;
     let closed = false;
     let requestId = 0;
     let transactionsCount = 0;
@@ -92,7 +105,7 @@ export const run = ({ wallets }) => {
         return socket.setTimeout(() => {
           closed = true;
           socket.close();
-        }, 1000);
+        }, idleSeconds * 1000);
       }
 
       const address =
@@ -100,15 +113,23 @@ export const run = ({ wallets }) => {
           ? wallet[requestId - 1].address
           : getDummyAddr(wallet[0].address, requestId - wallet.length);
 
-      socket.send(JSON.stringify({ requestId, txsByAddresses: { addresses: [address], lower: 0 } }));
+      const lower = walletRestoration ? 0 : blockNo;
+
+      socket.send(JSON.stringify({ requestId, txsByAddresses: { addresses: [address], lower } }));
     };
 
     socket.on('message', (message) => {
-      const { clientId, responseTo, transactions } = JSON.parse(message);
+      const { clientId, networkInfo, responseTo, transactions } = JSON.parse(message);
 
+      // Set operational stat
       if (clientId) operationalTrend.add(Date.now() - begin);
+
+      // Perform init with or without restoration
+      if (networkInfo) ({ blockNo } = networkInfo.ledgerTip);
       if (clientId || responseTo) nextAddress();
-      if (transactions) transactionsCount += transactions.length;
+
+      // Count the incoming transactions
+      if (Array.isArray(transactions)) transactionsCount += transactions.length;
     });
 
     // Count unexpected close