@cardano-sdk/e2e 0.29.1 → 0.31.0

package/docker-compose.yml

@@ -97,6 +97,10 @@ services:
       - ./local-network/config/network:/config
       - sdk-ipc:/sdk-ipc
 
+  stake-pool-projector:
+    environment:
+      METADATA_JOB_RETRY_DELAY: 60
+
 volumes:
   sdk-ipc:
     driver: local

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.29.1",
+  "version": "0.31.0",
   "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.24.4",
-    "@cardano-sdk/cardano-services-client": "~0.16.4",
+    "@cardano-sdk/cardano-services": "~0.25.0",
+    "@cardano-sdk/cardano-services-client": "~0.16.6",
     "@cardano-sdk/core": "~0.23.1",
     "@cardano-sdk/crypto": "~0.1.19",
-    "@cardano-sdk/hardware-ledger": "~0.8.4",
-    "@cardano-sdk/hardware-trezor": "~0.4.4",
-    "@cardano-sdk/input-selection": "~0.12.11",
-    "@cardano-sdk/key-management": "~0.18.0",
-    "@cardano-sdk/ogmios": "~0.15.6",
-    "@cardano-sdk/tx-construction": "~0.17.1",
+    "@cardano-sdk/hardware-ledger": "~0.8.6",
+    "@cardano-sdk/hardware-trezor": "~0.4.6",
+    "@cardano-sdk/input-selection": "~0.12.13",
+    "@cardano-sdk/key-management": "~0.19.0",
+    "@cardano-sdk/ogmios": "~0.15.8",
+    "@cardano-sdk/tx-construction": "~0.17.3",
     "@cardano-sdk/util": "~0.14.5",
-    "@cardano-sdk/util-dev": "~0.19.4",
-    "@cardano-sdk/util-rxjs": "~0.6.7",
-    "@cardano-sdk/wallet": "~0.29.0",
+    "@cardano-sdk/util-dev": "~0.19.6",
+    "@cardano-sdk/util-rxjs": "~0.6.9",
+    "@cardano-sdk/wallet": "~0.30.0",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@vespaiach/axios-fetch-adapter": "^0.3.0",
     "axios": "^0.27.2",
@@ -124,9 +124,9 @@
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
     "@cardano-sdk/dapp-connector": "~0.12.2",
-    "@cardano-sdk/projection": "~0.10.6",
-    "@cardano-sdk/projection-typeorm": "~0.7.6",
-    "@cardano-sdk/web-extension": "~0.20.1",
+    "@cardano-sdk/projection": "~0.10.8",
+    "@cardano-sdk/projection-typeorm": "~0.8.0",
+    "@cardano-sdk/web-extension": "~0.22.0",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -179,5 +179,5 @@
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "6ffac02f90549b4dddda2abcc23b7640a314b8a9"
+  "gitHead": "69e4fe9f69a5354208d3f02c9829b4a0feb689b1"
 }

package/test/web-extension/extension/background/walletManager.ts

@@ -6,7 +6,7 @@ import {
   WalletManagerActivateProps,
   WalletRepository,
   WalletType,
-  consumeSignerManagerApi,
+  consumeSigningCoordinatorApi,
   exposeApi,
   observableWalletProperties,
   repositoryChannel,
@@ -38,7 +38,7 @@ export interface WalletFactoryDependencies {
  * @param accountIndex The account index to get the name from.
  * @private
  */
-const getWalletName = (wallet: AnyWallet<Metadata>, accountIndex?: number): string => {
+const getWalletName = (wallet: AnyWallet<Metadata, Metadata>, accountIndex?: number): string => {
   let name = '';
   switch (wallet.type) {
     case WalletType.InMemory:
@@ -68,10 +68,10 @@ const getWalletName = (wallet: AnyWallet<Metadata>, accountIndex?: number): stri
  * to construct providers for different networks.
  * Please check its documentation for examples.
  */
-const walletFactory: WalletFactory<Metadata> = {
+const walletFactory: WalletFactory<Metadata, Metadata> = {
   create: async (
     props: WalletManagerActivateProps,
-    wallet: AnyWallet<Metadata>,
+    wallet: AnyWallet<Metadata, Metadata>,
     { witnesser, stores }: WalletFactoryDependencies
   ) =>
     (
@@ -89,20 +89,20 @@ const storesFactory: StoresFactory = {
   create: ({ name }) => storage.createPouchDbWalletStores(name, { logger })
 };
 
-const walletRepository = new WalletRepository<Metadata>({
+const walletRepository = new WalletRepository<Metadata, Metadata>({
   logger,
   store: new storage.InMemoryCollectionStore()
 });
 
-const signerManagerApi = consumeSignerManagerApi({ logger, runtime });
+const signingCoordinatorApi = consumeSigningCoordinatorApi({ logger, runtime });
 
-const walletManager = new WalletManager<Metadata>(
+const walletManager = new WalletManager<Metadata, Metadata>(
   { name: walletName },
   {
     logger,
     managerStorage: WebExtensionStorage.local,
     runtime,
-    signerManagerApi,
+    signingCoordinatorApi,
     storesFactory,
     walletFactory,
     walletRepository

package/test/web-extension/extension/ui.ts

@@ -9,13 +9,13 @@ import {
 } from './util';
 import {
   RemoteApiPropertyType,
-  SignerManager,
+  SigningCoordinator,
   WalletType,
   consumeRemoteApi,
   consumeSupplyDistributionTracker,
   createKeyAgentFactory,
   exposeApi,
-  exposeSignerManagerApi,
+  exposeSigningCoordinatorApi,
   observableWalletProperties,
   repositoryChannel,
   walletChannel,
@@ -32,12 +32,11 @@ import {
   CommunicationType,
   InMemoryKeyAgent,
   SerializableInMemoryKeyAgentData,
-  emip3encrypt,
-  util
+  emip3encrypt
 } from '@cardano-sdk/key-management';
-import { HexBlob } from '@cardano-sdk/util';
+import { HexBlob, isNotNil } from '@cardano-sdk/util';
 import { SodiumBip32Ed25519 } from '@cardano-sdk/crypto';
-import { combineLatest, firstValueFrom, merge, of } from 'rxjs';
+import { combineLatest, filter, firstValueFrom, merge, of } from 'rxjs';
 import { runtime } from 'webextension-polyfill';
 
 const delegationConfig = {
@@ -168,7 +167,7 @@ const clearWalletValues = (): void => {
 
 const destroyWallet = async (): Promise<void> => {
   await walletManager.deactivate();
-  const activeWalletId = await firstValueFrom(walletManager.activeWalletId$);
+  const activeWalletId = await firstValueFrom(walletManager.activeWalletId$.pipe(filter(isNotNil)));
   await walletManager.destroyData(activeWalletId.walletId, env.KEY_MANAGEMENT_PARAMS.chainId);
   clearWalletValues();
 };
@@ -211,7 +210,7 @@ const cleanupMultidelegationInfo = (multiDelegationDiv: Element) => {
   }
 };
 
-const signerManager = new SignerManager(
+const signingCoordinator = new SigningCoordinator(
   {
     hwOptions: {
       communicationType: CommunicationType.Web,
@@ -232,7 +231,7 @@ const signerManager = new SignerManager(
 const passphraseByteArray = Uint8Array.from(
   env.KEY_MANAGEMENT_PARAMS.passphrase.split('').map((letter) => letter.charCodeAt(0))
 );
-merge(signerManager.signDataRequest$, signerManager.transactionWitnessRequest$).subscribe((req) => {
+merge(signingCoordinator.signDataRequest$, signingCoordinator.transactionWitnessRequest$).subscribe((req) => {
   logger.info('Sign request', req);
   if (req.walletType === WalletType.InMemory) {
     void req.sign(new Uint8Array(passphraseByteArray));
@@ -245,9 +244,9 @@ merge(signerManager.signDataRequest$, signerManager.transactionWitnessRequest$).
 // Setup
 
 // Expose local objects.
-exposeSignerManagerApi(
+exposeSigningCoordinatorApi(
   {
-    signerManager
+    signingCoordinator
   },
   { logger, runtime }
 );
@@ -297,6 +296,7 @@ const createWalletIfNotExistsAndActivate = async (accountIndex: number) => {
     clearWalletValues();
     const bip32Ed25519 = new SodiumBip32Ed25519();
     const mnemonicWords = env.KEY_MANAGEMENT_PARAMS.mnemonic.split(' ');
+    const encryptedMnemonic = await emip3encrypt(Buffer.from(env.KEY_MANAGEMENT_PARAMS.mnemonic), passphraseByteArray);
     const passphrase = new Uint8Array(passphraseByteArray);
     const keyAgent = await InMemoryKeyAgent.fromBip39MnemonicWords(
       {
@@ -310,17 +310,15 @@ const createWalletIfNotExistsAndActivate = async (accountIndex: number) => {
     const encryptedRootPrivateKey = (keyAgent.serializableData as SerializableInMemoryKeyAgentData)
       .encryptedRootPrivateKeyBytes;
 
-    const entropy = Buffer.from(util.mnemonicWordsToEntropy(mnemonicWords), 'hex');
-    const encryptedEntropy = await emip3encrypt(entropy, passphraseByteArray);
-
     logger.log('adding to repository wallet');
     // Add wallet to the repository.
     walletId = await repository.addWallet({
       encryptedSecrets: {
-        entropy: HexBlob.fromBytes(encryptedEntropy),
+        keyMaterial: HexBlob.fromBytes(encryptedMnemonic),
         rootPrivateKeyBytes: HexBlob.fromBytes(new Uint8Array(encryptedRootPrivateKey))
       },
       extendedAccountPublicKey: keyAgent.serializableData.extendedAccountPublicKey,
+      metadata: {},
       type: WalletType.InMemory
     });
     await repository.addAccount({