@cardano-sdk/e2e 0.32.7 → 0.33.0

package/dist/esm/util/handle-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-util.d.ts","sourceRoot":"","sources":["../../../src/util/handle-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAAE,MAAM,EAAwD,MAAM,mBAAmB,CAAC;AACjH,OAAO,EAAmB,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGxE,OAAO,EAAE,QAAQ,EAAW,IAAI,IAAI,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAkC3F,oBAAY,cAAc,GAAG;IAC3B,CAAC,QAAQ,EAAE,MAAM,GAAG;QAClB,CAAC,UAAU,EAAE,MAAM,GAAG;YACpB,aAAa,EAAE,EAAE,CAAC;YAClB,IAAI,EAAE;gBACJ,cAAc,EAAE,MAAM,CAAC;gBACvB,EAAE,EAAE,MAAM,CAAC;gBACX,MAAM,EAAE,MAAM,CAAC;gBACf,UAAU,EAAE,MAAM,CAAC;gBACnB,OAAO,EAAE,MAAM,CAAC;aACjB,CAAC;YACF,WAAW,EAAE,MAAM,CAAC;YACpB,KAAK,EAAE,MAAM,CAAC;YACd,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,CAAC;SACjB,CAAC;KACH,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,oBAAoB,mBAAoB,MAAM,eAAe,MAAM,EAAE,KAAG,cAmBpF,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAoB,QAAQ;;;;EAe1D,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAAM,EAAkE,CAAC;AAEnG,eAAO,MAAM,iBAAiB,iBAAwB,MAAM,KAAG,QAAQ,QAAQ,QAAQ,CAKtF,CAAC;AAEF,eAAO,MAAM,yBAAyB,YAAc,CAAC;AAErD,eAAO,MAAM,IAAI,WACP,gBAAgB,YACd,QAAQ,yCAEL,QAAQ,SAAS,UACtB,QAAQ,UAAU,yCA0C3B,CAAC;AAEF,eAAO,MAAM,wBAAwB,WAC3B,gBAAgB,YACd,QAAQ,YACR,QAAQ,QAAQ,kBAsD3B,CAAC"}
+{"version":3,"file":"handle-util.d.ts","sourceRoot":"","sources":["../../../src/util/handle-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAAE,MAAM,EAAwD,MAAM,mBAAmB,CAAC;AACjH,OAAO,EAAmB,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGxE,OAAO,EAAE,QAAQ,EAAW,IAAI,IAAI,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAkC3F,oBAAY,cAAc,GAAG;IAC3B,CAAC,QAAQ,EAAE,MAAM,GAAG;QAClB,CAAC,UAAU,EAAE,MAAM,GAAG;YACpB,aAAa,EAAE,EAAE,CAAC;YAClB,IAAI,EAAE;gBACJ,cAAc,EAAE,MAAM,CAAC;gBACvB,EAAE,EAAE,MAAM,CAAC;gBACX,MAAM,EAAE,MAAM,CAAC;gBACf,UAAU,EAAE,MAAM,CAAC;gBACnB,OAAO,EAAE,MAAM,CAAC;aACjB,CAAC;YACF,WAAW,EAAE,MAAM,CAAC;YACpB,KAAK,EAAE,MAAM,CAAC;YACd,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,CAAC;SACjB,CAAC;KACH,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,oBAAoB,mBAAoB,MAAM,eAAe,MAAM,EAAE,KAAG,cAmBpF,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAoB,QAAQ;;;;EAe1D,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAAM,EAAkE,CAAC;AAEnG,eAAO,MAAM,iBAAiB,iBAAwB,MAAM,KAAG,QAAQ,QAAQ,QAAQ,CAKtF,CAAC;AAEF,eAAO,MAAM,yBAAyB,YAAc,CAAC;AAErD,eAAO,MAAM,IAAI,WACP,gBAAgB,YACd,QAAQ,yCAEL,QAAQ,SAAS,UACtB,QAAQ,UAAU,yCAgD3B,CAAC;AAEF,eAAO,MAAM,wBAAwB,WAC3B,gBAAgB,YACd,QAAQ,YACR,QAAQ,QAAQ,kBAsD3B,CAAC"}

package/dist/esm/util/handle-util.js

@@ -75,13 +75,19 @@ export const mint = async (wallet, keyAgent, tokens, txMetadatum, datum, isNFTHa
         auxiliaryData,
         mint: tokens,
         outputs,
-        witness: { extraSigners: [policySigner], scripts: [policyScript] }
+        signingOptions: {
+            extraSigners: [policySigner]
+        },
+        witness: { scripts: [policyScript] }
     };
     const unsignedTx = await wallet.initializeTx(txProps);
     const finalizeProps = {
         auxiliaryData,
+        signingOptions: {
+            extraSigners: [policySigner]
+        },
         tx: unsignedTx,
-        witness: { extraSigners: [policySigner], scripts: [policyScript] }
+        witness: { scripts: [policyScript] }
     };
     const signedTx = await wallet.finalizeTx(finalizeProps);
     await submitAndConfirm(wallet, signedTx);

package/dist/esm/util/handle-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-util.js","sourceRoot":"","sources":["../../../src/util/handle-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handle-util.js","sourceRoot":"","sources":["../../../src/util/handle-util.ts"],"names":[],"mappings":"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"}

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

@@ -1,14 +1,14 @@
 import * as Crypto from '@cardano-sdk/crypto';
+import { BaseWallet, ObservableWallet } from '@cardano-sdk/wallet';
 import { Cardano } from '@cardano-sdk/core';
 import { Observable } from 'rxjs';
-import { ObservableWallet, PersonalWallet } from '@cardano-sdk/wallet';
 import { InMemoryKeyAgent, TransactionSigner } from '@cardano-sdk/key-management';
 import { TestWallet } from '../factories';
 export declare const firstValueFromTimed: <T>(observable$: Observable<T>, timeoutMessage?: string, timeoutAfter?: number) => Promise<T>;
 export declare const waitForWalletStateSettle: (wallet: ObservableWallet, syncTimeout?: number) => Promise<boolean>;
 export declare const insufficientFundsMessage: (address: Cardano.PaymentAddress, min: bigint, actual: bigint) => string;
 export declare const walletReady: (wallet: ObservableWallet, minCoinBalance?: bigint, syncTimeout?: number) => Promise<[boolean, Cardano.Value]>;
-export declare const normalizeTxBody: (body: Cardano.HydratedTxBody | Cardano.TxBody) => Cardano.TxBody | Cardano.HydratedTxBody;
+export declare const normalizeTxBody: (body: Cardano.HydratedTxBody | Cardano.TxBody) => Cardano.TxBody;
 export declare const txConfirmed: ({ tip$, transactions: { history$, outgoing: { failed$ } } }: ObservableWallet, { id }: Pick<Cardano.Tx, 'id'>, numConfirmations?: number) => Promise<Cardano.HydratedTx>;
 export declare const submitAndConfirm: (wallet: ObservableWallet, tx: Cardano.Tx) => Promise<[string & {
     __opaqueString: "TransactionId";
@@ -27,11 +27,11 @@ export declare const waitForEpoch: (wallet: Pick<ObservableWallet, 'currentEpoch
     __opaqueNumber: "EpochNo";
 }>;
 export declare const runningAgainstLocalNetwork: () => Promise<boolean>;
-export declare const getTxConfirmationEpoch: (wallet: PersonalWallet, tx: Cardano.Tx<Cardano.TxBody>) => Promise<Cardano.EpochNo>;
+export declare const getTxConfirmationEpoch: (wallet: ObservableWallet, tx: Cardano.Tx<Cardano.TxBody>) => Promise<Cardano.EpochNo>;
 export declare const submitCertificate: (certificate: Cardano.Certificate, wallet: TestWallet) => Promise<Cardano.Tx<Cardano.TxBody>>;
 export declare const createStandaloneKeyAgent: (mnemonics: string[], genesis: Cardano.CompactGenesis, bip32Ed25519: Crypto.Bip32Ed25519) => Promise<InMemoryKeyAgent>;
 export declare const burnTokens: ({ wallet, tokens, scripts, policySigners: extraSigners }: {
-    wallet: PersonalWallet;
+    wallet: BaseWallet;
     tokens?: Cardano.TokenMap | undefined;
     scripts: Cardano.Script[];
     policySigners: TransactionSigner[];

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

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAuB,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAEL,UAAU,EAYX,MAAM,MAAM,CAAC;AAEd,OAAO,EAAmB,gBAAgB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAElF,OAAO,EAAE,UAAU,EAA8B,MAAM,cAAc,CAAC;AAOtE,eAAO,MAAM,mBAAmB,+FAO7B,CAAC;AAEJ,eAAO,MAAM,wBAAwB,WAAY,gBAAgB,gBAAe,MAAM,qBAKnF,CAAC;AAEJ,eAAO,MAAM,wBAAwB,YAC1B,QAAQ,cAAc,OAC1B,MAAM,UACH,MAAM,WAEuE,CAAC;AAExF,eAAO,MAAM,WAAW,WACd,gBAAgB,oDAGvB,QAAQ,CAAC,OAAO,EAAE,QAAQ,KAAK,CAAC,CAgBlC,CAAC;AAKF,eAAO,MAAM,eAAe,SAAU,QAAQ,cAAc,GAAG,QAAQ,MAAM,4CAO5E,CAAC;AAEF,eAAO,MAAM,WAAW,gEAOnB,gBAAgB,UACX,KAAK,QAAQ,EAAE,EAAE,IAAI,CAAC,2DA2B7B,CAAC;AAIJ,eAAO,MAAM,gBAAgB,WAAY,gBAAgB,MAAM,QAAQ,EAAE;;uBACjB,CAAC;AAEzD,oBAAY,iBAAiB,GAAG;IAC9B,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC;CACzB,CAAC;AAEF,oBAAY,kBAAkB,GAAG;IAC/B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,aAAa,oCAA2C,kBAAkB,kBActF,CAAC;AAEF,eAAO,MAAM,YAAY,WAAY,KAAK,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,MAAM;;EAUnG,CAAC;AAEF,eAAO,MAAM,0BAA0B,wBAetC,CAAC;AASF,eAAO,MAAM,sBAAsB,WAAkB,cAAc,MAAM,QAAQ,EAAE,CAAC,QAAQ,MAAM,CAAC,6BAMlG,CAAC;AAQF,eAAO,MAAM,iBAAiB,gBAAuB,QAAQ,WAAW,UAAU,UAAU,wCAc3F,CAAC;AAWF,eAAO,MAAM,wBAAwB,cACxB,MAAM,EAAE,WACV,QAAQ,cAAc,gBACjB,OAAO,YAAY,8BAShC,CAAC;AAQJ,eAAO,MAAM,UAAU;YAMb,cAAc;;aAEb,QAAQ,MAAM,EAAE;mBACV,iBAAiB,EAAE;mBA0BnC,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAmB,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,OAAO,EAAsC,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAEL,UAAU,EAYX,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAElF,OAAO,EAAE,UAAU,EAA8B,MAAM,cAAc,CAAC;AAOtE,eAAO,MAAM,mBAAmB,+FAO7B,CAAC;AAEJ,eAAO,MAAM,wBAAwB,WAAY,gBAAgB,gBAAe,MAAM,qBAKnF,CAAC;AAEJ,eAAO,MAAM,wBAAwB,YAC1B,QAAQ,cAAc,OAC1B,MAAM,UACH,MAAM,WAEuE,CAAC;AAExF,eAAO,MAAM,WAAW,WACd,gBAAgB,oDAGvB,QAAQ,CAAC,OAAO,EAAE,QAAQ,KAAK,CAAC,CAgBlC,CAAC;AAKF,eAAO,MAAM,eAAe,SAAU,QAAQ,cAAc,GAAG,QAAQ,MAAM,mBAU5E,CAAC;AAEF,eAAO,MAAM,WAAW,gEAOnB,gBAAgB,UACX,KAAK,QAAQ,EAAE,EAAE,IAAI,CAAC,2DA2B7B,CAAC;AAIJ,eAAO,MAAM,gBAAgB,WAAY,gBAAgB,MAAM,QAAQ,EAAE;;uBACjB,CAAC;AAEzD,oBAAY,iBAAiB,GAAG;IAC9B,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC;CACzB,CAAC;AAEF,oBAAY,kBAAkB,GAAG;IAC/B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,aAAa,oCAA2C,kBAAkB,kBActF,CAAC;AAEF,eAAO,MAAM,YAAY,WAAY,KAAK,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,MAAM;;EAUnG,CAAC;AAEF,eAAO,MAAM,0BAA0B,wBAetC,CAAC;AASF,eAAO,MAAM,sBAAsB,WAAkB,gBAAgB,MAAM,QAAQ,EAAE,CAAC,QAAQ,MAAM,CAAC,6BAMpG,CAAC;AAQF,eAAO,MAAM,iBAAiB,gBAAuB,QAAQ,WAAW,UAAU,UAAU,wCAc3F,CAAC;AAWF,eAAO,MAAM,wBAAwB,cACxB,MAAM,EAAE,WACV,QAAQ,cAAc,gBACjB,OAAO,YAAY,8BAShC,CAAC;AAQJ,eAAO,MAAM,UAAU;YAMb,UAAU;;aAET,QAAQ,MAAM,EAAE;mBACV,iBAAiB,EAAE;mBAgCnC,CAAC"}

package/dist/esm/util/util.js

@@ -1,4 +1,4 @@
-import { Cardano, createSlotEpochCalc } from '@cardano-sdk/core';
+import { Cardano, Serialization, createSlotEpochCalc } from '@cardano-sdk/core';
 import { EMPTY, combineLatest, distinctUntilChanged, filter, firstValueFrom, map, merge, mergeMap, switchMap, tap, throwError, timeout } from 'rxjs';
 import { FAST_OPERATION_TIMEOUT_DEFAULT, SYNC_TIMEOUT_DEFAULT } from '../defaults';
 import { InMemoryKeyAgent } from '@cardano-sdk/key-management';
@@ -24,10 +24,11 @@ export const walletReady = async (wallet, minCoinBalance = 1n, syncTimeout = SYN
 };
 const sortTxIn = (txInCollection) => sortBy(txInCollection, ['txId', 'index']);
 export const normalizeTxBody = (body) => {
-    body.inputs = sortTxIn(body.inputs);
-    body.collaterals = sortTxIn(body.collaterals);
-    body.referenceInputs = sortTxIn(body.referenceInputs);
-    return body;
+    const dehydratedTx = Serialization.TransactionBody.fromCore(body).toCore();
+    dehydratedTx.inputs = sortTxIn(dehydratedTx.inputs);
+    dehydratedTx.collaterals = sortTxIn(dehydratedTx.collaterals);
+    dehydratedTx.referenceInputs = sortTxIn(dehydratedTx.referenceInputs);
+    return dehydratedTx;
 };
 export const txConfirmed = ({ tip$, transactions: { history$, outgoing: { failed$ } } }, { id }, numConfirmations = 3) => firstValueFromTimed(merge(history$.pipe(switchMap((txs) => {
     const tx = txs.find((historyTx) => historyTx.id === id);
@@ -97,12 +98,18 @@ export const burnTokens = async ({ wallet, tokens, scripts, policySigners: extra
     const negativeTokens = new Map([...tokens].map(([assetId, value]) => [assetId, -value]));
     const txProps = {
         mint: negativeTokens,
-        witness: { extraSigners, scripts }
+        signingOptions: {
+            extraSigners
+        },
+        witness: { scripts }
     };
     const unsignedTx = await wallet.initializeTx(txProps);
     const finalizeProps = {
+        signingOptions: {
+            extraSigners
+        },
         tx: unsignedTx,
-        witness: { extraSigners, scripts }
+        witness: { scripts }
     };
     const signedTx = await wallet.finalizeTx(finalizeProps);
     await submitAndConfirm(wallet, signedTx);

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

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.32.7",
+  "version": "0.33.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.26.4",
-    "@cardano-sdk/cardano-services-client": "~0.17.8",
-    "@cardano-sdk/core": "~0.28.4",
+    "@cardano-sdk/cardano-services": "~0.26.6",
+    "@cardano-sdk/cardano-services-client": "~0.17.10",
+    "@cardano-sdk/core": "~0.29.0",
     "@cardano-sdk/crypto": "~0.1.21",
-    "@cardano-sdk/hardware-ledger": "~0.8.15",
-    "@cardano-sdk/hardware-trezor": "~0.4.15",
-    "@cardano-sdk/input-selection": "~0.12.22",
-    "@cardano-sdk/key-management": "~0.19.9",
-    "@cardano-sdk/ogmios": "~0.15.17",
-    "@cardano-sdk/tx-construction": "~0.17.12",
+    "@cardano-sdk/hardware-ledger": "~0.8.17",
+    "@cardano-sdk/hardware-trezor": "~0.4.17",
+    "@cardano-sdk/input-selection": "~0.12.24",
+    "@cardano-sdk/key-management": "~0.20.0",
+    "@cardano-sdk/ogmios": "~0.15.19",
+    "@cardano-sdk/tx-construction": "~0.18.0",
     "@cardano-sdk/util": "~0.15.0",
-    "@cardano-sdk/util-dev": "~0.19.15",
-    "@cardano-sdk/util-rxjs": "~0.7.6",
-    "@cardano-sdk/wallet": "~0.34.4",
+    "@cardano-sdk/util-dev": "~0.19.17",
+    "@cardano-sdk/util-rxjs": "~0.7.8",
+    "@cardano-sdk/wallet": "~0.35.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.11",
-    "@cardano-sdk/projection": "~0.11.7",
-    "@cardano-sdk/projection-typeorm": "~0.8.9",
-    "@cardano-sdk/web-extension": "~0.24.7",
+    "@cardano-sdk/dapp-connector": "~0.12.13",
+    "@cardano-sdk/projection": "~0.11.9",
+    "@cardano-sdk/projection-typeorm": "~0.8.11",
+    "@cardano-sdk/web-extension": "~0.25.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": "50e9558865b2c04d57d83d3dc1743224d5f21616"
+  "gitHead": "6bc727609bef9c9f194240ccaf03aa467af22d61"
 }

package/src/factories.ts

@@ -7,9 +7,10 @@ import {
   HDSequentialDiscovery,
   Milliseconds,
   ObservableWallet,
-  PersonalWallet,
   PollingConfig,
   SingleAddressDiscovery,
+  createPersonalWallet,
+  createSharedWallet,
   storage
 } from '@cardano-sdk/wallet';
 import {
@@ -286,6 +287,18 @@ export type GetWalletProps = {
   witnesser?: Witnesser;
 };
 
+export type GetSharedWalletProps = {
+  env: any;
+  logger: Logger;
+  name: string;
+  polling?: PollingConfig;
+  handlePolicyIds?: Cardano.PolicyId[];
+  stores?: storage.WalletStores;
+  witnesser: Witnesser;
+  paymentScript: Cardano.RequireAllOfScript | Cardano.RequireAnyOfScript | Cardano.RequireAtLeastScript;
+  stakingScript: Cardano.RequireAllOfScript | Cardano.RequireAnyOfScript | Cardano.RequireAtLeastScript;
+};
+
 /** Delays initializing tx when nearing the epoch boundary. Relies on system clock being accurate. */
 const patchInitializeTxToRespectEpochBoundary = <T extends ObservableWallet>(
   wallet: T,
@@ -360,7 +373,7 @@ export const getWallet = async (props: GetWalletProps) => {
       logger
     }));
   const bip32Account = await Bip32Account.fromAsyncKeyAgent(asyncKeyAgent);
-  const wallet = new PersonalWallet(
+  const wallet = createPersonalWallet(
     { name, polling },
     {
       ...providers,
@@ -381,4 +394,60 @@ export const getWallet = async (props: GetWalletProps) => {
   return { bip32Account, providers, wallet: patchInitializeTxToRespectEpochBoundary(wallet, maxInterval) };
 };
 
+/**
+ * Create a shared wallet instance given the environment variables.
+ *
+ * @param props Wallet configuration parameters.
+ * @returns an object containing the wallet and providers passed to it
+ */
+export const getSharedWallet = async (props: GetSharedWalletProps) => {
+  const { env, logger, name, polling, stores, paymentScript, stakingScript, witnesser } = props;
+  const providers = {
+    assetProvider: await assetProviderFactory.create(env.ASSET_PROVIDER, env.ASSET_PROVIDER_PARAMS, logger),
+    chainHistoryProvider: await chainHistoryProviderFactory.create(
+      env.CHAIN_HISTORY_PROVIDER,
+      env.CHAIN_HISTORY_PROVIDER_PARAMS,
+      logger
+    ),
+    handleProvider: await handleProviderFactory.create(env.HANDLE_PROVIDER, env.HANDLE_PROVIDER_PARAMS, logger),
+    networkInfoProvider: await networkInfoProviderFactory.create(
+      env.NETWORK_INFO_PROVIDER,
+      env.NETWORK_INFO_PROVIDER_PARAMS,
+      logger
+    ),
+    rewardsProvider: await rewardsProviderFactory.create(env.REWARDS_PROVIDER, env.REWARDS_PROVIDER_PARAMS, logger),
+    stakePoolProvider: await stakePoolProviderFactory.create(
+      env.STAKE_POOL_PROVIDER,
+      env.STAKE_POOL_PROVIDER_PARAMS,
+      logger
+    ),
+    txSubmitProvider: await txSubmitProviderFactory.create(
+      env.TX_SUBMIT_PROVIDER,
+      env.TX_SUBMIT_PROVIDER_PARAMS,
+      logger
+    ),
+    utxoProvider: await utxoProviderFactory.create(env.UTXO_PROVIDER, env.UTXO_PROVIDER_PARAMS, logger)
+  };
+  const wallet = createSharedWallet(
+    { name, polling },
+    {
+      ...providers,
+      logger,
+      paymentScript,
+      stakingScript,
+      stores,
+      witnesser
+    }
+  );
+
+  const [{ address, rewardAccount }] = await firstValueFrom(wallet.addresses$);
+  logger.info(`Created wallet "${wallet.name}": ${address}/${rewardAccount}`);
+
+  const maxInterval =
+    polling?.maxInterval ||
+    (polling?.interval && polling.interval * DEFAULT_POLLING_CONFIG.maxIntervalMultiplier) ||
+    DEFAULT_POLLING_CONFIG.maxInterval;
+  return { providers, wallet: patchInitializeTxToRespectEpochBoundary(wallet, maxInterval) };
+};
+
 export type TestWallet = Awaited<ReturnType<typeof getWallet>>;

package/src/tools/multi-delegation-data-gen/index.ts

@@ -15,8 +15,8 @@ import {
   waitForFundingWallet
 } from './utils';
 
+import { BaseWallet, DynamicChangeAddressResolver } from '@cardano-sdk/wallet';
 import { Cardano } from '@cardano-sdk/core';
-import { DynamicChangeAddressResolver, PersonalWallet } from '@cardano-sdk/wallet';
 import { roundRobinRandomImprove } from '@cardano-sdk/input-selection';
 import { walletReady } from '../../';
 import chalk from 'chalk';
@@ -37,7 +37,7 @@ const monitor = new TerminalProgressMonitor();
   }
 
   let exitCode = 0;
-  let fundingWallet: PersonalWallet | undefined;
+  let fundingWallet: BaseWallet | undefined;
 
   try {
     const config = await loadConfiguration(monitor);
@@ -72,8 +72,8 @@ const monitor = new TerminalProgressMonitor();
 
     monitor.startTask('Waiting for delegation to be updated on the wallet.');
     await rewardAccountStatuses(delegationWallet.delegation.rewardAccounts$, [
-      Cardano.StakeKeyStatus.Registering,
-      Cardano.StakeKeyStatus.Registered
+      Cardano.StakeCredentialStatus.Registering,
+      Cardano.StakeCredentialStatus.Registered
     ]);
     monitor.endTask('Delegation updated.', TaskResult.Success);
 

package/src/tools/multi-delegation-data-gen/utils/utils.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-console, max-statements, max-params, @typescript-eslint/no-floating-promises */
 import { ValueTransferConfig, configLoader } from './config';
 
+import { BaseWallet } from '@cardano-sdk/wallet';
 import { Cardano } from '@cardano-sdk/core';
 import { Files, Paths } from './files';
 import {
@@ -14,7 +15,6 @@ import {
   walletVariables
 } from '../../../';
 import { Observable, filter, firstValueFrom, map } from 'rxjs';
-import { PersonalWallet } from '@cardano-sdk/wallet';
 import { TaskResult, TerminalProgressMonitor } from './terminal-progress-monitor';
 import { logger } from '@cardano-sdk/util-dev';
 import { util } from '@cardano-sdk/key-management';
@@ -26,7 +26,7 @@ import chalk from 'chalk';
  * @param wallet The wallet to get the pools from.
  * @param count The requested number of pools.
  */
-const getPoolIds = async (wallet: PersonalWallet, count: number): Promise<Cardano.StakePool[]> => {
+const getPoolIds = async (wallet: BaseWallet, count: number): Promise<Cardano.StakePool[]> => {
   const activePools = await wallet.stakePoolProvider.queryStakePools({
     filters: { status: [Cardano.StakePoolStatus.Active] },
     pagination: { limit: count, startAt: 0 }
@@ -44,12 +44,12 @@ const getPoolIds = async (wallet: PersonalWallet, count: number): Promise<Cardan
  */
 export const rewardAccountStatuses = async (
   rewardAccounts$: Observable<Cardano.RewardAccountInfo[]>,
-  statuses: Cardano.StakeKeyStatus[],
+  statuses: Cardano.StakeCredentialStatus[],
   timeout = MINUTE
 ) =>
   firstValueFromTimed(
     rewardAccounts$.pipe(
-      map((accts) => accts.map(({ keyStatus }) => keyStatus)),
+      map((accts) => accts.map(({ credentialStatus }) => credentialStatus)),
       filter((statusArr) => statusArr.every((s) => statuses.includes(s)))
     ),
     `Timeout waiting for all reward accounts stake keys to be one of ${statuses.join('|')}`,
@@ -93,7 +93,7 @@ export const loadConfiguration = async (monitor: TerminalProgressMonitor) => {
  *
  * @param monitor The progress monitor
  */
-export const waitForFundingWallet = async (monitor: TerminalProgressMonitor): Promise<PersonalWallet> => {
+export const waitForFundingWallet = async (monitor: TerminalProgressMonitor): Promise<BaseWallet> => {
   monitor.startTask('Waiting for funding wallet to be ready.');
 
   const fundingWallet = (await getWallet({ env, idx: 0, logger, name: 'Funding wallet', polling: { interval: 500 } }))
@@ -146,8 +146,8 @@ export const createDelegationWallet = async (monitor: TerminalProgressMonitor) =
  * @param monitor The progress monitor.
  */
 export const transferStartingFunds = async (
-  fundingWallet: PersonalWallet,
-  delegationWallet: PersonalWallet,
+  fundingWallet: BaseWallet,
+  delegationWallet: BaseWallet,
   startingFunds: number,
   monitor: TerminalProgressMonitor
 ) => {
@@ -175,7 +175,7 @@ export const transferStartingFunds = async (
  * @param monitor The progress monitor.
  */
 export const distributeStake = async (
-  delegationWallet: PersonalWallet,
+  delegationWallet: BaseWallet,
   stakeDistribution: Array<number>,
   monitor: TerminalProgressMonitor
 ): Promise<Cardano.Cip17DelegationPortfolio> => {
@@ -205,7 +205,7 @@ export const distributeStake = async (
  * @param monitor The progress monitor.
  */
 export const logState = async (
-  delegationWallet: PersonalWallet,
+  delegationWallet: BaseWallet,
   iteration: number,
   outputPath: string,
   monitor: TerminalProgressMonitor
@@ -262,7 +262,7 @@ export const getOutputPathName = () =>
  * @param currentIteration the current iteration.
  */
 const transferValue = async (
-  wallet: PersonalWallet,
+  wallet: BaseWallet,
   targetAddress: Cardano.PaymentAddress,
   config: ValueTransferConfig,
   currentIteration: number
@@ -297,8 +297,8 @@ const transferValue = async (
  * @param monitor The progress monitor.
  */
 export const sendTransactions = async (
-  fundingWallet: PersonalWallet,
-  delegationWallet: PersonalWallet,
+  fundingWallet: BaseWallet,
+  delegationWallet: BaseWallet,
   inputsConfig: ValueTransferConfig,
   outputsConfig: ValueTransferConfig,
   iteration: number,

package/src/util/handle-util.ts

@@ -138,15 +138,21 @@ export const mint = async (
     auxiliaryData,
     mint: tokens,
     outputs,
-    witness: { extraSigners: [policySigner], scripts: [policyScript] }
+    signingOptions: {
+      extraSigners: [policySigner]
+    },
+    witness: { scripts: [policyScript] }
   };
 
   const unsignedTx = await wallet.initializeTx(txProps);
 
   const finalizeProps: FinalizeTxProps = {
     auxiliaryData,
+    signingOptions: {
+      extraSigners: [policySigner]
+    },
     tx: unsignedTx,
-    witness: { extraSigners: [policySigner], scripts: [policyScript] }
+    witness: { scripts: [policyScript] }
   };
 
   const signedTx = await wallet.finalizeTx(finalizeProps);

package/src/util/util.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as Crypto from '@cardano-sdk/crypto';
-import { Cardano, createSlotEpochCalc } from '@cardano-sdk/core';
+import { BaseWallet, FinalizeTxProps, ObservableWallet } from '@cardano-sdk/wallet';
+import { Cardano, Serialization, createSlotEpochCalc } from '@cardano-sdk/core';
 import {
   EMPTY,
   Observable,
@@ -17,7 +18,6 @@ import {
   timeout
 } from 'rxjs';
 import { FAST_OPERATION_TIMEOUT_DEFAULT, SYNC_TIMEOUT_DEFAULT } from '../defaults';
-import { FinalizeTxProps, ObservableWallet, PersonalWallet } from '@cardano-sdk/wallet';
 import { InMemoryKeyAgent, TransactionSigner } from '@cardano-sdk/key-management';
 import { InitializeTxProps } from '@cardano-sdk/tx-construction';
 import { TestWallet, networkInfoProviderFactory } from '../factories';
@@ -76,12 +76,15 @@ const sortTxIn = (txInCollection: Cardano.TxIn[] | undefined): Cardano.TxIn[] =>
   sortBy(txInCollection, ['txId', 'index']);
 
 export const normalizeTxBody = (body: Cardano.HydratedTxBody | Cardano.TxBody) => {
+  const dehydratedTx = Serialization.TransactionBody.fromCore(body).toCore();
+
   // TODO: inputs should be a Set since they're unordered.
   // Then Jest should correctly compare it with toEqual.
-  body.inputs = sortTxIn(body.inputs);
-  body.collaterals = sortTxIn(body.collaterals);
-  body.referenceInputs = sortTxIn(body.referenceInputs);
-  return body;
+  dehydratedTx.inputs = sortTxIn(dehydratedTx.inputs);
+  dehydratedTx.collaterals = sortTxIn(dehydratedTx.collaterals);
+  dehydratedTx.referenceInputs = sortTxIn(dehydratedTx.referenceInputs);
+
+  return dehydratedTx;
 };
 
 export const txConfirmed = (
@@ -189,7 +192,7 @@ export const runningAgainstLocalNetwork = async () => {
  * @param tx The **already confirmed** transaction we need to know the confirmation epoch
  * @returns The epoch when the given transaction was confirmed
  */
-export const getTxConfirmationEpoch = async (wallet: PersonalWallet, tx: Cardano.Tx<Cardano.TxBody>) => {
+export const getTxConfirmationEpoch = async (wallet: ObservableWallet, tx: Cardano.Tx<Cardano.TxBody>) => {
   const txs = await firstValueFrom(wallet.transactions.history$.pipe(filter((_) => _.some(({ id }) => id === tx.id))));
   const observedTx = txs.find(({ id }) => id === tx.id);
   const slotEpochCalc = createSlotEpochCalc(await firstValueFrom(wallet.eraSummaries$));
@@ -254,7 +257,7 @@ export const burnTokens = async ({
   scripts,
   policySigners: extraSigners
 }: {
-  wallet: PersonalWallet;
+  wallet: BaseWallet;
   tokens?: Cardano.TokenMap;
   scripts: Cardano.Script[];
   policySigners: TransactionSigner[];
@@ -270,14 +273,20 @@ export const burnTokens = async ({
   const negativeTokens = new Map([...tokens].map(([assetId, value]) => [assetId, -value]));
   const txProps: InitializeTxProps = {
     mint: negativeTokens,
-    witness: { extraSigners, scripts }
+    signingOptions: {
+      extraSigners
+    },
+    witness: { scripts }
   };
 
   const unsignedTx = await wallet.initializeTx(txProps);
 
   const finalizeProps: FinalizeTxProps = {
+    signingOptions: {
+      extraSigners
+    },
     tx: unsignedTx,
-    witness: { extraSigners, scripts }
+    witness: { scripts }
   };
 
   const signedTx = await wallet.finalizeTx(finalizeProps);

package/test/artillery/wallet-restoration/types.ts

@@ -1,11 +1,11 @@
+import { BaseWallet } from '@cardano-sdk/wallet';
 import { GroupedAddress } from '@cardano-sdk/key-management';
-import { PersonalWallet } from '@cardano-sdk/wallet';
 
 /** The context variables shared between all the hooks. */
 export interface WalletVars {
   walletLoads: number;
   addresses: GroupedAddress[];
-  currentWallet: PersonalWallet;
+  currentWallet: BaseWallet;
 }
 
 export interface AddressesModel {

package/test/load-test-custom/wallet-init/wallet-init.test.ts

@@ -5,8 +5,8 @@ import path from 'path';
 // This line must come before loading the env, to configure the location of the .env file
 dotenv.config({ path: path.join(__dirname, '../../../.env') });
 
+import { BaseWallet, createPersonalWallet } from '@cardano-sdk/wallet';
 import { Logger } from 'ts-log';
-import { PersonalWallet } from '@cardano-sdk/wallet';
 import { bufferCount, bufferTime, from, mergeAll, tap } from 'rxjs';
 import { logger } from '@cardano-sdk/util-dev';
 
@@ -77,14 +77,14 @@ const getKeyAgent = async (accountIndex: number) => {
   return { keyAgent };
 };
 
-const createWallet = async (accountIndex: number): Promise<PersonalWallet> => {
+const createWallet = async (accountIndex: number): Promise<BaseWallet> => {
   measurementUtil.addStartMarker(MeasureTarget.keyAgent, accountIndex);
   const providers = await getProviders();
   const { keyAgent } = await getKeyAgent(accountIndex);
   measurementUtil.addMeasureMarker(MeasureTarget.keyAgent, accountIndex);
 
   measurementUtil.addStartMarker(MeasureTarget.wallet, accountIndex);
-  return new PersonalWallet(
+  return createPersonalWallet(
     { name: `Wallet ${accountIndex}` },
     {
       ...providers,
@@ -111,7 +111,7 @@ const showResults = () => {
 measurementUtil.start();
 
 // Simple scheduler that distributes the requested number of calls evenly in the duration time
-getLoadTestScheduler<PersonalWallet>(
+getLoadTestScheduler<BaseWallet>(
   {
     // callUnderTest must be a method returning an observable
     callUnderTest: (id) => from(initWallet(id)),