@cardano-sdk/e2e 0.55.23 → 0.55.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.55.23",
+  "version": "0.55.27",
   "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.4",
     "@cardano-ogmios/client": "6.9.0",
-    "@cardano-sdk/cardano-services": "~0.35.34",
-    "@cardano-sdk/cardano-services-client": "~0.26.32",
-    "@cardano-sdk/core": "~0.46.12",
-    "@cardano-sdk/crypto": "~0.4.5",
-    "@cardano-sdk/hardware-ledger": "~0.16.23",
-    "@cardano-sdk/hardware-trezor": "~0.7.33",
-    "@cardano-sdk/input-selection": "~0.14.29",
-    "@cardano-sdk/key-management": "~0.29.13",
-    "@cardano-sdk/ogmios": "~0.18.54",
-    "@cardano-sdk/tx-construction": "~0.28.11",
-    "@cardano-sdk/util": "~0.17.1",
-    "@cardano-sdk/util-dev": "~0.25.32",
-    "@cardano-sdk/util-rxjs": "~0.9.31",
-    "@cardano-sdk/wallet": "~0.54.4",
+    "@cardano-sdk/cardano-services": "~0.35.38",
+    "@cardano-sdk/cardano-services-client": "~0.26.36",
+    "@cardano-sdk/core": "~0.46.15",
+    "@cardano-sdk/crypto": "~0.4.7",
+    "@cardano-sdk/hardware-ledger": "~0.16.27",
+    "@cardano-sdk/hardware-trezor": "~0.7.37",
+    "@cardano-sdk/input-selection": "~0.14.33",
+    "@cardano-sdk/key-management": "~0.29.17",
+    "@cardano-sdk/ogmios": "~0.18.58",
+    "@cardano-sdk/tx-construction": "~0.28.15",
+    "@cardano-sdk/util": "~0.17.2",
+    "@cardano-sdk/util-dev": "~0.25.36",
+    "@cardano-sdk/util-rxjs": "~0.9.35",
+    "@cardano-sdk/wallet": "~0.54.8",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@emurgo/cardano-message-signing-nodejs": "^1.0.1",
     "@shiroyasha9/axios-fetch-adapter": "1.0.3",
@@ -97,7 +97,7 @@
     "bunyan": "^1.8.15",
     "chalk": "4.1.2",
     "cli-spinners": "^2.9.0",
-    "convict": "^6.2.4",
+    "convict": "^6.2.5",
     "delay": "5.0.0",
     "dotenv": "^16.0.1",
     "envalid": "^7.3.1",
@@ -112,7 +112,7 @@
     "ts-log": "^2.2.4",
     "ts-node": "^10.8.1",
     "ts-stopwatch": "0.0.4",
-    "uuid": "^8.3.2",
+    "uuid": "^11.1.1",
     "webextension-polyfill": "^0.8.0",
     "ws": "^8.5.0"
   },
@@ -120,10 +120,10 @@
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
-    "@cardano-sdk/dapp-connector": "~0.13.26",
-    "@cardano-sdk/projection": "~0.13.15",
-    "@cardano-sdk/projection-typeorm": "~0.10.15",
-    "@cardano-sdk/web-extension": "~0.39.40",
+    "@cardano-sdk/dapp-connector": "~0.13.29",
+    "@cardano-sdk/projection": "~0.13.19",
+    "@cardano-sdk/projection-typeorm": "~0.10.19",
+    "@cardano-sdk/web-extension": "~0.39.44",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -135,32 +135,29 @@
     "@types/k6": "^0.53.1",
     "@types/lodash": "^4.14.182",
     "@types/ora": "^3.2.0",
-    "@types/uuid": "^8.3.4",
     "@types/webextension-polyfill": "^0.8.0",
-    "@wdio/cli": "^7.19.5",
-    "@wdio/local-runner": "^7.19.5",
-    "@wdio/mocha-framework": "^7.19.5",
-    "@wdio/spec-reporter": "^7.19.5",
-    "@wdio/static-server-service": "^7.19.5",
-    "artillery": "^2.0.0-35",
+    "@wdio/cli": "^9.29.0",
+    "@wdio/local-runner": "^9.29.0",
+    "@wdio/mocha-framework": "^9.29.0",
+    "@wdio/spec-reporter": "^9.29.0",
+    "@wdio/static-server-service": "^9.29.0",
+    "artillery": "^2.0.33",
     "axios-mock-adapter": "^2.0.0",
     "babel-loader": "^8.2.5",
     "blake2b-no-wasm": "2.1.4",
     "buffer": "^6.0.3",
-    "chromedriver": "^127.0.0",
     "copy-webpack-plugin": "^10.2.4",
     "crypto-browserify": "^3.12.0",
     "delay": "^5.0.0",
-    "dockerode": "^3.3.1",
+    "dockerode": "^4.0.7",
     "dockerode-utils": "^0.0.7",
     "eslint": "^7.32.0",
     "events": "^3.3.0",
-    "expect-webdriverio": "^3.2.1",
+    "expect-webdriverio": "^5.6.8",
     "jest": "^28.1.3",
     "jest-webextension-mock": "^3.7.22",
     "json-bigint": "^1.0.0",
     "madge": "^5.0.1",
-    "mock-browser": "^0.92.14",
     "npm-run-all": "^4.1.5",
     "null-loader": "^4.0.1",
     "readable-stream": "^3.6.0",
@@ -170,19 +167,19 @@
     "typeorm": "^0.3.15",
     "typeorm-extension": "^2.7.0",
     "typescript": "^4.7.4",
+    "url": "^0.11.4",
     "util": "^0.12.4",
-    "wdio-chromedriver-service": "^7.3.2",
     "webassembly-loader-sw": "^1.1.0",
-    "webdriverio": "^7.20.5",
+    "webdriverio": "^9.29.0",
     "webpack": "^5.72.0",
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
   "engines": {
-    "node": ">=16.20.2"
+    "node": ">=22"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5fd89b1a0c1d1cc0682f45f915e423ba29cd2279"
+  "gitHead": "545a7f5c59ddb0b17781cdf759dcf9ed50e1a739"
 }

package/src/measurement-util.ts

@@ -102,7 +102,10 @@ export class MeasurementUtil<T extends string> {
 
     for (const measureEntry of performance
       .getEntriesByType('measure')
-      .map(({ duration, detail }) => ({ duration, target: (detail as MarkerDetail<T>).target }))
+      .map((entry) => ({
+        duration: entry.duration,
+        target: (entry as unknown as { detail: MarkerDetail<T> }).detail.target
+      }))
       .filter(({ target }) => targets?.some((t) => t === target))) {
       const data = measurementData[measureEntry.target];
       if (!data.time) {
@@ -125,8 +128,8 @@ export class MeasurementUtil<T extends string> {
     // Count all the start markers. They all have the 'target' detail added. Stop markers don't have it
     for (const targetName of performance
       .getEntriesByType('mark')
-      .map(({ detail }) => (detail as MarkerDetail<T>)?.target)
-      .filter((target) => target && targets?.some((t) => t === target))) {
+      .map((entry) => (entry as unknown as { detail?: MarkerDetail<T> }).detail?.target)
+      .filter((target): target is T => !!target && !!targets?.some((t) => t === target))) {
       measurementData[targetName].calls_count++;
     }
 

package/test/measurement-util/measurement-util.test.ts

@@ -19,7 +19,7 @@ jest.mock('perf_hooks', () => ({
 type measureTargets = 't1' | 't2';
 describe('MeasurementUtil', () => {
   let measurementUtil: MeasurementUtil<measureTargets>;
-  let mockData: Partial<PerformanceEntry>[];
+  let mockData: (Partial<PerformanceEntry> & { detail: { id: number; target: string } })[];
 
   beforeEach(() => {
     measurementUtil = new MeasurementUtil<measureTargets>();

package/test/wallet_epoch_0/PersonalWallet/mint.test.ts

@@ -1,6 +1,5 @@
-import { BaseWallet, FinalizeTxProps } from '@cardano-sdk/wallet';
+import { BaseWallet } from '@cardano-sdk/wallet';
 import { Cardano, nativeScriptPolicyId } from '@cardano-sdk/core';
-import { InitializeTxProps } from '@cardano-sdk/tx-construction';
 import { KeyRole, util } from '@cardano-sdk/key-management';
 import {
   bip32Ed25519Factory,
@@ -66,38 +65,16 @@ describe('PersonalWallet/mint', () => {
 
     const policyId = nativeScriptPolicyId(policyScript);
     const assetId = Cardano.AssetId(`${policyId}`); // skip asset name
-    const tokens = new Map([[assetId, 1n]]);
 
-    const walletAddress = (await firstValueFrom(wallet.addresses$))[0].address;
+    // Mint through the fluent transaction builder. The minted asset is balanced into the wallet's
+    // change; the policy requires Alice's signature, supplied as an extra signer.
+    const { tx: signedTx } = await wallet
+      .createTxBuilder()
+      .addMint({ assets: new Map([[Cardano.AssetName(''), 1n]]), policy: policyScript })
+      .extraSigners([alicePolicySigner])
+      .build()
+      .sign();
 
-    const txProps: InitializeTxProps = {
-      mint: tokens,
-      outputs: new Set([
-        {
-          address: walletAddress,
-          value: {
-            assets: tokens,
-            coins
-          }
-        }
-      ]),
-      signingOptions: {
-        extraSigners: [alicePolicySigner]
-      },
-      witness: { scripts: [policyScript] }
-    };
-
-    const unsignedTx = await wallet.initializeTx(txProps);
-
-    const finalizeProps: FinalizeTxProps = {
-      signingOptions: {
-        extraSigners: [alicePolicySigner]
-      },
-      tx: unsignedTx,
-      witness: { scripts: [policyScript] }
-    };
-
-    const signedTx = await wallet.finalizeTx(finalizeProps);
     const [, txFoundInHistory] = await submitAndConfirm(wallet, signedTx, 1);
 
     expect(txFoundInHistory.id).toEqual(signedTx.id);

package/test/wallet_epoch_0/PersonalWallet/phase2validation.test.ts

@@ -128,7 +128,7 @@ describe('PersonalWallet/phase2validation', () => {
           }
         }
       ]),
-      redeemersByType: { [Cardano.RedeemerPurpose.mint]: [scriptRedeemer] },
+      redeemersByType: { mint: new Map([[policyId, scriptRedeemer]]) },
       scriptIntegrityHash: scriptDataHash,
       witness: { redeemers: [scriptRedeemer], scripts: [alwaysFailScript] }
     };

package/test/web-extension/specs/dapp-cip30.spec.ts

@@ -24,7 +24,7 @@ describe('dapp/cip30', () => {
   });
 
   it('dapp should detect test wallet', async () => {
-    await expect($(pWalletFound)).toHaveTextContaining('true');
+    await expect($(pWalletFound)).toHaveText('true', { containing: true });
   });
 
   describe('dapp can use cip30 wallet api', () => {
@@ -50,14 +50,14 @@ describe('dapp/cip30', () => {
     });
 
     it('dapp gets correct addresses from cip30 wallet api', async () => {
-      await expect($(dappChangeAddress)).toHaveTextContaining(walletAddr);
-      await expect($(dappStakeAddress)).toHaveTextContaining(walletStakeAddr);
-      await expect($(dappUsedAddress)).toHaveTextContaining(walletAddr);
+      await expect($(dappChangeAddress)).toHaveText(walletAddr, { containing: true });
+      await expect($(dappStakeAddress)).toHaveText(walletStakeAddr, { containing: true });
+      await expect($(dappUsedAddress)).toHaveText(walletAddr, { containing: true });
     });
 
     it('dapp can build and send a transaction using cip30 WalletApi', async () => {
       await $(dappBtnRun).click();
-      await expect($(dappSubmittedTxConfirmation)).toHaveTextContaining('check your wallet');
+      await expect($(dappSubmittedTxConfirmation)).toHaveText('check your wallet', { containing: true });
     });
   });
 });

package/test/web-extension/specs/dapp-cip95.spec.ts

@@ -42,7 +42,7 @@ describe('dapp/cip95', () => {
   });
 
   it('dapp should detect test wallet', async () => {
-    await expect($(pWalletFound)).toHaveTextContaining('true');
+    await expect($(pWalletFound)).toHaveText('true', { containing: true });
   });
 
   describe('dapp can use cip95 wallet api', () => {
@@ -68,9 +68,9 @@ describe('dapp/cip95', () => {
     });
 
     it('dapp gets correct addresses from cip95 wallet api', async () => {
-      await expect($(dappChangeAddress)).toHaveTextContaining(walletAddr);
-      await expect($(dappStakeAddress)).toHaveTextContaining(walletStakeAddr);
-      await expect($(dappUsedAddress)).toHaveTextContaining(walletAddr);
+      await expect($(dappChangeAddress)).toHaveText(walletAddr, { containing: true });
+      await expect($(dappStakeAddress)).toHaveText(walletStakeAddr, { containing: true });
+      await expect($(dappUsedAddress)).toHaveText(walletAddr, { containing: true });
     });
 
     it('getRegisteredPubStakeKeys gets active public stake keys from cip95 wallet api', async () => {
@@ -81,12 +81,12 @@ describe('dapp/cip95', () => {
     it('getPubDRepKey gets the DRep key from cip95 wallet api', async () => {
       const dappDrepKey = await $(dappGetPubDrepKey).getText();
       expect(dappDrepKey.length).toBeGreaterThan(0);
-      await expect($(dappDrepId)).toHaveTextContaining('drep');
+      await expect($(dappDrepId)).toHaveText('drep', { containing: true });
     });
 
     it('supportedExtensions and getExtensions both return cip95', async () => {
-      await expect($(liSupportedExtensions)).toHaveTextContaining('95');
-      await expect($(liGetExtensions)).toHaveTextContaining('95');
+      await expect($(liSupportedExtensions)).toHaveText('95', { containing: true });
+      await expect($(liGetExtensions)).toHaveText('95', { containing: true });
     });
   });
 });

package/test/web-extension/specs/wallet.spec.ts

@@ -76,8 +76,8 @@ describe('wallet', () => {
         });
         walletAddr1 = await $(spanAddress).getText();
         walletStakeAddr1 = await $(spanStakeAddress).getText();
-        expect(walletAddr1).toHaveTextContaining('addr');
-        expect(walletStakeAddr1).toHaveTextContaining('stake');
+        expect(walletAddr1).toContain('addr');
+        expect(walletStakeAddr1).toContain('stake');
         await expect($(activeWalletName)).toHaveText(getObservableWalletName(0));
       });
     });
@@ -102,14 +102,14 @@ describe('wallet', () => {
 
         // Delegation transaction was submitted successfully
         const txId = await $('#multiDelegation .delegateTxId').getText();
-        expect(txId).toHaveTextContaining('TxId');
+        expect(txId).toContain('TxId');
 
         // Wallet reports delegating to 3 pools
         await browser.waitUntil(
           async () => {
             try {
-              const delegatedPools = await $$(liPools);
-              return delegatedPools.length === NUM_POOLS;
+              const delegatedPoolCount = await $$(liPools).length;
+              return delegatedPoolCount === NUM_POOLS;
             } catch {
               return false;
             }
@@ -125,8 +125,8 @@ describe('wallet', () => {
       it('can switch to another wallet', async () => {
         // Automatically deactivates first wallet, but keeps the store available for future activation
         await $(btnActivateWallet2).click();
-        await expect($(spanAddress)).not.toHaveTextContaining(walletAddr1);
-        await expect($(spanAddress)).toHaveTextContaining('addr');
+        await expect($(spanAddress)).not.toHaveText(walletAddr1, { containing: true });
+        await expect($(spanAddress)).toHaveText('addr', { containing: true });
         await expect($(activeWalletName)).toHaveText(getObservableWalletName(1));
       });
 
@@ -138,10 +138,10 @@ describe('wallet', () => {
       it('can destroy second wallet before switching back to the first wallet', async () => {
         // Destroy also clears associated store. Store will be rebuilt during future activation of same wallet
         await $(destroyWallet).click();
-        await expect($(spanAddress)).toHaveTextContaining('-');
+        await expect($(spanAddress)).toHaveText('-', { containing: true });
 
         await $(btnActivateWallet1).click();
-        await expect($(spanAddress)).toHaveTextContaining(walletAddr1);
+        await expect($(spanAddress)).toHaveText(walletAddr1, { containing: true });
         await expect($(activeWalletName)).toHaveText(getObservableWalletName(0));
       });
 

package/test/web-extension/tsconfig.json

@@ -4,7 +4,7 @@
     "baseUrl": "./extension",
     "types": [
       "node",
-      "webdriverio/async",
+      "@wdio/globals/types",
       "@wdio/mocha-framework",
       "expect-webdriverio"
     ]

package/test/web-extension/wdio.conf.js

@@ -2,13 +2,6 @@ const path = require('path');
 
 module.exports = {
   config: {
-    autoCompileOpts: {
-      autoCompile: true,
-      tsNodeOpts: {
-        project: 'test/web-extension/tsconfig.json',
-        transpileOnly: true
-      }
-    },
     bail: 0,
     baseUrl: 'http://localhost:4567',
     capabilities: [
@@ -51,10 +44,11 @@ module.exports = {
             { mount: '/cip95-cardano-wallet-connector', path: path.join(__dirname, 'dapp-cip95/build') }
           ]
         }
-      ],
-      'chromedriver'
+      ]
     ],
     specs: ['./**/*.spec.ts'],
+    // WebdriverIO v8+ auto-compiles TS via tsx; point it at the local tsconfig
+    tsConfigPath: path.join(__dirname, 'tsconfig.json'),
     waitforTimeout: 10_000
   }
 };

package/test/web-extension/webpack.config.base.js

@@ -88,6 +88,7 @@ module.exports = {
         perf_hooks: false,
         process: false,
         stream: require.resolve('readable-stream'),
+        url: require.resolve('url/'),
         util: require.resolve('util/')
       }
     },