@cardano-sdk/e2e 0.36.0 → 0.36.2

package/local-network/templates/babbage/node-config.json

@@ -2,9 +2,11 @@
   "ByronGenesisFile": "genesis/byron.json",
   "ShelleyGenesisFile": "genesis/shelley.json",
   "AlonzoGenesisFile": "genesis/alonzo.json",
+  "ConwayGenesisFile": "genesis/conway.json",
   "ByronGenesisHash": "a300c7ae1b124f53a80d86c6e43ff28c8d0369d7aa5512d5a3328a668b0e15e8",
   "ShelleyGenesisHash": "6baf33f913dffe311033bd7a7199060cb421234bf12cb99ef448bfd4fe47e305",
   "AlonzoGenesisHash": "eaa32942a4f2b3028928cb47be679bb36fa128f6d7dddc04ae592d27f2818c16",
+  "ConwayGenesisHash": "eaa32942a4f2b3028928cb47be679bb36fa128f6d7dddc04ae592d27f2818c16",
   "MaxConcurrencyBulkSync": 1,
   "MaxConcurrencyDeadline": 2,
   "Protocol": "Cardano",
@@ -18,12 +20,8 @@
   "TurnOnLogMetrics": true,
   "minSeverity": "Info",
   "TracingVerbosity": "MinimalVerbosity",
-  "setupBackends": [
-    "KatipBK"
-  ],
-  "defaultBackends": [
-    "KatipBK"
-  ],
+  "setupBackends": ["KatipBK"],
+  "defaultBackends": ["KatipBK"],
   "setupScribes": [
     {
       "scKind": "FileSK",
@@ -37,14 +35,8 @@
     }
   ],
   "defaultScribes": [
-    [
-      "FileSK",
-      "logs/testnet.log"
-    ],
-    [
-      "StdoutSK",
-      "stdout"
-    ]
+    ["FileSK", "logs/testnet.log"],
+    ["StdoutSK", "stdout"]
   ],
   "rotation": {
     "rpLogLimitBytes": 5000000,
@@ -89,14 +81,10 @@
   "TraceTxSubmissionProtocol": false,
   "options": {
     "mapBackends": {
-      "cardano.node.metrics": [
-        "EKGViewBK"
-      ]
+      "cardano.node.metrics": ["EKGViewBK"]
     },
     "mapScribes": {
-      "cardano.node.metrics": [
-        "FileSK::logs/testnet.log"
-      ]
+      "cardano.node.metrics": ["FileSK::logs/testnet.log"]
     },
     "mapSeverity": {
       "cardano.node.ChainDB": "Notice",
@@ -109,5 +97,7 @@
   "TestMaryHardForkAtEpoch": 0,
   "TestAlonzoHardForkAtEpoch": 0,
   "TestBabbageHardForkAtEpoch": 0,
-  "TestEnableDevelopmentNetworkProtocols": true
-}
+  "TestConwayHardForkAtEpoch": 0,
+  "ExperimentalHardForksEnabled": true,
+  "ExperimentalProtocolsEnabled": true
+}

package/local-network/templates/babbage/submit-api-config.json

@@ -2,9 +2,11 @@
   "ByronGenesisFile": "genesis/byron.json",
   "ShelleyGenesisFile": "genesis/shelley.json",
   "AlonzoGenesisFile": "genesis/alonzo.json",
+  "ConwayGenesisFile": "genesis/alonzo.json",
   "ByronGenesisHash": "a300c7ae1b124f53a80d86c6e43ff28c8d0369d7aa5512d5a3328a668b0e15e8",
   "ShelleyGenesisHash": "6baf33f913dffe311033bd7a7199060cb421234bf12cb99ef448bfd4fe47e305",
   "AlonzoGenesisHash": "eaa32942a4f2b3028928cb47be679bb36fa128f6d7dddc04ae592d27f2818c16",
+  "ConwayGenesisHash": "eaa32942a4f2b3028928cb47be679bb36fa128f6d7dddc04ae592d27f2818c16",
   "MaxConcurrencyBulkSync": 1,
   "MaxConcurrencyDeadline": 2,
   "Protocol": "Cardano",
@@ -18,12 +20,8 @@
   "TurnOnLogMetrics": true,
   "minSeverity": "Info",
   "TracingVerbosity": "MinimalVerbosity",
-  "setupBackends": [
-    "KatipBK"
-  ],
-  "defaultBackends": [
-    "KatipBK"
-  ],
+  "setupBackends": ["KatipBK"],
+  "defaultBackends": ["KatipBK"],
   "setupScribes": [
     {
       "scKind": "FileSK",
@@ -37,14 +35,8 @@
     }
   ],
   "defaultScribes": [
-    [
-      "FileSK",
-      "logs/testnet.log"
-    ],
-    [
-      "StdoutSK",
-      "stdout"
-    ]
+    ["FileSK", "logs/testnet.log"],
+    ["StdoutSK", "stdout"]
   ],
   "rotation": {
     "rpLogLimitBytes": 5000000,
@@ -89,14 +81,10 @@
   "TraceTxSubmissionProtocol": false,
   "options": {
     "mapBackends": {
-      "cardano.node.metrics": [
-        "EKGViewBK"
-      ]
+      "cardano.node.metrics": ["EKGViewBK"]
     },
     "mapScribes": {
-      "cardano.node.metrics": [
-        "FileSK::logs/testnet.log"
-      ]
+      "cardano.node.metrics": ["FileSK::logs/testnet.log"]
     },
     "mapSeverity": {
       "cardano.node.ChainDB": "Notice",
@@ -109,7 +97,7 @@
   "TestMaryHardForkAtEpoch": 0,
   "TestAlonzoHardForkAtEpoch": 0,
   "TestBabbageHardForkAtEpoch": 0,
-  "TestEnableDevelopmentNetworkProtocols": true,
+  "ExperimentalProtocolsEnabled": true,
   "EnableLogMetrics": false,
   "EnableLogging": true
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.36.0",
+  "version": "0.36.2",
   "description": "End to end tests for the cardano-js-sdk packages.",
   "engines": {
     "node": ">=16.20.2"
@@ -46,7 +46,7 @@
     "test:web-extension:watch:run": "yarn test:web-extension:run --watch",
     "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",
-    "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": "PRE_CONWAY=${PRE_CONWAY:-stable} 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:up": "FILES='' yarn local-network:common",
     "local-network:dev": "FILES='-f ../../compose/dev.yml' yarn local-network:common",
     "local-network:profile:up": "FILES='-f ../../compose/pg-agent.yml' yarn local-network:common",
@@ -55,10 +55,8 @@
     "cardano-services:up": "ts-node --transpile-only ../cardano-services/src/cli.ts start-provider-server",
     "cardano-services:up:debug": "npx nodemon --legacy-watch --exec 'node -r ts-node/register --inspect=0.0.0.0:9229 ../cardano-services/src/cli.ts start-provider-server'",
     "circular-deps:check": "madge --circular dist/cjs",
-    "build:esm": "tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020",
-    "build:cjs": "tsc --build src",
-    "build": "run-s build:cjs build:esm module-fixup",
-    "module-fixup": "cp ../../build/cjs-package.json ./dist/cjs/package.json && cp ../../build/esm-package.json ./dist/esm/package.json",
+    "build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ../../build/esm-package.json ./dist/esm/package.json",
+    "build:cjs": "tsc --build src && cp ../../build/cjs-package.json ./dist/cjs/package.json",
     "tscNoEmit": "echo typescript --noEmit command not implemented yet",
     "cleanup:dist": "rm -rf dist",
     "cleanup:nm": "rm -rf node_modules",
@@ -82,21 +80,21 @@
   },
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.2",
-    "@cardano-ogmios/client": "5.6.0",
-    "@cardano-sdk/cardano-services": "~0.28.5",
-    "@cardano-sdk/cardano-services-client": "~0.19.5",
-    "@cardano-sdk/core": "~0.33.0",
-    "@cardano-sdk/crypto": "~0.1.23",
-    "@cardano-sdk/hardware-ledger": "~0.9.6",
-    "@cardano-sdk/hardware-trezor": "~0.4.26",
-    "@cardano-sdk/input-selection": "~0.13.0",
-    "@cardano-sdk/key-management": "~0.20.6",
-    "@cardano-sdk/ogmios": "~0.15.26",
-    "@cardano-sdk/tx-construction": "~0.19.0",
-    "@cardano-sdk/util": "~0.15.1",
-    "@cardano-sdk/util-dev": "~0.21.0",
-    "@cardano-sdk/util-rxjs": "~0.7.15",
-    "@cardano-sdk/wallet": "~0.38.0",
+    "@cardano-ogmios/client": "6.3.0",
+    "@cardano-sdk/cardano-services": "~0.28.7",
+    "@cardano-sdk/cardano-services-client": "~0.19.7",
+    "@cardano-sdk/core": "~0.33.1",
+    "@cardano-sdk/crypto": "~0.1.24",
+    "@cardano-sdk/hardware-ledger": "~0.9.8",
+    "@cardano-sdk/hardware-trezor": "~0.4.28",
+    "@cardano-sdk/input-selection": "~0.13.2",
+    "@cardano-sdk/key-management": "~0.20.7",
+    "@cardano-sdk/ogmios": "~0.15.28",
+    "@cardano-sdk/tx-construction": "~0.19.2",
+    "@cardano-sdk/util": "~0.15.2",
+    "@cardano-sdk/util-dev": "~0.21.2",
+    "@cardano-sdk/util-rxjs": "~0.7.17",
+    "@cardano-sdk/wallet": "~0.38.2",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@vespaiach/axios-fetch-adapter": "^0.3.0",
     "axios": "^0.28.0",
@@ -126,10 +124,10 @@
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
-    "@cardano-sdk/dapp-connector": "~0.12.19",
-    "@cardano-sdk/projection": "~0.11.16",
-    "@cardano-sdk/projection-typeorm": "~0.8.18",
-    "@cardano-sdk/web-extension": "~0.29.0",
+    "@cardano-sdk/dapp-connector": "~0.12.20",
+    "@cardano-sdk/projection": "~0.11.18",
+    "@cardano-sdk/projection-typeorm": "~0.8.20",
+    "@cardano-sdk/web-extension": "~0.29.2",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -171,6 +169,7 @@
     "readable-stream": "^3.6.0",
     "source-map-loader": "^4.0.1",
     "ts-jest": "^28.0.7",
+    "tsc-alias": "^1.8.10",
     "typeorm": "^0.3.15",
     "typeorm-extension": "^2.7.0",
     "typescript": "^4.7.4",
@@ -182,5 +181,5 @@
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "4f0181a05a47cc61c98f0f8fba8bb6c4fd7979cb"
+  "gitHead": "c35908660839376c49058f2b4c96e2b394fafdea"
 }

package/src/factories.ts

@@ -36,7 +36,8 @@ import {
 } from '@cardano-sdk/key-management';
 import { LedgerKeyAgent } from '@cardano-sdk/hardware-ledger';
 import { Logger } from 'ts-log';
-import { OgmiosTxSubmitProvider } from '@cardano-sdk/ogmios';
+import { NodeTxSubmitProvider } from '@cardano-sdk/cardano-services';
+import { OgmiosObservableCardanoNode } from '@cardano-sdk/ogmios';
 import { TrezorKeyAgent } from '@cardano-sdk/hardware-trezor';
 import {
   assetInfoHttpProvider,
@@ -48,11 +49,10 @@ import {
   txSubmitHttpProvider,
   utxoHttpProvider
 } from '@cardano-sdk/cardano-services-client';
-import { createConnectionObject } from '@cardano-ogmios/client';
 import { createStubStakePoolProvider } from '@cardano-sdk/util-dev';
-import { filter, firstValueFrom } from 'rxjs';
+import { filter, firstValueFrom, of } from 'rxjs';
 import DeviceConnection from '@cardano-foundation/ledgerjs-hw-app-cardano';
-import memoize from 'lodash/memoize';
+import memoize from 'lodash/memoize.js';
 
 const isNodeJs = typeof process !== 'undefined' && process.release?.name === 'node';
 // tsc doesn't like the 'import' of this package, works with webpack
@@ -137,7 +137,7 @@ rewardsProviderFactory.register(HTTP_PROVIDER, async (params: any, logger: Logge
 });
 
 txSubmitProviderFactory.register(OGMIOS_PROVIDER, async (params: any, logger: Logger): Promise<TxSubmitProvider> => {
-  if (params.baseUrl === undefined) throw new Error(`${OgmiosTxSubmitProvider.name}: ${MISSING_URL_PARAM}`);
+  if (params.baseUrl === undefined) throw new Error(`${NodeTxSubmitProvider.name}: ${MISSING_URL_PARAM}`);
 
   const connectionConfig = {
     host: params.baseUrl.hostname,
@@ -146,7 +146,17 @@ txSubmitProviderFactory.register(OGMIOS_PROVIDER, async (params: any, logger: Lo
   };
 
   return new Promise<TxSubmitProvider>(async (resolve) => {
-    resolve(new OgmiosTxSubmitProvider(createConnectionObject(connectionConfig), { logger }));
+    resolve(
+      new NodeTxSubmitProvider({
+        cardanoNode: new OgmiosObservableCardanoNode(
+          {
+            connectionConfig$: of(connectionConfig)
+          },
+          { logger }
+        ),
+        logger
+      })
+    );
   });
 });
 

package/src/util/createMockKeyAgent.ts

@@ -1,6 +1,6 @@
 import { Bip32PublicKeyHex, SodiumBip32Ed25519 } from '@cardano-sdk/crypto';
 import { Cardano } from '@cardano-sdk/core';
-import { GroupedAddress, KeyAgent, KeyAgentType } from '@cardano-sdk/key-management';
+import { GroupedAddress, KeyAgent, KeyAgentType, KeyPurpose } from '@cardano-sdk/key-management';
 
 const accountIndex = 0;
 const chainId = Cardano.ChainIds.Preview;
@@ -18,12 +18,14 @@ export const createMockKeyAgent = (deriveAddressesReturn: GroupedAddress[] = [])
     derivePublicKey: jest.fn(),
     exportRootPrivateKey: jest.fn(),
     extendedAccountPublicKey,
+    purpose: KeyPurpose.STANDARD,
     serializableData: {
       __typename: KeyAgentType.InMemory,
       accountIndex,
       chainId,
       encryptedRootPrivateKeyBytes: [],
-      extendedAccountPublicKey
+      extendedAccountPublicKey,
+      purpose: KeyPurpose.STANDARD
     },
     signBlob: jest.fn(),
     signTransaction: jest.fn()

package/src/util/util.ts

@@ -18,12 +18,12 @@ import {
   timeout
 } from 'rxjs';
 import { FAST_OPERATION_TIMEOUT_DEFAULT, SYNC_TIMEOUT_DEFAULT } from '../defaults';
-import { InMemoryKeyAgent, TransactionSigner } from '@cardano-sdk/key-management';
+import { InMemoryKeyAgent, KeyPurpose, TransactionSigner } from '@cardano-sdk/key-management';
 import { InitializeTxProps } from '@cardano-sdk/tx-construction';
 import { TestWallet, networkInfoProviderFactory } from '../factories';
 import { getEnv, walletVariables } from '../environment';
 import { logger } from '@cardano-sdk/util-dev';
-import sortBy from 'lodash/sortBy';
+import sortBy from 'lodash/sortBy.js';
 
 const env = getEnv(walletVariables);
 
@@ -228,17 +228,20 @@ export const submitCertificate = async (certificate: Cardano.Certificate, wallet
  * @param mnemonics The random set of mnemonics.
  * @param genesis Network genesis parameters
  * @param bip32Ed25519 The Ed25519 cryptography implementation.
+ * @param purpose The key purpose.
  */
 export const createStandaloneKeyAgent = async (
   mnemonics: string[],
   genesis: Cardano.CompactGenesis,
-  bip32Ed25519: Crypto.Bip32Ed25519
+  bip32Ed25519: Crypto.Bip32Ed25519,
+  purpose?: KeyPurpose
 ) =>
   await InMemoryKeyAgent.fromBip39MnemonicWords(
     {
       chainId: genesis,
       getPassphrase: async () => Buffer.from(''),
-      mnemonicWords: mnemonics
+      mnemonicWords: mnemonics,
+      purpose
     },
     { bip32Ed25519, logger }
   );

package/test/local-network/register-pool.test.ts

@@ -75,13 +75,13 @@ describe('local-network/register-pool', () => {
     wallet2.wallet.shutdown();
   });
 
-  beforeEach(() => unDelegateWallet(wallet1.wallet));
-
   test('does not meet pledge', async () => {
     const wallet = wallet1.wallet;
 
     await walletReady(wallet);
 
+    await unDelegateWallet(wallet);
+
     const poolPubKey = await wallet1.bip32Account.derivePublicKey({
       index: 0,
       role: KeyRole.External
@@ -167,6 +167,7 @@ describe('local-network/register-pool', () => {
     const wallet = wallet2.wallet;
 
     await walletReady(wallet);
+    await unDelegateWallet(wallet);
 
     const poolPubKey = await wallet2.bip32Account.derivePublicKey({
       index: 0,

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

@@ -22,7 +22,7 @@ import {
 } 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, toArray } from 'rxjs';
+import { Observable, filter, firstValueFrom, lastValueFrom, map, of, take, takeWhile, throwError, toArray } from 'rxjs';
 import { OgmiosObservableCardanoNode } from '@cardano-sdk/ogmios';
 import { ReconnectionConfig } from '@cardano-sdk/util-rxjs';
 import { createDatabase } from 'typeorm-extension';
@@ -62,6 +62,7 @@ const createForkProjectionSource = (
   // Same network info
   eraSummaries$: forkFromNode.eraSummaries$,
   genesisParameters$: forkFromNode.genesisParameters$,
+  submitTx: () => throwError(() => new Error('Not implemented')),
   // Stub chain sync that forks from provided tip
   // eslint-disable-next-line sort-keys-fix/sort-keys-fix
   findIntersect: (points) => {