@cardano-sdk/e2e 0.37.1 → 0.39.0

package/dist/esm/util/createMockKeyAgent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createMockKeyAgent.d.ts","sourceRoot":"","sources":["../../../src/util/createMockKeyAgent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAA4B,MAAM,6BAA6B,CAAC;AAQjG,eAAO,MAAM,kBAAkB,2BAA2B,cAAc,EAAE,KAAQ,KAAK,MAAM,CAAC,QAAQ,CAsBrG,CAAC"}
+{"version":3,"file":"createMockKeyAgent.d.ts","sourceRoot":"","sources":["../../../src/util/createMockKeyAgent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAA4B,MAAM,6BAA6B,CAAC;AAQjG,eAAO,MAAM,kBAAkB,2BAA2B,cAAc,EAAE,KAAQ,KAAK,MAAM,CAAC,QAAQ,CAuBrG,CAAC"}

package/dist/esm/util/createMockKeyAgent.js

@@ -24,6 +24,7 @@ export const createMockKeyAgent = (deriveAddressesReturn = []) => {
             purpose: KeyPurpose.STANDARD
         },
         signBlob: jest.fn(),
+        signCip8Data: jest.fn(),
         signTransaction: jest.fn()
     };
 };

package/dist/esm/util/createMockKeyAgent.js.map

@@ -1 +1 @@
-{"version":3,"file":"createMockKeyAgent.js","sourceRoot":"","sources":["../../../src/util/createMockKeyAgent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAA4B,YAAY,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEjG,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;AACzC,MAAM,wBAAwB,GAAG,iBAAiB,CAChD,kIAAkI,CACnI,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,wBAA0C,EAAE,EAAyB,EAAE;IACxG,MAAM,8BAA8B,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAC;IAClE,OAAO;QACL,YAAY;QACZ,YAAY,EAAE,IAAI,kBAAkB,EAAE;QACtC,OAAO;QACP,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE,CAAC,8BAA8B,CAAC,KAAK,EAAE,CAAC;QAC/F,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE;QAC1B,oBAAoB,EAAE,IAAI,CAAC,EAAE,EAAE;QAC/B,wBAAwB;QACxB,OAAO,EAAE,UAAU,CAAC,QAAQ;QAC5B,gBAAgB,EAAE;YAChB,UAAU,EAAE,YAAY,CAAC,QAAQ;YACjC,YAAY;YACZ,OAAO;YACP,4BAA4B,EAAE,EAAE;YAChC,wBAAwB;YACxB,OAAO,EAAE,UAAU,CAAC,QAAQ;SAC7B;QACD,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;QACnB,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE;KAC3B,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"createMockKeyAgent.js","sourceRoot":"","sources":["../../../src/util/createMockKeyAgent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAA4B,YAAY,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEjG,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;AACzC,MAAM,wBAAwB,GAAG,iBAAiB,CAChD,kIAAkI,CACnI,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,wBAA0C,EAAE,EAAyB,EAAE;IACxG,MAAM,8BAA8B,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAC;IAClE,OAAO;QACL,YAAY;QACZ,YAAY,EAAE,IAAI,kBAAkB,EAAE;QACtC,OAAO;QACP,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE,CAAC,8BAA8B,CAAC,KAAK,EAAE,CAAC;QAC/F,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE;QAC1B,oBAAoB,EAAE,IAAI,CAAC,EAAE,EAAE;QAC/B,wBAAwB;QACxB,OAAO,EAAE,UAAU,CAAC,QAAQ;QAC5B,gBAAgB,EAAE;YAChB,UAAU,EAAE,YAAY,CAAC,QAAQ;YACjC,YAAY;YACZ,OAAO;YACP,4BAA4B,EAAE,EAAE;YAChC,wBAAwB;YACxB,OAAO,EAAE,UAAU,CAAC,QAAQ;SAC7B;QACD,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;QACnB,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;QACvB,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE;KAC3B,CAAC;AACJ,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.37.1",
+  "version": "0.39.0",
   "description": "End to end tests for the cardano-js-sdk packages.",
   "engines": {
     "node": ">=16.20.2"
@@ -81,20 +81,20 @@
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.2",
     "@cardano-ogmios/client": "6.5.0",
-    "@cardano-sdk/cardano-services": "~0.29.1",
-    "@cardano-sdk/cardano-services-client": "~0.19.15",
-    "@cardano-sdk/core": "~0.36.0",
+    "@cardano-sdk/cardano-services": "~0.29.3",
+    "@cardano-sdk/cardano-services-client": "~0.20.0",
+    "@cardano-sdk/core": "~0.38.0",
     "@cardano-sdk/crypto": "~0.1.29",
-    "@cardano-sdk/hardware-ledger": "~0.10.2",
-    "@cardano-sdk/hardware-trezor": "~0.4.36",
-    "@cardano-sdk/input-selection": "~0.13.9",
-    "@cardano-sdk/key-management": "~0.21.2",
-    "@cardano-sdk/ogmios": "~0.16.0",
-    "@cardano-sdk/tx-construction": "~0.19.9",
+    "@cardano-sdk/hardware-ledger": "~0.11.1",
+    "@cardano-sdk/hardware-trezor": "~0.5.1",
+    "@cardano-sdk/input-selection": "~0.13.11",
+    "@cardano-sdk/key-management": "~0.23.0",
+    "@cardano-sdk/ogmios": "~0.17.0",
+    "@cardano-sdk/tx-construction": "~0.20.0",
     "@cardano-sdk/util": "~0.15.4",
-    "@cardano-sdk/util-dev": "~0.22.0",
-    "@cardano-sdk/util-rxjs": "~0.7.22",
-    "@cardano-sdk/wallet": "~0.40.0",
+    "@cardano-sdk/util-dev": "~0.22.2",
+    "@cardano-sdk/util-rxjs": "~0.7.24",
+    "@cardano-sdk/wallet": "~0.42.0",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@vespaiach/axios-fetch-adapter": "^0.3.0",
     "axios": "^0.28.0",
@@ -124,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.27",
-    "@cardano-sdk/projection": "~0.11.26",
-    "@cardano-sdk/projection-typeorm": "~0.8.28",
-    "@cardano-sdk/web-extension": "~0.29.11",
+    "@cardano-sdk/dapp-connector": "~0.12.29",
+    "@cardano-sdk/projection": "~0.11.28",
+    "@cardano-sdk/projection-typeorm": "~0.8.30",
+    "@cardano-sdk/web-extension": "~0.31.0",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -181,5 +181,5 @@
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "a06ddc8cd3971f4d855313de9eb3ff95965a36c9"
+  "gitHead": "3ff7ebb67640266c0a7479a7114421ae1b820635"
 }

package/src/util/createMockKeyAgent.ts

@@ -28,6 +28,7 @@ export const createMockKeyAgent = (deriveAddressesReturn: GroupedAddress[] = [])
       purpose: KeyPurpose.STANDARD
     },
     signBlob: jest.fn(),
+    signCip8Data: jest.fn(),
     signTransaction: jest.fn()
   };
 };

package/test/long-running/multisig-wallet/MultiSigTx.ts

@@ -1,5 +1,5 @@
 import * as Crypto from '@cardano-sdk/crypto';
-import { Cardano, Serialization, deserializeTx } from '@cardano-sdk/core';
+import { Cardano, Serialization } from '@cardano-sdk/core';
 import { HexBlob } from '@cardano-sdk/util';
 
 /**
@@ -63,7 +63,7 @@ export class MultiSigTx {
 
     reader.readEndArray();
 
-    const transaction = deserializeTx(reader.readEncodedValue());
+    const transaction = Serialization.deserializeTx(reader.readEncodedValue());
     reader.readEndArray();
 
     return new MultiSigTx(transaction, expectedSigners);

package/test/long-running/shared-wallet-delegation-rewards.test.ts

@@ -1,5 +1,5 @@
 import { BaseWallet } from '@cardano-sdk/wallet';
-import { Cardano, StakePoolProvider } from '@cardano-sdk/core';
+import { Cardano, Serialization, StakePoolProvider } from '@cardano-sdk/core';
 import { buildSharedWallets } from '../wallet_epoch_0/SharedWallet/utils';
 import { filter, firstValueFrom, map, take } from 'rxjs';
 import {
@@ -20,11 +20,15 @@ const env = getEnv(walletVariables);
 
 const submitDelegationTx = async (alice: BaseWallet, bob: BaseWallet, charlotte: BaseWallet, pool: Cardano.PoolId) => {
   logger.info(`Creating delegation tx at epoch #${(await firstValueFrom(alice.currentEpoch$)).epochNo}`);
-  let tx = (await alice.createTxBuilder().delegateFirstStakeCredential(pool).build().sign()).tx;
+  const tx = (await alice.createTxBuilder().delegateFirstStakeCredential(pool).build().sign()).tx;
 
-  tx = await bob.updateWitness({ sender: { id: 'e2e' }, tx });
-  tx = await charlotte.updateWitness({ sender: { id: 'e2e' }, tx });
-  await alice.submitTx(tx);
+  // Serialize and transmit TX...
+  let serializedTx = Serialization.Transaction.fromCore(tx).toCbor();
+
+  serializedTx = await bob.addSignatures({ sender: { id: 'e2e' }, tx: serializedTx });
+  serializedTx = await charlotte.addSignatures({ sender: { id: 'e2e' }, tx: serializedTx });
+
+  await alice.submitTx(serializedTx);
 
   const { epochNo } = await firstValueFrom(alice.currentEpoch$);
   logger.info(`Delegation tx ${tx.id} submitted at epoch #${epochNo}`);
@@ -61,15 +65,18 @@ const buildSpendRewardTx = async (
   const { body } = await tx.inspect();
   logger.debug('Body of tx before sign');
   logger.debug(body);
-  let signedTx = (await tx.sign()).tx;
+  const signedTx = (await tx.sign()).tx;
+
+  // Serialize and transmit TX...
+  let serializedTx = Serialization.Transaction.fromCore(signedTx).toCbor();
 
-  signedTx = await bob.updateWitness({ sender: { id: 'e2e' }, tx: signedTx });
-  signedTx = await charlotte.updateWitness({ sender: { id: 'e2e' }, tx: signedTx });
+  serializedTx = await bob.addSignatures({ sender: { id: 'e2e' }, tx: serializedTx });
+  serializedTx = await charlotte.addSignatures({ sender: { id: 'e2e' }, tx: serializedTx });
 
   logger.debug('Body of tx after sign');
   logger.debug(signedTx.body);
 
-  return signedTx;
+  return serializedTx;
 };
 
 const getPoolIds = async (stakePoolProvider: StakePoolProvider, count: number) => {
@@ -187,13 +194,11 @@ describe('shared wallet delegation rewards', () => {
     logger.info(`Generated rewards: ${rewards} tLovelace`);
 
     // Spend reward
-    const spendRewardTx = await buildSpendRewardTx(
-      aliceMultiSigWallet,
-      bobMultiSigWallet,
-      charlotteMultiSigWallet,
-      faucetWallet
-    );
-    expect(spendRewardTx.body.withdrawals?.length).toBeGreaterThan(0);
-    await submitAndConfirm(aliceMultiSigWallet, spendRewardTx);
+    const spendRewardsTx = Serialization.Transaction.fromCbor(
+      await buildSpendRewardTx(aliceMultiSigWallet, bobMultiSigWallet, charlotteMultiSigWallet, faucetWallet)
+    ).toCore();
+
+    expect(spendRewardsTx.body.withdrawals?.length).toBeGreaterThan(0);
+    await submitAndConfirm(aliceMultiSigWallet, spendRewardsTx);
   });
 });

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

@@ -1,5 +1,5 @@
 import { BaseWallet } from '@cardano-sdk/wallet';
-import { Cardano } from '@cardano-sdk/core';
+import { Cardano, Serialization } from '@cardano-sdk/core';
 import { buildSharedWallets } from './utils';
 import { filter, firstValueFrom, map, take } from 'rxjs';
 import {
@@ -97,14 +97,18 @@ describe('SharedWallet/simpleTx', () => {
     // Alice will initiate the transaction.
     const txBuilder = aliceMultiSigWallet.createTxBuilder();
     const txOut = await txBuilder.buildOutput().address(faucetAddress).coin(1_000_000n).build();
-    let tx = (await txBuilder.addOutput(txOut).build().sign()).tx;
+    const tx = (await txBuilder.addOutput(txOut).build().sign()).tx;
+
+    // Serialize and transmit TX...
+    let serializedTx = Serialization.Transaction.fromCore(tx).toCbor();
 
     // Bob updates the transaction with his witness
-    tx = await bobMultiSigWallet.updateWitness({ sender: { id: 'e2e' }, tx });
+    serializedTx = await bobMultiSigWallet.addSignatures({ sender: { id: 'e2e' }, tx: serializedTx });
 
     // Charlotte updates the transaction with her witness
-    tx = await charlotteMultiSigWallet.updateWitness({ sender: { id: 'e2e' }, tx });
-    const txId = await charlotteMultiSigWallet.submitTx(tx);
+    serializedTx = await charlotteMultiSigWallet.addSignatures({ sender: { id: 'e2e' }, tx: serializedTx });
+
+    const txId = await charlotteMultiSigWallet.submitTx(serializedTx);
 
     const finalTxFound = await firstValueFrom(
       aliceMultiSigWallet.transactions.history$.pipe(

package/test/wallet_epoch_0/SharedWallet/utils.ts

@@ -1,11 +1,12 @@
 import * as Crypto from '@cardano-sdk/crypto';
+import { Cardano, Serialization } from '@cardano-sdk/core';
+import { Cip30DataSignature } from '@cardano-sdk/dapp-connector';
+import { HexBlob } from '@cardano-sdk/util';
 import {
-  AccountKeyDerivationPath,
   KeyAgent,
   KeyPurpose,
   KeyRole,
   SignBlobResult,
-  SignDataContext,
   SignTransactionContext,
   TransactionSigner,
   WitnessOptions,
@@ -13,8 +14,6 @@ import {
   Witnesser,
   util
 } from '@cardano-sdk/key-management';
-import { Cardano, Serialization, TxCBOR } from '@cardano-sdk/core';
-import { HexBlob } from '@cardano-sdk/util';
 import { Logger } from 'ts-log';
 import { bip32Ed25519Factory, createStandaloneKeyAgent, getSharedWallet } from '../../../src';
 
@@ -204,11 +203,11 @@ export class SharedWalletWitnesser implements Witnesser {
     this.#stakingScript = stakingScript;
   }
 
-  async signBlob(
-    _derivationPath: AccountKeyDerivationPath,
-    _blob: HexBlob,
-    _context: SignDataContext
-  ): Promise<SignBlobResult> {
+  async signData(): Promise<Cip30DataSignature> {
+    throw new Error('Method not implemented.');
+  }
+
+  async signBlob(): Promise<SignBlobResult> {
     throw new Error('Method not implemented.');
   }
 
@@ -268,7 +267,7 @@ export class SharedWalletWitnesser implements Witnesser {
     };
 
     return {
-      cbor: TxCBOR.serialize(transaction),
+      cbor: Serialization.TxCBOR.serialize(transaction),
       context: {
         handleResolutions: context.handleResolutions ?? []
       },

package/test/wallet_epoch_3/SharedWallet/delegation.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable max-statements */
 import { BaseWallet, ObservableWallet } from '@cardano-sdk/wallet';
 import { BigIntMath, isNotNil } from '@cardano-sdk/util';
-import { Cardano, StakePoolProvider } from '@cardano-sdk/core';
+import { Cardano, Serialization, StakePoolProvider } from '@cardano-sdk/core';
 import {
   TX_TIMEOUT_DEFAULT,
   firstValueFromTimed,
@@ -172,9 +172,12 @@ describe('SharedWallet/delegation', () => {
         .sign()
     ).tx;
 
-    tx = await bobMultiSigWallet.updateWitness({ sender: { id: 'e2e' }, tx });
-    tx = await charlotteMultiSigWallet.updateWitness({ sender: { id: 'e2e' }, tx });
-    await aliceMultiSigWallet.submitTx(tx);
+    // Serialize and transmit TX...
+    let serializedTx = Serialization.Transaction.fromCore(tx).toCbor();
+
+    serializedTx = await bobMultiSigWallet.addSignatures({ sender: { id: 'e2e' }, tx: serializedTx });
+    serializedTx = await charlotteMultiSigWallet.addSignatures({ sender: { id: 'e2e' }, tx: serializedTx });
+    await aliceMultiSigWallet.submitTx(serializedTx);
 
     // Test it locks available balance after tx is submitted
     await firstValueFromTimed(
@@ -224,10 +227,12 @@ describe('SharedWallet/delegation', () => {
 
     // Make a 2nd tx with key de-registration
     tx = (await aliceMultiSigWallet.createTxBuilder().delegateFirstStakeCredential(null).build().sign()).tx;
-    tx = await bobMultiSigWallet.updateWitness({ sender: { id: 'e2e' }, tx });
-    tx = await charlotteMultiSigWallet.updateWitness({ sender: { id: 'e2e' }, tx });
+    serializedTx = Serialization.Transaction.fromCore(tx).toCbor();
+
+    serializedTx = await bobMultiSigWallet.addSignatures({ sender: { id: 'e2e' }, tx: serializedTx });
+    serializedTx = await charlotteMultiSigWallet.addSignatures({ sender: { id: 'e2e' }, tx: serializedTx });
 
-    await aliceMultiSigWallet.submitTx(tx);
+    await aliceMultiSigWallet.submitTx(serializedTx);
 
     await waitForTx(aliceMultiSigWallet, tx.id);
     const tx2ConfirmedState = await getWalletStateSnapshot(aliceMultiSigWallet);