@cardano-sdk/e2e 0.42.2 → 0.43.0

package/docker-compose.yml

@@ -6,6 +6,17 @@ x-logging: &logging
       max-file: '10'
 
 services:
+
+  blockfrost-ryo:
+    depends_on:
+      local-testnet:
+        condition: service_healthy
+    environment:
+      NODE_ENV: local-network
+    volumes:
+      - ./local-network/config/network/blockfrost-ryo:/app/config
+    profiles: [blockfrost-ryo]
+
   local-testnet:
     <<: *logging
     build:

package/local-network/Dockerfile

@@ -5,16 +5,16 @@ FROM ubuntu:${UBUNTU_VERSION} as builder
 ENV DEBIAN_FRONTEND=nonintercative
 
 WORKDIR /build
-ARG CARDANO_NODE_BUILD_URL=https://github.com/IntersectMBO/cardano-node/releases/download/9.1.0/cardano-node-9.1.0-linux.tar.gz
+ARG CARDANO_NODE_BUILD_URL=https://github.com/IntersectMBO/cardano-node/releases/download/9.1.1/cardano-node-9.1.1-linux.tar.gz
 ARG CARDANO_NODE_BUILD_URL_ARM64=https://github.com/input-output-hk/ogmios-tracker/releases/download/0.1.0/cardano-node-9.1.0-aarch64-linux.tar.gz
 
 RUN set -x && \
   apt-get update -y && \
   apt-get install -y wget tar curl unzip && \
   if [ "$(uname -m)" = "aarch64" ] ; then \
-    curl -fsSL "$CARDANO_NODE_BUILD_URL_ARM64" >cardano-node.tar.gz ;\
-    else \
-    curl -fsSL "$CARDANO_NODE_BUILD_URL" >cardano-node.tar.gz ;\
+    curl -fsSL "$CARDANO_NODE_BUILD_URL_ARM64" >cardano-node.tar.gz ; \
+  else \
+    curl -fsSL "$CARDANO_NODE_BUILD_URL" >cardano-node.tar.gz ; \
   fi && \
   mkdir -p cardano-node && \
   tar -xzf cardano-node.tar.gz -C cardano-node
@@ -34,9 +34,9 @@ COPY --from=builder /build/cardano-node /opt/cardano-node
 ARG TINI_VERSION=v0.19.0
 RUN mkdir -p ./bin && ln -s /opt/cardano-node/bin/* ./bin/ &&\
   if [ "$(uname -m)" = "aarch64" ] ; then \
-  TINI_VARIANT=static-arm64 ;\
+    TINI_VARIANT=static-arm64 ;\
   else \
-  TINI_VARIANT=static-amd64 ;\
+    TINI_VARIANT=static-amd64 ;\
   fi &&\
   curl -fsSL >/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TINI_VARIANT} &&\
   chmod +x /tini

package/local-network/scripts/install.sh

@@ -16,7 +16,7 @@ clean() {
 }
 trap clean EXIT
 
-VERSION="9.1.0"
+VERSION="9.1.1"
 
 rm -rf bin
 mkdir -p bin

package/local-network/scripts/make-babbage.sh

@@ -303,7 +303,7 @@ for NODE in ${SP_NODES}; do
   echo "${ROOT}/${NODE}.sh"
 done
 
-echo "Update start time in genesis files"
+echo "Update start time in genesis files with ${timeUnix}"
 sed_i -E "s/\"startTime\": [0-9]+/\"startTime\": ${timeUnix}/" ${ROOT}/genesis/byron/genesis.json
 sed_i -E "s/\"systemStart\": \".*\"/\"systemStart\": \"${timeISO}\"/" ${ROOT}/genesis/shelley/genesis.json
 
@@ -359,6 +359,8 @@ cp "${ROOT}"/genesis/shelley/genesis.conway.json ./config/network/genesis/conway
 
 mkdir -p "${ROOT}/run"
 
+echo "${timeUnix}" > "${ROOT}/run/system_start"
+
 echo "#!/usr/bin/env bash" >"${ROOT}/run/all.sh"
 echo "" >>"${ROOT}/run/all.sh"
 echo "" >>"${ROOT}/run/all.sh"

package/local-network/scripts/prepare_blockfrost_ryo.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+timeUnix=$(cat network-files/run/system_start)
+
+echo "Update start time in blockfrost genesis file with ${timeUnix}"
+
+mkdir -p ./config/network/blockfrost-ryo/
+
+cp ./templates/blockfrost-ryo/genesis.json ./config/network/blockfrost-ryo/genesis.json
+cp ./templates/blockfrost-ryo/byron_genesis.json ./config/network/blockfrost-ryo/byron_genesis.json
+cp ./templates/blockfrost-ryo/local-network.yaml ./config/network/blockfrost-ryo/local-network.yaml
+
+sed -i -E "s/\"system_start\": [0-9]+/\"system_start\": ${timeUnix}/" ./config/network/blockfrost-ryo/genesis.json

package/local-network/scripts/start.sh

@@ -26,6 +26,7 @@ trap 'kill 0' INT
 
 echo "Run"
 ./scripts/make-babbage.sh
+./scripts/prepare_blockfrost_ryo.sh
 ./network-files/run/all.sh &
 
 if [ -d /sdk-ipc ] ; then cp -a config/network /sdk-ipc/config ; fi

package/local-network/templates/blockfrost-ryo/byron_genesis.json

@@ -0,0 +1,6 @@
+{
+  "epoch_length": 100,
+  "slot_length": 1,
+  "safe_zone": 864,
+  "end_epoch": 0
+}

package/local-network/templates/blockfrost-ryo/genesis.json

@@ -0,0 +1,12 @@
+{
+  "active_slots_coefficient": 0.05,
+  "update_quorum": 5,
+  "max_lovelace_supply": "45000000000000000",
+  "network_magic": 888,
+  "epoch_length": 1000,
+  "system_start": 1000000,
+  "slots_per_kes_period": 129600,
+  "slot_length": 0.2,
+  "max_kes_evolutions": 62,
+  "security_param": 10
+}

package/local-network/templates/blockfrost-ryo/local-network.yaml

@@ -0,0 +1,14 @@
+server:
+  listenAddress: "0.0.0.0"
+  port: 3000
+  debug: true
+dbSync:
+  host: "postgres"
+  port: 5432
+  database: "cexplorer"
+  user: "postgres"
+  password: "doNoUseThisSecret!"
+  maxConnections: 5
+network: "custom"
+genesisDataFolder: '/app/config'
+tokenRegistryUrl: "https://metadata.cardano-testnet.iohkdev.io"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.42.2",
+  "version": "0.43.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",
@@ -46,8 +46,9 @@
     "test:web-extension:watch": "run-s test:web-extension:build test:web-extension:watch:bg",
     "test:web-extension:watch:bg": "run-p test:web-extension:watch:build test:web-extension:watch:run",
     "test:ws": "jest -c jest.config.js --forceExit --selectProjects ws-server --runInBand --verbose",
-    "local-network:common": "DISABLE_DB_CACHE=${DISABLE_DB_CACHE:-true} SUBMIT_API_ARGS='--testnet-magic 888' USE_BLOCKFROST=false __FIX_UMASK__=$(chmod -R a+r ../../compose/placeholder-secrets) docker compose --env-file ../cardano-services/environments/.env.local -p local-network-e2e -f docker-compose.yml -f ../../compose/common.yml -f ../../compose/$(uname -m).yml $FILES up",
+    "local-network:common": "DISABLE_DB_CACHE=${DISABLE_DB_CACHE:-true} SUBMIT_API_ARGS='--testnet-magic 888' USE_BLOCKFROST=false __FIX_UMASK__=$(chmod -R a+r ../../compose/placeholder-secrets) docker compose --env-file ../cardano-services/environments/.env.local -p local-network-e2e -f docker-compose.yml -f ../../compose/common.yml -f ../../compose/$(uname -m).yml $FILES --profile ${DOCKER_COMPOSE_PROFILE:-none} up",
     "local-network:up": "FILES='' yarn local-network:common",
+    "local-network:blockfrost:up": "FILES='' DOCKER_COMPOSE_PROFILE='blockfrost-ryo' yarn local-network:common",
     "local-network:single:up": "FILES='' yarn local-network:common cardano-node file-server local-testnet ogmios postgres",
     "local-network:profile:up": "FILES='-f ../../compose/pg-agent.yml' yarn local-network:common",
     "local-network:down": "docker compose -p local-network-e2e -f docker-compose.yml -f ../../compose/common.yml -f ../../compose/pg-agent.yml down -v --remove-orphans",
@@ -75,20 +76,20 @@
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.2",
     "@cardano-ogmios/client": "6.5.0",
-    "@cardano-sdk/cardano-services": "~0.29.11",
-    "@cardano-sdk/cardano-services-client": "~0.20.8",
-    "@cardano-sdk/core": "~0.39.3",
+    "@cardano-sdk/cardano-services": "~0.30.0",
+    "@cardano-sdk/cardano-services-client": "~0.20.9",
+    "@cardano-sdk/core": "~0.40.0",
     "@cardano-sdk/crypto": "~0.1.30",
-    "@cardano-sdk/hardware-ledger": "~0.12.3",
-    "@cardano-sdk/hardware-trezor": "~0.6.3",
-    "@cardano-sdk/input-selection": "~0.13.19",
-    "@cardano-sdk/key-management": "~0.24.2",
-    "@cardano-sdk/ogmios": "~0.17.8",
-    "@cardano-sdk/tx-construction": "~0.21.4",
+    "@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/util": "~0.15.5",
-    "@cardano-sdk/util-dev": "~0.22.10",
-    "@cardano-sdk/util-rxjs": "~0.7.32",
-    "@cardano-sdk/wallet": "~0.44.3",
+    "@cardano-sdk/util-dev": "~0.23.0",
+    "@cardano-sdk/util-rxjs": "~0.7.33",
+    "@cardano-sdk/wallet": "~0.44.4",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@shiroyasha9/axios-fetch-adapter": "1.0.3",
     "axios": "^1.7.4",
@@ -118,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.36",
-    "@cardano-sdk/projection": "~0.11.36",
-    "@cardano-sdk/projection-typeorm": "~0.8.38",
-    "@cardano-sdk/web-extension": "~0.34.2",
+    "@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",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -181,5 +182,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "49bb0a3264a7c04bf90d2415b919d8df2b439d9e"
+  "gitHead": "58513e2ae961e81bd0f168e3d65f29b15aa4ff87"
 }

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

@@ -161,11 +161,19 @@ export const options = {
     }
   },
   thresholds: {
+    http_req_failed: [
+      {
+        // Stop the test if more than 10% of requests fail to avoid using VUh for nothing
+        abortOnFail: true,
+        // Wait for 2 minutes to get more data. If the error rate is still high, the test will fail
+        delayAbortEval: '2m',
+        threshold: 'rate<0.1'
+      }
+    ],
     // All wallets should have syncd
     // Use https://k6.io/docs/using-k6/thresholds/ to set more thresholds. E.g.:
     // wallet_sync: ['p(95)<5000'], // 95% of wallets should sync in under 5 seconds
     wallet_sync: [{ delayAbortEval: '5s', threshold: 'p(95) < 30000' }],
-
     wallet_sync_count: [`count >= ${MAX_VU}`] // We get a nice graph if we enable thresholds. See this stat on a graph
   }
 };

package/test/projection/offline-fork.test.ts

@@ -2,8 +2,12 @@ import * as Postgres from '@cardano-sdk/projection-typeorm';
 import { BlockDataEntity, BlockEntity, StakeKeyEntity } from '@cardano-sdk/projection-typeorm';
 import {
   Bootstrap,
+  ChainSyncEvent,
+  ChainSyncEventType,
+  ChainSyncRollForward,
   InMemory,
   Mappers,
+  ObservableCardanoNode,
   ProjectionEvent,
   ProjectionOperator,
   StabilityWindowBuffer,
@@ -11,15 +15,7 @@ import {
   requestNext,
   withStaticContext
 } from '@cardano-sdk/projection';
-import {
-  Cardano,
-  ChainSyncEvent,
-  ChainSyncEventType,
-  ChainSyncRollForward,
-  ObservableCardanoNode,
-  Point,
-  TipOrOrigin
-} from '@cardano-sdk/core';
+import { Cardano, Point, TipOrOrigin } from '@cardano-sdk/core';
 import { ChainSyncDataSet, chainSyncData, logger } from '@cardano-sdk/util-dev';
 import { ConnectionConfig } from '@cardano-ogmios/client';
 import { Observable, filter, firstValueFrom, lastValueFrom, map, of, take, takeWhile, throwError, toArray } from 'rxjs';

package/test/projection/single-tenant-utxo.test.ts

@@ -1,6 +1,6 @@
 import * as Postgres from '@cardano-sdk/projection-typeorm';
-import { Bootstrap, Mappers, ProjectionEvent, requestNext } from '@cardano-sdk/projection';
-import { Cardano, ObservableCardanoNode } from '@cardano-sdk/core';
+import { Bootstrap, Mappers, ObservableCardanoNode, ProjectionEvent, requestNext } from '@cardano-sdk/projection';
+import { Cardano } from '@cardano-sdk/core';
 import { ConnectionConfig } from '@cardano-ogmios/client';
 import { DataSource, QueryRunner } from 'typeorm';
 import { Observable, filter, firstValueFrom, lastValueFrom, of, scan, takeWhile } from 'rxjs';

package/test/wallet_epoch_0/PersonalWallet/byron.test.ts

@@ -2,10 +2,8 @@
 import { BaseWallet } from '@cardano-sdk/wallet';
 import { Cardano } from '@cardano-sdk/core';
 import { createLogger } from '@cardano-sdk/util-dev';
-import { filter, firstValueFrom, map, take } from 'rxjs';
 import { getEnv, walletVariables } from '../../../src/environment';
-import { getWallet, normalizeTxBody, walletReady } from '../../../src';
-import { isNotNil } from '@cardano-sdk/util';
+import { getWallet, normalizeTxBody, submitAndConfirm, walletReady } from '../../../src';
 
 const env = getEnv(walletVariables);
 const logger = createLogger();
@@ -33,16 +31,7 @@ describe('PersonalWallet/byron', () => {
       .build();
 
     const { tx: signedTx } = await txBuilder.addOutput(txOutput).build().sign();
-    await wallet.submitTx(signedTx);
-
-    // Search chain history to see if the transaction is there.
-    const txFoundInHistory = await firstValueFrom(
-      wallet.transactions.history$.pipe(
-        map((txs) => txs.find((tx) => tx.id === signedTx.id)),
-        filter(isNotNil),
-        take(1)
-      )
-    );
+    const [, txFoundInHistory] = await submitAndConfirm(wallet, signedTx, 1);
 
     // Assert
     expect(txFoundInHistory).toBeDefined();

package/test/wallet_epoch_0/PersonalWallet/metadata.test.ts

@@ -1,8 +1,7 @@
 import { BaseWallet, createWalletUtil } from '@cardano-sdk/wallet';
 import { Cardano } from '@cardano-sdk/core';
-import { filter, firstValueFrom, map } from 'rxjs';
-import { getEnv, getWallet, walletReady, walletVariables } from '../../../src';
-import { isNotNil } from '@cardano-sdk/util';
+import { firstValueFrom } from 'rxjs';
+import { getEnv, getWallet, submitAndConfirm, walletReady, walletVariables } from '../../../src';
 import { logger } from '@cardano-sdk/util-dev';
 
 const env = getEnv(walletVariables);
@@ -35,15 +34,8 @@ describe('PersonalWallet/metadata', () => {
       .build()
       .sign();
 
-    const outgoingTx = signedTx;
-    await wallet.submitTx(signedTx);
+    const [, loadedTx] = await submitAndConfirm(wallet, signedTx, 1);
 
-    const loadedTx = await firstValueFrom(
-      wallet.transactions.history$.pipe(
-        map((txs) => txs.find((tx) => tx.id === outgoingTx.id)),
-        filter(isNotNil)
-      )
-    );
     expect(loadedTx.auxiliaryData?.blob).toEqual(metadata);
   });
 });

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

@@ -13,8 +13,7 @@ import {
   walletVariables
 } from '../../../src';
 import { createLogger } from '@cardano-sdk/util-dev';
-import { filter, firstValueFrom, map, take } from 'rxjs';
-import { isNotNil } from '@cardano-sdk/util';
+import { filter, firstValueFrom } from 'rxjs';
 
 const env = getEnv(walletVariables);
 const logger = createLogger();
@@ -99,16 +98,7 @@ describe('PersonalWallet/mint', () => {
     };
 
     const signedTx = await wallet.finalizeTx(finalizeProps);
-    await submitAndConfirm(wallet, signedTx);
-
-    // Search chain history to see if the transaction is there.
-    const txFoundInHistory = await firstValueFrom(
-      wallet.transactions.history$.pipe(
-        map((txs) => txs.find((tx) => tx.id === signedTx.id)),
-        filter(isNotNil),
-        take(1)
-      )
-    );
+    const [, txFoundInHistory] = await submitAndConfirm(wallet, signedTx, 1);
 
     expect(txFoundInHistory.id).toEqual(signedTx.id);
 

package/test/wallet_epoch_0/PersonalWallet/multiAddress.test.ts

@@ -9,12 +9,11 @@ import {
   firstValueFromTimed,
   getWallet,
   normalizeTxBody,
+  submitAndConfirm,
   walletReady
 } from '../../../src';
 import { createLogger } from '@cardano-sdk/util-dev';
-import { filter, map, take } from 'rxjs';
 import { getEnv, walletVariables } from '../../../src/environment';
-import { isNotNil } from '@cardano-sdk/util';
 
 const env = getEnv(walletVariables);
 const logger = createLogger();
@@ -77,16 +76,7 @@ describe('PersonalWallet/multiAddress', () => {
 
     const { tx: signedTx } = await txBuilder.build().sign();
 
-    await wallet.submitTx(signedTx);
-
-    // Search chain history to see if the transaction is there.
-    const txFoundInHistory = await firstValueFromTimed(
-      wallet.transactions.history$.pipe(
-        map((txs) => txs.find((tx) => tx.id === signedTx.id)),
-        filter(isNotNil),
-        take(1)
-      )
-    );
+    const [, txFoundInHistory] = await submitAndConfirm(wallet, signedTx, 1);
 
     expect(txFoundInHistory.id).toEqual(signedTx.id);
     expect(normalizeTxBody(txFoundInHistory.body)).toEqual(normalizeTxBody(signedTx.body));
@@ -143,16 +133,8 @@ describe('PersonalWallet/multiAddress', () => {
       )
       .build()
       .sign();
-    await newWallet.wallet.submitTx(returnAdaSignedTx);
-
-    // Search chain history to see if the transaction is there.
-    const returnAdaTxFoundInHistory = await firstValueFromTimed(
-      newWallet.wallet.transactions.history$.pipe(
-        map((txs) => txs.find((tx) => tx.id === returnAdaSignedTx.id)),
-        filter(isNotNil),
-        take(1)
-      )
-    );
+
+    const [, returnAdaTxFoundInHistory] = await submitAndConfirm(newWallet.wallet, returnAdaSignedTx, 1);
 
     expect(returnAdaTxFoundInHistory.id).toEqual(returnAdaSignedTx.id);
     expect(normalizeTxBody(returnAdaTxFoundInHistory.body)).toEqual(normalizeTxBody(returnAdaSignedTx.body));

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

@@ -4,7 +4,7 @@ import { HexBlob, isNotNil } from '@cardano-sdk/util';
 import { InitializeTxProps, computeScriptDataHash } from '@cardano-sdk/tx-construction';
 import { createLogger } from '@cardano-sdk/util-dev';
 import { filter, firstValueFrom, map, take } from 'rxjs';
-import { firstValueFromTimed, getEnv, getWallet, walletReady, walletVariables } from '../../../src';
+import { firstValueFromTimed, getEnv, getWallet, submitAndConfirm, walletReady, walletVariables } from '../../../src';
 
 const env = getEnv(walletVariables);
 const logger = createLogger();
@@ -37,16 +37,7 @@ const createCollateral = async (
   const txOutput = await txBuilder.buildOutput().address(address).coin(5_000_000n).build();
 
   const { tx: signedTx } = await txBuilder.addOutput(txOutput).build().sign();
-  await wallet.submitTx(signedTx);
-
-  // Wait for transaction to be on chain.
-  await firstValueFrom(
-    wallet.transactions.history$.pipe(
-      map((txs) => txs.find((tx) => tx.id === signedTx.id)),
-      filter(isNotNil),
-      take(1)
-    )
-  );
+  await submitAndConfirm(wallet, signedTx, 1);
 
   // Find the collateral UTxO in the UTxO set.
   const utxo = await firstValueFrom(
@@ -151,17 +142,8 @@ describe('PersonalWallet/phase2validation', () => {
 
     const signedTx = await wallet.finalizeTx(finalizeProps);
 
-    const [, failedTx, txFoundInHistory] = await Promise.all([
-      wallet.submitTx(signedTx),
-      firstValueFromTimed(wallet.transactions.outgoing.failed$),
-      firstValueFromTimed(
-        wallet.transactions.history$.pipe(
-          map((txs) => txs.find((tx) => tx.id === signedTx.id)),
-          filter(isNotNil),
-          take(1)
-        )
-      )
-    ]);
+    const [, txFoundInHistory] = await submitAndConfirm(wallet, signedTx, 1);
+    const failedTx = await firstValueFromTimed(wallet.transactions.outgoing.failed$);
 
     // Transaction should be part of the history
     expect(txFoundInHistory).toBeTruthy();

package/test/wallet_epoch_0/PersonalWallet/plutusTest.test.ts

@@ -1,9 +1,9 @@
 import { BaseWallet } from '@cardano-sdk/wallet';
 import { Cardano, Serialization, UtxoProvider } from '@cardano-sdk/core';
-import { HexBlob, isNotNil } from '@cardano-sdk/util';
-import { Observable, filter, firstValueFrom, interval, map, switchMap, take } from 'rxjs';
+import { HexBlob } from '@cardano-sdk/util';
+import { Observable, filter, firstValueFrom, interval, switchMap } from 'rxjs';
 import { createLogger } from '@cardano-sdk/util-dev';
-import { getEnv, getWallet, utxoProviderFactory, walletReady, walletVariables } from '../../../src';
+import { getEnv, getWallet, submitAndConfirm, utxoProviderFactory, walletReady, walletVariables } from '../../../src';
 
 const env = getEnv(walletVariables);
 const logger = createLogger();
@@ -85,7 +85,7 @@ const fundScript = async (wallet: BaseWallet, receivingAddress: Cardano.PaymentA
   const txBuilder = wallet.createTxBuilder();
   const txOutput = await txBuilder.buildOutput().address(receivingAddress).coin(tAdaToSend).datum(datum).build();
   const signedTx = (await txBuilder.addOutput(txOutput).build().sign()).tx;
-  await wallet.submitTx(signedTx);
+  const [, txFoundInHistory] = await submitAndConfirm(wallet, signedTx, 1);
 
   logger.info(
     `Submitted transaction id: ${signedTx.id}, inputs: ${JSON.stringify(
@@ -95,14 +95,6 @@ const fundScript = async (wallet: BaseWallet, receivingAddress: Cardano.PaymentA
     )}.`
   );
 
-  const txFoundInHistory = await firstValueFrom(
-    wallet.transactions.history$.pipe(
-      map((txs) => txs.find((tx) => tx.id === signedTx.id)),
-      filter(isNotNil),
-      take(1)
-    )
-  );
-
   logger.info(`Found transaction id in chain history: ${txFoundInHistory.id}`);
 
   // Assert
@@ -135,7 +127,7 @@ const createScriptRefInput = async (wallet: BaseWallet, script: Cardano.Script):
     .build();
 
   const signedTx = (await txBuilder.addOutput(txOutput).build().sign()).tx;
-  await wallet.submitTx(signedTx);
+  const [, txFoundInHistory] = await submitAndConfirm(wallet, signedTx, 1);
 
   logger.info(
     `Submitted transaction id: ${signedTx.id}, inputs: ${JSON.stringify(
@@ -145,14 +137,6 @@ const createScriptRefInput = async (wallet: BaseWallet, script: Cardano.Script):
     )}.`
   );
 
-  const txFoundInHistory = await firstValueFrom(
-    wallet.transactions.history$.pipe(
-      map((txs) => txs.find((tx) => tx.id === signedTx.id)),
-      filter(isNotNil),
-      take(1)
-    )
-  );
-
   logger.info(`Found transaction id in chain history: ${txFoundInHistory.id}`);
 
   // Assert
@@ -243,7 +227,7 @@ describe.skip('PersonalWallet/plutus', () => {
         .sign()
     ).tx;
 
-    await wallet.submitTx(signedTx);
+    const [, txFoundInHistory] = await submitAndConfirm(wallet, signedTx, 1);
 
     logger.info(
       `Submitted transaction id: ${signedTx.id}, inputs: ${JSON.stringify(
@@ -253,14 +237,6 @@ describe.skip('PersonalWallet/plutus', () => {
       )}.`
     );
 
-    const txFoundInHistory = await firstValueFrom(
-      wallet.transactions.history$.pipe(
-        map((txs) => txs.find((tx) => tx.id === signedTx.id)),
-        filter(isNotNil),
-        take(1)
-      )
-    );
-
     logger.info(`Found transaction id in chain history: ${txFoundInHistory.id}`);
 
     // Assert
@@ -327,7 +303,7 @@ describe.skip('PersonalWallet/plutus', () => {
         .sign()
     ).tx;
 
-    await wallet.submitTx(signedTx);
+    const [, txFoundInHistory] = await submitAndConfirm(wallet, signedTx, 1);
 
     logger.info(
       `Submitted transaction id: ${signedTx.id}, inputs: ${JSON.stringify(
@@ -337,14 +313,6 @@ describe.skip('PersonalWallet/plutus', () => {
       )}.`
     );
 
-    const txFoundInHistory = await firstValueFrom(
-      wallet.transactions.history$.pipe(
-        map((txs) => txs.find((tx) => tx.id === signedTx.id)),
-        filter(isNotNil),
-        take(1)
-      )
-    );
-
     logger.info(`Found transaction id in chain history: ${txFoundInHistory.id}`);
 
     // Assert

package/test/wallet_epoch_0/PersonalWallet/txChainHistory.test.ts

@@ -1,7 +1,7 @@
 import { BaseWallet } from '@cardano-sdk/wallet';
 import { Cardano, CardanoNodeUtil } from '@cardano-sdk/core';
 import { filter, firstValueFrom, map, take } from 'rxjs';
-import { getEnv, getWallet, normalizeTxBody, walletReady, walletVariables } from '../../../src';
+import { getEnv, getWallet, normalizeTxBody, submitAndConfirm, walletReady, walletVariables } from '../../../src';
 import { isNotNil } from '@cardano-sdk/util';
 import { logger } from '@cardano-sdk/util-dev';
 
@@ -28,7 +28,7 @@ describe('PersonalWallet/txChainHistory', () => {
     const txBuilder = wallet.createTxBuilder();
     const txOutput = await txBuilder.buildOutput().address(receivingAddress).coin(tAdaToSend).build();
     signedTx = (await txBuilder.addOutput(txOutput).build().sign()).tx;
-    await wallet.submitTx(signedTx);
+    await submitAndConfirm(wallet, signedTx, 1);
 
     logger.info(
       `Submitted transaction id: ${signedTx.id}, inputs: ${JSON.stringify(

package/test/wallet_epoch_0/PersonalWallet/unspendableUtxos.test.ts

@@ -2,7 +2,7 @@
 import { BaseWallet, utxoEquals } from '@cardano-sdk/wallet';
 import { createLogger } from '@cardano-sdk/util-dev';
 import { filter, firstValueFrom, map, take } from 'rxjs';
-import { firstValueFromTimed, getEnv, getWallet, walletReady, walletVariables } from '../../../src';
+import { firstValueFromTimed, getEnv, getWallet, submitAndConfirm, walletReady, walletVariables } from '../../../src';
 import { isNotNil } from '@cardano-sdk/util';
 
 const env = getEnv(walletVariables);
@@ -37,17 +37,7 @@ describe('PersonalWallet/unspendableUtxos', () => {
     const txOutput = await txBuilder1.buildOutput().address(address).coin(5_000_000n).build();
 
     const { tx: signedTx } = await txBuilder1.addOutput(txOutput).build().sign();
-    await wallet1.submitTx(signedTx);
-
-    // Search chain history to see if the transaction is there.
-    let txFoundInHistory = await firstValueFromTimed(
-      wallet1.transactions.history$.pipe(
-        map((txs) => txs.find((tx) => tx.id === signedTx.id)),
-        filter(isNotNil),
-        take(1)
-      ),
-      `Failed to find transaction ${signedTx.id} in src wallet history`
-    );
+    let [, txFoundInHistory] = await submitAndConfirm(wallet1, signedTx, 1);
 
     // Find the UTxO in the UTxO set.
     const utxo = await firstValueFromTimed(
@@ -97,17 +87,7 @@ describe('PersonalWallet/unspendableUtxos', () => {
       .addOutput(await txBuilder2.buildOutput().address(address).value(totalBalance).build())
       .build()
       .sign();
-    await wallet2.submitTx(signedMoveAdaTx);
-
-    // Search chain history to see if the transaction is there.
-    txFoundInHistory = await firstValueFromTimed(
-      wallet1.transactions.history$.pipe(
-        map((txs) => txs.find((tx) => tx.id === signedMoveAdaTx.id)),
-        filter(isNotNil),
-        take(1)
-      ),
-      `Failed to find second transaction ${signedMoveAdaTx.id} in dest wallet history`
-    );
+    [, txFoundInHistory] = await submitAndConfirm(wallet2, signedMoveAdaTx, 1);
 
     expect(txFoundInHistory.id).toEqual(signedMoveAdaTx.id);
 

package/test/wallet_epoch_0/SharedWallet/simpleTx.test.ts

@@ -6,6 +6,7 @@ import {
   getEnv,
   getWallet,
   normalizeTxBody,
+  submitAndConfirm,
   waitForWalletStateSettle,
   walletReady,
   walletVariables
@@ -52,7 +53,7 @@ describe('SharedWallet/simpleTx', () => {
     const txBuilder = faucetWallet.createTxBuilder();
     const txOutput = await txBuilder.buildOutput().address(receivingAddress).coin(initialFunds).build();
     fundingTx = (await txBuilder.addOutput(txOutput).build().sign()).tx;
-    await faucetWallet.submitTx(fundingTx);
+    await submitAndConfirm(faucetWallet, fundingTx, 1);
 
     logger.info(
       `Submitted transaction id: ${fundingTx.id}, inputs: ${JSON.stringify(