@cardano-sdk/e2e 0.26.0 → 0.26.1

package/docker-compose.yml

@@ -39,12 +39,19 @@ services:
       test: ['CMD-SHELL', 'wget -O /dev/null http://localhost || exit 1']
       timeout: 10s
 
-  cardano-node-ogmios:
-    entrypoint: ['/tini', '-g', '--', '/scripts/cardano-node-ogmios.sh']
-    image: cardanosolutions/cardano-node-ogmios:v${OGMIOS_VERSION:-5.6.0}_${CARDANO_NODE_VERSION:-1.35.5}
+  cardano-node:
     depends_on:
       local-testnet:
         condition: service_healthy
+    volumes:
+      - ./local-network/config/network/cardano-node:/config
+      - ./local-network/config/network/genesis:/genesis
+
+  ogmios:
+    depends_on:
+      local-testnet:
+        condition: service_healthy
+    entrypoint: ['bin/sh', '/scripts/ogmios-start.sh']
     volumes:
       - ./local-network/config/network:/config
       - ./local-network/scripts:/scripts

package/local-network/scripts/{cardano-node-ogmios.sh → ogmios-start.sh}

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# Simple scripts which overrides the original cardano-node-ogmios.sh file from the
-# cardano-node-ogmios docker image.
+# Simple script which overrides will run instead of the `/bin/ogmios` binary in the original
+# ogmios docker image. It delays starting ogmios based on a sentinel file.
 
 # Used to support the e2e test to check the projector is able to
 # connect / reconnect to the ogmios server.
@@ -9,5 +9,5 @@
 # If the test set the file, wait for its removal before starting the container
 while [ -f /sdk-ipc/prevent_ogmios ]; do sleep 10; done
 
-# Start the cardano-node-ogmios as normal
-/root/cardano-node-ogmios.sh
+# Start the ogmios as normal
+/bin/ogmios "$@"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "description": "End to end tests for the cardano-js-sdk packages.",
   "engines": {
     "node": ">=16.20.2"
@@ -80,20 +80,20 @@
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^6.0.0",
     "@cardano-ogmios/client": "5.6.0",
-    "@cardano-sdk/cardano-services": "~0.23.0",
-    "@cardano-sdk/cardano-services-client": "~0.15.0",
-    "@cardano-sdk/core": "~0.22.0",
-    "@cardano-sdk/crypto": "~0.1.16",
-    "@cardano-sdk/hardware-ledger": "~0.7.0",
-    "@cardano-sdk/hardware-trezor": "~0.3.0",
-    "@cardano-sdk/input-selection": "~0.12.5",
-    "@cardano-sdk/key-management": "~0.15.0",
-    "@cardano-sdk/ogmios": "~0.15.0",
-    "@cardano-sdk/tx-construction": "~0.15.0",
-    "@cardano-sdk/util": "~0.14.3",
-    "@cardano-sdk/util-dev": "~0.18.0",
-    "@cardano-sdk/util-rxjs": "~0.6.1",
-    "@cardano-sdk/wallet": "~0.26.0",
+    "@cardano-sdk/cardano-services": "~0.23.1",
+    "@cardano-sdk/cardano-services-client": "~0.15.1",
+    "@cardano-sdk/core": "~0.22.1",
+    "@cardano-sdk/crypto": "~0.1.17",
+    "@cardano-sdk/hardware-ledger": "~0.7.1",
+    "@cardano-sdk/hardware-trezor": "~0.3.1",
+    "@cardano-sdk/input-selection": "~0.12.6",
+    "@cardano-sdk/key-management": "~0.15.1",
+    "@cardano-sdk/ogmios": "~0.15.1",
+    "@cardano-sdk/tx-construction": "~0.15.1",
+    "@cardano-sdk/util": "~0.14.4",
+    "@cardano-sdk/util-dev": "~0.18.1",
+    "@cardano-sdk/util-rxjs": "~0.6.2",
+    "@cardano-sdk/wallet": "~0.26.1",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@vespaiach/axios-fetch-adapter": "^0.3.0",
     "axios": "^0.27.2",
@@ -123,10 +123,10 @@
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
-    "@cardano-sdk/dapp-connector": "~0.11.2",
-    "@cardano-sdk/projection": "~0.10.0",
-    "@cardano-sdk/projection-typeorm": "~0.7.0",
-    "@cardano-sdk/web-extension": "~0.16.4",
+    "@cardano-sdk/dapp-connector": "~0.11.3",
+    "@cardano-sdk/projection": "~0.10.1",
+    "@cardano-sdk/projection-typeorm": "~0.7.1",
+    "@cardano-sdk/web-extension": "~0.16.5",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -178,5 +178,5 @@
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "02a0eff7b7b7a3b98b42fd19b2ae85cfc4e7d87f"
+  "gitHead": "8a6db2a251cd1c956f52730a0d35de2b7fc67404"
 }

package/test/long-running/projector-ogmios-connection.test.ts

@@ -10,7 +10,7 @@ const preventOgmiosStartFile = path.join(__dirname, '..', '..', 'local-network',
 
 const docker = new Dockerode();
 
-const ogmiosContainer = docker.getContainer('local-network-e2e-cardano-node-ogmios-1');
+const ogmiosContainer = docker.getContainer('local-network-e2e-ogmios-1');
 const stakePoolProjectorContainer = docker.getContainer('local-network-e2e-stake-pool-projector-1');
 
 const createPrevent = async () => {

package/test/wallet/PersonalWallet/txChainHistory.test.ts

@@ -1,3 +1,4 @@
+import { Cardano, CardanoNodeUtil, ProviderError } from '@cardano-sdk/core';
 import { PersonalWallet } from '@cardano-sdk/wallet';
 import { filter, firstValueFrom, map, take } from 'rxjs';
 import { getEnv, getWallet, normalizeTxBody, walletReady, walletVariables } from '../../../src';
@@ -8,16 +9,10 @@ const env = getEnv(walletVariables);
 
 describe('PersonalWallet/txChainHistory', () => {
   let wallet: PersonalWallet;
+  let signedTx: Cardano.Tx<Cardano.TxBody>;
 
   beforeEach(async () => {
     ({ wallet } = await getWallet({ env, logger, name: 'Sending Wallet', polling: { interval: 50 } }));
-  });
-
-  afterEach(() => {
-    wallet.shutdown();
-  });
-
-  it('submit a transaction and find it in chain history', async () => {
     const tAdaToSend = 10_000_000n;
     // Make sure the wallet has sufficient funds to run this test
     await walletReady(wallet, tAdaToSend);
@@ -32,7 +27,7 @@ describe('PersonalWallet/txChainHistory', () => {
     // Send 10 tADA to the same wallet.
     const txBuilder = wallet.createTxBuilder();
     const txOutput = await txBuilder.buildOutput().address(receivingAddress).coin(tAdaToSend).build();
-    const { tx: signedTx } = await txBuilder.addOutput(txOutput).build().sign();
+    signedTx = (await txBuilder.addOutput(txOutput).build().sign()).tx;
     await wallet.submitTx(signedTx);
 
     logger.info(
@@ -42,7 +37,13 @@ describe('PersonalWallet/txChainHistory', () => {
         signedTx.body.outputs.map((txOut) => [txOut.address, Number.parseInt(txOut.value.coins.toString())])
       )}.`
     );
+  });
+
+  afterEach(() => {
+    wallet.shutdown();
+  });
 
+  it('submit a transaction and find it in chain history', async () => {
     // Search chain history to see if the transaction is there.
     const txFoundInHistory = await firstValueFrom(
       wallet.transactions.history$.pipe(
@@ -59,4 +60,25 @@ describe('PersonalWallet/txChainHistory', () => {
     expect(txFoundInHistory.id).toEqual(signedTx.id);
     expect(normalizeTxBody(txFoundInHistory.body)).toEqual(normalizeTxBody(signedTx.body));
   });
+
+  it('can detect a ValueNotConserved error', async () => {
+    expect.assertions(1);
+    // Search chain history to see if the transaction is there.
+    await firstValueFrom(
+      wallet.transactions.history$.pipe(
+        map((txs) => txs.find((tx) => tx.id === signedTx.id)),
+        filter(isNotNil),
+        take(1)
+      )
+    );
+
+    try {
+      // Submit the same transaction again.
+      await wallet.submitTx(signedTx);
+    } catch (error) {
+      if (error instanceof ProviderError) {
+        expect(CardanoNodeUtil.isValueNotConservedError(error?.innerError)).toBeTruthy();
+      }
+    }
+  });
 });