@cardano-sdk/e2e 0.28.1 → 0.29.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.28.1",
+  "version": "0.29.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.24.2",
-    "@cardano-sdk/cardano-services-client": "~0.16.2",
-    "@cardano-sdk/core": "~0.23.0",
+    "@cardano-sdk/cardano-services": "~0.24.4",
+    "@cardano-sdk/cardano-services-client": "~0.16.4",
+    "@cardano-sdk/core": "~0.23.1",
     "@cardano-sdk/crypto": "~0.1.19",
-    "@cardano-sdk/hardware-ledger": "~0.8.2",
-    "@cardano-sdk/hardware-trezor": "~0.4.2",
-    "@cardano-sdk/input-selection": "~0.12.9",
-    "@cardano-sdk/key-management": "~0.17.1",
-    "@cardano-sdk/ogmios": "~0.15.4",
-    "@cardano-sdk/tx-construction": "~0.16.2",
+    "@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/util": "~0.14.5",
-    "@cardano-sdk/util-dev": "~0.19.2",
-    "@cardano-sdk/util-rxjs": "~0.6.5",
-    "@cardano-sdk/wallet": "~0.28.1",
+    "@cardano-sdk/util-dev": "~0.19.4",
+    "@cardano-sdk/util-rxjs": "~0.6.7",
+    "@cardano-sdk/wallet": "~0.29.0",
     "@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.12.1",
-    "@cardano-sdk/projection": "~0.10.4",
-    "@cardano-sdk/projection-typeorm": "~0.7.4",
-    "@cardano-sdk/web-extension": "~0.19.0",
+    "@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",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -149,6 +149,7 @@
     "babel-loader": "^8.2.5",
     "blake2b-no-wasm": "2.1.4",
     "buffer": "^6.0.3",
+    "chromedriver": "^120.0.0",
     "copy-webpack-plugin": "^10.2.4",
     "crypto-browserify": "^3.12.0",
     "delay": "^5.0.0",
@@ -178,5 +179,5 @@
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "586e56ff6b8b4666fa62b4e11b1d87461c36b9b8"
+  "gitHead": "6ffac02f90549b4dddda2abcc23b7640a314b8a9"
 }

package/src/factories.ts

@@ -30,6 +30,7 @@ import {
   CommunicationType,
   InMemoryKeyAgent,
   KeyAgentDependencies,
+  Witnesser,
   util
 } from '@cardano-sdk/key-management';
 import {
@@ -282,6 +283,7 @@ export type GetWalletProps = {
   stores?: storage.WalletStores;
   customKeyParams?: KeyAgentFactoryProps;
   keyAgent?: AsyncKeyAgent;
+  witnesser?: Witnesser;
 };
 
 /** Delays initializing tx when nearing the epoch boundary. Relies on system clock being accurate. */
@@ -307,7 +309,7 @@ const patchInitializeTxToRespectEpochBoundary = <T extends ObservableWallet>(
  * @returns an object containing the wallet and providers passed to it
  */
 export const getWallet = async (props: GetWalletProps) => {
-  const { env, idx, logger, name, polling, stores, customKeyParams, keyAgent } = props;
+  const { env, idx, logger, name, polling, stores, customKeyParams, keyAgent, witnesser } = props;
   const providers = {
     addressDiscovery: await addressDiscoveryFactory.create(
       env.ADDRESS_DISCOVERY,
@@ -365,7 +367,7 @@ export const getWallet = async (props: GetWalletProps) => {
       bip32Account,
       logger,
       stores,
-      witnesser: util.createBip32Ed25519Witnesser(asyncKeyAgent)
+      witnesser: witnesser || util.createBip32Ed25519Witnesser(asyncKeyAgent)
     }
   );
 

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

@@ -1,57 +1,140 @@
 import {
+  AnyWallet,
   StoresFactory,
   WalletFactory,
+  WalletManager,
   WalletManagerActivateProps,
-  WalletManagerWorker,
+  WalletRepository,
+  WalletType,
+  consumeSignerManagerApi,
   exposeApi,
+  observableWalletProperties,
+  repositoryChannel,
+  walletChannel,
   walletManagerChannel,
-  walletManagerProperties
+  walletManagerProperties,
+  walletRepositoryProperties
 } from '@cardano-sdk/web-extension';
 
-import { AsyncKeyAgent } from '@cardano-sdk/key-management';
+import { InvalidArgumentError, isNotNil } from '@cardano-sdk/util';
+import { Metadata, env, logger } from '../util';
 import { storage as WebExtensionStorage, runtime } from 'webextension-polyfill';
-import { env, logger } from '../util';
-import { from, merge, of } from 'rxjs';
+import { Witnesser } from '@cardano-sdk/key-management';
+import { filter, from, merge, of } from 'rxjs';
 import { getWallet } from '../../../../src';
 import { storage } from '@cardano-sdk/wallet';
 import { toEmpty } from '@cardano-sdk/util-rxjs';
 import { walletName } from '../const';
 
 export interface WalletFactoryDependencies {
-  keyAgent: AsyncKeyAgent;
+  witnesser: Witnesser;
   stores: storage.WalletStores;
 }
 
+/**
+ * Gets the wallet name.
+ *
+ * @param wallet The wallet to get the name from.
+ * @param accountIndex The account index to get the name from.
+ * @private
+ */
+const getWalletName = (wallet: AnyWallet<Metadata>, accountIndex?: number): string => {
+  let name = '';
+  switch (wallet.type) {
+    case WalletType.InMemory:
+    case WalletType.Ledger:
+    case WalletType.Trezor: {
+      if (accountIndex === undefined)
+        throw new InvalidArgumentError('accountIndex', `Account index is required for ${wallet.type} wallet`);
+
+      const account = wallet.accounts.find((acc) => acc.accountIndex === accountIndex);
+
+      if (!account)
+        throw new InvalidArgumentError('accountIndex', `Account ${accountIndex} not found in ${wallet.type} wallet`);
+
+      name = account.metadata.name;
+      break;
+    }
+    case WalletType.Script:
+      name = wallet.metadata.name;
+      break;
+  }
+
+  return name;
+};
+
 /**
  * {@link WalletManagerActivateProps.provider} could be used to pass the necessary information
  * to construct providers for different networks.
  * Please check its documentation for examples.
  */
-const walletFactory: WalletFactory = {
-  create: async (props: WalletManagerActivateProps, { keyAgent, stores }: WalletFactoryDependencies) =>
+const walletFactory: WalletFactory<Metadata> = {
+  create: async (
+    props: WalletManagerActivateProps,
+    wallet: AnyWallet<Metadata>,
+    { witnesser, stores }: WalletFactoryDependencies
+  ) =>
     (
       await getWallet({
         env,
-        keyAgent,
         logger,
-        name: props.observableWalletName,
-        stores
+        name: getWalletName(wallet, props.accountIndex),
+        stores,
+        witnesser
       })
     ).wallet
 };
 
 const storesFactory: StoresFactory = {
-  create: ({ walletId }) => storage.createPouchDbWalletStores(walletId, { logger })
+  create: ({ name }) => storage.createPouchDbWalletStores(name, { logger })
 };
 
-export const wallet$ = (() => {
-  const walletManager = new WalletManagerWorker(
-    { walletName },
-    { logger, managerStorage: WebExtensionStorage.local, runtime, storesFactory, walletFactory }
-  );
-  exposeApi(
-    { api$: of(walletManager), baseChannel: walletManagerChannel(walletName), properties: walletManagerProperties },
-    { logger, runtime }
-  );
-  return merge(walletManager.activeWallet$, from(walletManager.initialize()).pipe(toEmpty));
-})();
+const walletRepository = new WalletRepository<Metadata>({
+  logger,
+  store: new storage.InMemoryCollectionStore()
+});
+
+const signerManagerApi = consumeSignerManagerApi({ logger, runtime });
+
+const walletManager = new WalletManager<Metadata>(
+  { name: walletName },
+  {
+    logger,
+    managerStorage: WebExtensionStorage.local,
+    runtime,
+    signerManagerApi,
+    storesFactory,
+    walletFactory,
+    walletRepository
+  }
+);
+
+exposeApi(
+  {
+    api$: of(walletRepository),
+    baseChannel: repositoryChannel(walletName),
+    properties: walletRepositoryProperties
+  },
+  { logger, runtime }
+);
+
+exposeApi(
+  {
+    api$: of(walletManager),
+    baseChannel: walletManagerChannel(walletName),
+    properties: walletManagerProperties
+  },
+  { logger, runtime }
+);
+
+exposeApi(
+  {
+    api$: walletManager.activeWallet$.asObservable(),
+    baseChannel: walletChannel(walletName),
+    properties: observableWalletProperties
+  },
+  { logger, runtime }
+);
+
+export const wallet$ = (() =>
+  merge(walletManager.activeWallet$.pipe(filter(isNotNil)), from(walletManager.initialize()).pipe(toEmpty)))();

package/test/web-extension/extension/manifest.json

@@ -9,7 +9,7 @@
     "unlimitedStorage"
   ],
   "content_security_policy": {
-    "extension_pages": "default-src 'self' http://localhost:3000; script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; connect-src data: http://localhost:8080 https://backend.live-preprod.eks.lw.iog.io https://api.coingecko.com http://167.235.156.245:4000 http://localhost:3000 ws://localhost:3000 wss://localhost:3000 http://localhost:4000 ws://localhost:4000 wss://localhost:4000 http://testnet-dev-backend.dev.lw.iog.io:80 http://localhost:4567 https://testnet-dev-backend.dev.lw.iog.io:443 https://preprod-api.v2.prod.lw.iog.io; style-src * 'unsafe-inline'; img-src * data:; font-src https://fonts.gstatic.com;"
+    "extension_pages": "default-src 'self' http://localhost:3000; script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; connect-src data: http://localhost:8080 https://backend.live-preprod.eks.lw.iog.io https://api.coingecko.com http://167.235.156.245:4000 http://localhost:3000 ws://localhost:3000 wss://localhost:3000 http://localhost:4011 ws://localhost:4011 wss://localhost:4011 http://localhost:4000 ws://localhost:4000 wss://localhost:4000 http://testnet-dev-backend.dev.lw.iog.io:80 http://localhost:4567 https://testnet-dev-backend.dev.lw.iog.io:443 https://preprod-api.v2.prod.lw.iog.io; style-src * 'unsafe-inline'; img-src * data:; font-src https://fonts.gstatic.com;"
   },
   "web_accessible_resources": [
     {

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

@@ -9,24 +9,35 @@ import {
 } from './util';
 import {
   RemoteApiPropertyType,
-  WalletManagerUi,
+  SignerManager,
+  WalletType,
   consumeRemoteApi,
   consumeSupplyDistributionTracker,
-  exposeApi
+  createKeyAgentFactory,
+  exposeApi,
+  exposeSignerManagerApi,
+  observableWalletProperties,
+  repositoryChannel,
+  walletChannel,
+  walletManagerChannel,
+  walletManagerProperties,
+  walletRepositoryProperties
 } from '@cardano-sdk/web-extension';
-import {
-  adaPriceServiceChannel,
-  getObservableWalletName,
-  selectors,
-  userPromptServiceChannel,
-  walletName
-} from './const';
-import { keyManagementFactory } from '../../../src';
+import { adaPriceServiceChannel, selectors, userPromptServiceChannel, walletName } from './const';
 
+import * as Crypto from '@cardano-sdk/crypto';
+import { Buffer } from 'buffer';
 import { Cardano } from '@cardano-sdk/core';
+import {
+  CommunicationType,
+  InMemoryKeyAgent,
+  SerializableInMemoryKeyAgentData,
+  emip3encrypt,
+  util
+} from '@cardano-sdk/key-management';
 import { HexBlob } from '@cardano-sdk/util';
 import { SodiumBip32Ed25519 } from '@cardano-sdk/crypto';
-import { combineLatest, firstValueFrom, of } from 'rxjs';
+import { combineLatest, firstValueFrom, merge, of } from 'rxjs';
 import { runtime } from 'webextension-polyfill';
 
 const delegationConfig = {
@@ -156,7 +167,9 @@ const clearWalletValues = (): void => {
 };
 
 const destroyWallet = async (): Promise<void> => {
-  await walletManager.destroy();
+  await walletManager.deactivate();
+  const activeWalletId = await firstValueFrom(walletManager.activeWalletId$);
+  await walletManager.destroyData(activeWalletId.walletId, env.KEY_MANAGEMENT_PARAMS.chainId);
   clearWalletValues();
 };
 
@@ -198,10 +211,64 @@ const cleanupMultidelegationInfo = (multiDelegationDiv: Element) => {
   }
 };
 
-const walletManager = new WalletManagerUi({ walletName }, { logger, runtime });
+const signerManager = new SignerManager(
+  {
+    hwOptions: {
+      communicationType: CommunicationType.Web,
+      manifest: {
+        appUrl: 'https://web-extension.app',
+        email: 'e2e@web-extension.app'
+      }
+    }
+  },
+  {
+    keyAgentFactory: createKeyAgentFactory({
+      bip32Ed25519: new Crypto.SodiumBip32Ed25519(),
+      logger
+    })
+  }
+);
+
+const passphraseByteArray = Uint8Array.from(
+  env.KEY_MANAGEMENT_PARAMS.passphrase.split('').map((letter) => letter.charCodeAt(0))
+);
+merge(signerManager.signDataRequest$, signerManager.transactionWitnessRequest$).subscribe((req) => {
+  logger.info('Sign request', req);
+  if (req.walletType === WalletType.InMemory) {
+    void req.sign(new Uint8Array(passphraseByteArray));
+  } else {
+    void req.sign();
+  }
+  logger.info('Signed', req);
+});
+
+// Setup
+
+// Expose local objects.
+exposeSignerManagerApi(
+  {
+    signerManager
+  },
+  { logger, runtime }
+);
+
+// Consume remote objects.
+const walletManager = consumeRemoteApi(
+  { baseChannel: walletManagerChannel(walletName), properties: walletManagerProperties },
+  { logger, runtime }
+);
+
+const repository = consumeRemoteApi(
+  { baseChannel: repositoryChannel(walletName), properties: walletRepositoryProperties },
+  { logger, runtime }
+);
+
 // Wallet object does not change when wallets are activated/deactivated.
 // Instead, it's observable properties emit from the currently active wallet.
-const wallet = walletManager.wallet;
+const wallet = consumeRemoteApi(
+  { baseChannel: walletChannel(walletName), properties: observableWalletProperties },
+  { logger, runtime }
+);
 
 // Wallet can be subscribed can be used even before it is actually created.
 wallet.addresses$.subscribe(([{ address, rewardAccount }]) => setAddresses({ address, stakeAddress: rewardAccount }));
@@ -220,30 +287,71 @@ wallet.delegation.distribution$.subscribe((delegationDistrib) => {
   }
 });
 
-const createWallet = async (accountIndex: number) => {
-  clearWalletValues();
-
-  const keyAgent = await (
-    await keyManagementFactory.create(
-      env.KEY_MANAGEMENT_PROVIDER,
+const createWalletIfNotExistsAndActivate = async (accountIndex: number) => {
+  const wallets = await firstValueFrom(repository.wallets$);
+  let walletId = wallets.find(
+    (w) => w.type !== WalletType.Script && w.accounts.some((a) => a.accountIndex === accountIndex)
+  )?.walletId;
+  if (!walletId) {
+    logger.log('creating wallet');
+    clearWalletValues();
+    const bip32Ed25519 = new SodiumBip32Ed25519();
+    const mnemonicWords = env.KEY_MANAGEMENT_PARAMS.mnemonic.split(' ');
+    const passphrase = new Uint8Array(passphraseByteArray);
+    const keyAgent = await InMemoryKeyAgent.fromBip39MnemonicWords(
       {
-        ...env.KEY_MANAGEMENT_PARAMS,
-        accountIndex
+        accountIndex,
+        chainId: env.KEY_MANAGEMENT_PARAMS.chainId,
+        getPassphrase: async () => passphrase,
+        mnemonicWords
       },
-      logger
-    )
-  )({ bip32Ed25519: new SodiumBip32Ed25519(), logger });
+      { bip32Ed25519, logger }
+    );
+    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),
+        rootPrivateKeyBytes: HexBlob.fromBytes(new Uint8Array(encryptedRootPrivateKey))
+      },
+      extendedAccountPublicKey: keyAgent.serializableData.extendedAccountPublicKey,
+      type: WalletType.InMemory
+    });
+    await repository.addAccount({
+      accountIndex,
+      metadata: { name: `wallet-${accountIndex}` },
+      walletId
+    });
+
+    logger.log(`Wallet added: ${walletId}`);
+  } else {
+    logger.info(`Wallet with accountIndex ${accountIndex} already exists`);
+  }
 
-  await walletManager.destroy();
-  await walletManager.activate({ keyAgent, observableWalletName: getObservableWalletName(accountIndex) });
+  // await walletManager.destroy();
+  await walletManager.activate({
+    accountIndex,
+    chainId: env.KEY_MANAGEMENT_PARAMS.chainId,
+    walletId
+  });
 
   // Same wallet object will return different names, based on which wallet is active
   // Calling this method before any wallet is active, will resolve only once a wallet becomes active
   setName(await wallet.getName());
 };
 
-document.querySelector(selectors.btnActivateWallet1)!.addEventListener('click', async () => await createWallet(0));
-document.querySelector(selectors.btnActivateWallet2)!.addEventListener('click', async () => await createWallet(1));
+document
+  .querySelector(selectors.btnActivateWallet1)!
+  .addEventListener('click', async () => await createWalletIfNotExistsAndActivate(0));
+document
+  .querySelector(selectors.btnActivateWallet2)!
+  .addEventListener('click', async () => await createWalletIfNotExistsAndActivate(1));
 document.querySelector(selectors.deactivateWallet)!.addEventListener('click', async () => await deactivateWallet());
 document.querySelector(selectors.destroyWallet)!.addEventListener('click', async () => await destroyWallet());
 document.querySelector(selectors.btnDelegate)!.addEventListener('click', async () => {
@@ -253,7 +361,10 @@ document.querySelector(selectors.btnDelegate)!.addEventListener('click', async (
 });
 
 document.querySelector(selectors.btnSignAndBuildTx)!.addEventListener('click', async () => {
+  logger.info('Building transaction');
   const [{ address: ownAddress }] = await firstValueFrom(wallet.addresses$);
+  logger.info(`Address: ${ownAddress}`);
+
   const builtTx = wallet
     .createTxBuilder()
     .addOutput({

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

@@ -35,3 +35,5 @@ export const disconnectPortTestObjProperties: RemoteApiProperties<DisconnectPort
 export const logger = console;
 
 export const env = getEnv(walletVariables);
+
+export type Metadata = { name: string };