npm - @cardano-sdk/wallet - Versions diffs - 0.26.1 → 0.27.1 - Mend

@cardano-sdk/wallet 0.26.1 → 0.27.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (93) hide show

package/dist/cjs/types.d.ts CHANGED Viewed

@@ -2,20 +2,21 @@ import { Asset, Cardano, EpochInfo, EraSummary, HandleResolution, NetworkInfoPro
 import { BalanceTracker, DelegationTracker, TransactionsTracker, UtxoTracker } from './services';
 import { Cip30DataSignature } from '@cardano-sdk/dapp-connector';
 import { Ed25519PublicKeyHex } from '@cardano-sdk/crypto';
-import { GroupedAddress, cip8 } from '@cardano-sdk/key-management';
+import { GroupedAddress, SignTransactionOptions, cip8 } from '@cardano-sdk/key-management';
 import { InitializeTxProps, InitializeTxResult, SignedTx, TxBuilder, TxContext } from '@cardano-sdk/tx-construction';
 import { Observable } from 'rxjs';
 import { PubStakeKeyAndStatus } from './services/PublicStakeKeysTracker';
 import { Shutdown } from '@cardano-sdk/util';
 export declare type Assets = Map<Cardano.AssetId, Asset.AssetInfo>;
-export declare type SignDataProps = Omit<cip8.Cip30SignDataRequest, 'addressManager' | 'witnesser'>;
+export declare type SignDataProps = Omit<cip8.Cip30SignDataRequest, 'knownAddresses' | 'witnesser'>;
 export interface SyncStatus extends Shutdown {
     isAnyRequestPending$: Observable<boolean>;
     isUpToDate$: Observable<boolean>;
     isSettled$: Observable<boolean>;
 }
-export declare type FinalizeTxProps = Omit<TxContext, 'ownAddresses'> & {
+export declare type FinalizeTxProps = Omit<TxContext, 'signingContext'> & {
     tx: Cardano.TxBodyWithHash;
+    signingOptions?: SignTransactionOptions;
 };
 export declare type HandleInfo = HandleResolution & Asset.AssetInfo;
 export interface ObservableWallet {
@@ -41,6 +42,7 @@ export interface ObservableWallet {
     signData(props: SignDataProps): Promise<Cip30DataSignature>;
     submitTx(tx: Cardano.Tx | TxCBOR | SignedTx): Promise<Cardano.TransactionId>;
     createTxBuilder(): TxBuilder;
+    discoverAddresses(): Promise<GroupedAddress[]>;
     shutdown(): void;
 }
 export declare type WalletNetworkInfoProvider = Pick<NetworkInfoProvider, 'protocolParameters' | 'ledgerTip' | 'genesisParameters' | 'eraSummaries'>;

package/dist/cjs/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,OAAO,EACP,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,mBAAmB,EACnB,MAAM,EACP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACjG,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;~~AACnE~~,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,oBAAY,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;AAE3D,oBAAY,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,gBAAgB,GAAG,WAAW,CAAC,CAAC;AAE5F,MAAM,WAAW,UAAW,SAAQ,QAAQ;IAM1C,oBAAoB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAO1C,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAOjC,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;CACjC;AAED,oBAAY,eAAe,GAAG,IAAI,CAAC,SAAS,EAAE,~~cAAc~~,CAAC,GAAG;~~IAC9D~~,EAAE,EAAE,OAAO,CAAC,cAAc,CAAC;~~CAC5B~~,CAAC;AAEF,oBAAY,UAAU,GAAG,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAC;AAE5D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC;IAC3C,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvC,QAAQ,CAAC,kBAAkB,EAAE,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAChE,QAAQ,CAAC,aAAa,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;IACjD,QAAQ,CAAC,aAAa,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IAC9C,QAAQ,CAAC,mBAAmB,EAAE,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACrE,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC;IAClD,QAAQ,CAAC,gBAAgB,EAAE,UAAU,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC9D,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;IAE5C,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAMxC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAEhC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAG3B,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAK9C,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAEpE,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAIxD,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAI5D,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAG7E,eAAe,IAAI,SAAS,CAAC;~~IAE7B~~,QAAQ,IAAI,IAAI,CAAC;CAClB;AAED,oBAAY,yBAAyB,GAAG,IAAI,CAC1C,mBAAmB,EACnB,oBAAoB,GAAG,WAAW,GAAG,mBAAmB,GAAG,cAAc,CAC1E,CAAC"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}

package/dist/esm/PersonalWallet/PersonalWallet.d.ts CHANGED Viewed

@@ -3,11 +3,11 @@ import { AssetProvider, Cardano, ChainHistoryProvider, EpochInfo, EraSummary, Ha
 import { Assets, FinalizeTxProps, HandleInfo, ObservableWallet, SignDataProps, SyncStatus, WalletNetworkInfoProvider } from '../types';
 import { BehaviorObservable, TrackerSubject } from '@cardano-sdk/util-rxjs';
 import { Observable, Subject } from 'rxjs';
+import { Bip32Account, GroupedAddress, Witnesser } from '@cardano-sdk/key-management';
 import { ChangeAddressResolver, InputSelector } from '@cardano-sdk/input-selection';
 import { Cip30DataSignature } from '@cardano-sdk/dapp-connector';
 import { Ed25519PublicKeyHex } from '@cardano-sdk/crypto';
 import { GenericTxBuilder, InitializeTxProps, InitializeTxResult, SignedTx, TxBuilderDependencies } from '@cardano-sdk/tx-construction';
-import { GroupedAddress, Witnesser, util as keyManagementUtil } from '@cardano-sdk/key-management';
 import { Logger } from 'ts-log';
 import { PubStakeKeyAndStatus } from '../services/PublicStakeKeysTracker';
 import { RetryBackoffConfig } from 'backoff-rxjs';
@@ -21,7 +21,7 @@ export interface PersonalWalletProps {
 }
 export interface PersonalWalletDependencies {
     readonly witnesser: Witnesser;
-    readonly addressManager: keyManagementUtil.Bip32Ed25519AddressManager;
+    readonly bip32Account: Bip32Account;
     readonly txSubmitProvider: TxSubmitProvider;
     readonly stakePoolProvider: StakePoolProvider;
     readonly assetProvider: AssetProvider;
@@ -48,7 +48,7 @@ export declare const DEFAULT_LOOK_AHEAD_SEARCH = 20;
 export declare class PersonalWallet implements ObservableWallet {
     #private;
     readonly witnesser: Witnesser;
-    readonly addressManager: keyManagementUtil.Bip32Ed25519AddressManager;
+    readonly bip32Account: Bip32Account;
     readonly currentEpoch$: TrackerSubject<EpochInfo>;
     readonly txSubmitProvider: TxSubmitProvider;
     readonly utxoProvider: TrackedUtxoProvider;
@@ -62,7 +62,7 @@ export declare class PersonalWallet implements ObservableWallet {
     readonly delegation: DelegationTracker & Shutdown;
     readonly tip$: BehaviorObservable<Cardano.Tip>;
     readonly eraSummaries$: TrackerSubject<EraSummary[]>;
-    readonly addresses$: TrackerSubject<GroupedAddress[]>;
+    readonly addresses$: Observable<GroupedAddress[]>;
     readonly protocolParameters$: TrackerSubject<Cardano.ProtocolParameters>;
     readonly genesisParameters$: TrackerSubject<Cardano.CompactGenesis>;
     readonly assetInfo$: TrackerSubject<Assets>;
@@ -76,7 +76,7 @@ export declare class PersonalWallet implements ObservableWallet {
     readonly publicStakeKeys$: TrackerSubject<PubStakeKeyAndStatus[]>;
     private drepPubKey;
     handles$: Observable<HandleInfo[]>;
-    constructor({ name, polling: { interval: pollInterval, maxInterval, consideredOutOfSyncAfter }, retryBackoffConfig }: PersonalWalletProps, { txSubmitProvider, stakePoolProvider, witnesser, addressManager, assetProvider, handleProvider, networkInfoProvider, utxoProvider, chainHistoryProvider, rewardsProvider, logger, inputSelector, stores, connectionStatusTracker$, addressDiscovery }: PersonalWalletDependencies);
+    constructor({ name, polling: { interval: pollInterval, maxInterval, consideredOutOfSyncAfter }, retryBackoffConfig }: PersonalWalletProps, { txSubmitProvider, stakePoolProvider, witnesser, bip32Account: addressManager, assetProvider, handleProvider, networkInfoProvider, utxoProvider, chainHistoryProvider, rewardsProvider, logger, inputSelector, stores, connectionStatusTracker$, addressDiscovery }: PersonalWalletDependencies);
     getName(): Promise<string>;
     initializeTx(props: InitializeTxProps): Promise<InitializeTxResult>;
     finalizeTx({ tx, ...rest }: FinalizeTxProps, stubSign?: boolean): Promise<Cardano.Tx>;
@@ -90,5 +90,6 @@ export declare class PersonalWallet implements ObservableWallet {
     getInputSelector(): InputSelector;
     getTxBuilderDependencies(): TxBuilderDependencies;
     getPubDRepKey(): Promise<Ed25519PublicKeyHex>;
+    discoverAddresses(): Promise<GroupedAddress[]>;
 }
 //# sourceMappingURL=PersonalWallet.d.ts.map

package/dist/esm/PersonalWallet/PersonalWallet.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PersonalWallet.d.ts","sourceRoot":"","sources":["../../../src/PersonalWallet/PersonalWallet.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,~~EAChB~~,cAAc,EAEd,uBAAuB,EACvB,iBAAiB,EAIjB,UAAU,EAEV,aAAa,EAGb,oBAAoB,EACpB,2BAA2B,EAC3B,sBAAsB,EACtB,wBAAwB,EAExB,mBAAmB,EACnB,gCAAgC,EAEhC,mBAAmB,EACnB,WAAW,EACX,UAAU,EAeX,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,aAAa,EACb,OAAO,EAEP,oBAAoB,EACpB,SAAS,EACT,UAAU,EACV,cAAc,EAEd,eAAe,EAEf,iBAAiB,EACjB,MAAM,EACN,gBAAgB,EAChB,YAAY,EACb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,MAAM,EACN,eAAe,EACf,UAAU,EACV,gBAAgB,EAChB,aAAa,EACb,UAAU,EACV,yBAAyB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAA0B,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAGL,UAAU,EACV,OAAO,~~EAaR~~,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAA2B,MAAM,8BAA8B,CAAC;AAC7G,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAElB,QAAQ,EACR,qBAAqB,EAGtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,~~cAAc,EAAE,SAAS,EAAQ,IAAI,IAAI,iBAAiB,EAAE,~~MAAM,~~6BAA6B,CAAC;AACzG,OAAO,~~EAAE,MAAM,~~EAAE,MAAM,~~QAAQ,CAAC;AAChC,OAAO,EAAE,oBAAoB,EAAgC,MAAM,oCAAoC,CAAC;AACxG,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,QAAQ,EAA6B,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,YAAY,EAA8B,MAAM,gBAAgB,CAAC;AAG1E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAEnF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IACjC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CAClD;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,~~cAAc~~,EAAE,~~iBAAiB~~,CAAC~~,0BAA0B,CAAC~~;~~IACtE~~,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,sBAAsB,CAAC;IAClE,QAAQ,CAAC,mBAAmB,EAAE,yBAAyB,CAAC;IACxD,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACpD,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACvC,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,wBAAwB,CAAC,EAAE,uBAAuB,CAAC;IAC5D,QAAQ,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CAC9C;AAED,MAAM,WAAW,eAAe;IAC9B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,eAAO,MAAM,sBAAsB;;;;CAIlC,CAAC;AAEF,eAAO,MAAM,yBAAyB,KAAK,CAAC;AA4C5C,qBAAa,cAAe,YAAW,gBAAgB;;~~IAerD~~,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,~~cAAc~~,EAAE,~~iBAAiB~~,CAAC~~,0BAA0B,CAAC~~;~~IACtE~~,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IAClD,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC;IAC3C,QAAQ,CAAC,mBAAmB,EAAE,gCAAgC,CAAC;IAC/D,QAAQ,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IACrD,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAC7C,QAAQ,CAAC,oBAAoB,EAAE,2BAA2B,CAAC;IAC3D,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,GAAG,QAAQ,CAAC;IACtD,QAAQ,CAAC,UAAU,EAAE,iBAAiB,GAAG,QAAQ,CAAC;IAClD,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/C,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC,UAAU,EAAE,CAAC,CAAC;IACrD,QAAQ,CAAC,UAAU,EAAE,~~cAAc~~,CAAC,cAAc,EAAE,CAAC,CAAC;~~IACtD~~,QAAQ,CAAC,mBAAmB,EAAE,cAAc,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACzE,QAAQ,CAAC,kBAAkB,EAAE,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACpE,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAC5C,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,eAAe,EAAE,sBAAsB,CAAC;IACjD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IACtD,QAAQ,CAAC,gBAAgB,EAAE,cAAc,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAClE,OAAO,CAAC,UAAU,CAAsB;IACxC,QAAQ,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;gBAIjC,EACE,IAAI,EACJ,OAAO,EAAE,EACP,QAAQ,EAAE,YAAkD,EAC5D,WAAyE,EACzE,wBAAwC,EACpC,EACN,kBAGC,EACF,EAAE,mBAAmB,EACtB,EACE,gBAAgB,EAChB,iBAAiB,EACjB,SAAS,EACT,cAAc,~~EACd~~,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,oBAAoB,EACpB,eAAe,EACf,MAAM,EACN,aAAa,EACb,MAAqC,EACrC,wBAAgE,EAChE,gBAA6F,EAC9F,EAAE,0BAA0B;~~IA2QzB~~,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1B,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAInE,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,EAAE,eAAe,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;~~IAUzF~~,OAAO,CAAC,iBAAiB;IAUzB,eAAe;IA6CT,QAAQ,CACZ,KAAK,EAAE,OAAO,CAAC,EAAE,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,EAClD,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;~~IAqBjC~~,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC;~~IAU3D~~,IAAI;IAGJ,QAAQ;~~IAmCR~~,gBAAgB,CAAC,QAAQ,EAAE,aAAa;IAKxC,gBAAgB;IAQhB,wBAAwB,IAAI,qBAAqB;~~IAiC3C~~,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC;~~CAWpD~~"}
1	+ {"version":3,"file":"PersonalWallet.d.ts","sourceRoot":"","sources":["../../../src/PersonalWallet/PersonalWallet.ts"],"names":[],"mappings":"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"}

package/dist/esm/PersonalWallet/PersonalWallet.js CHANGED Viewed

@@ -9,14 +9,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PersonalWallet_instances, _PersonalWallet_inputSelector, _PersonalWallet_logger, _PersonalWallet_tip$, _PersonalWallet_newTransactions, _PersonalWallet_reemitSubscriptions, _PersonalWallet_failedFromReemitter$, _PersonalWallet_trackedTxSubmitProvider, _PersonalWallet_addressDiscovery, _PersonalWallet_submittingPromises, _PersonalWallet_submitTx, _PersonalWallet_isTxInFlight, _PersonalWallet_firstValueFromSettled;
-import { ConnectionStatus, DynamicChangeAddressResolver, HDSequentialDiscovery, PersistentDocumentTrackerSubject, SmartTxSubmitProvider, TipTracker, TrackedAssetProvider, TrackedChainHistoryProvider, TrackedRewardsProvider, TrackedStakePoolProvider, TrackedTxSubmitProvider, TrackedUtxoProvider, TrackedWalletNetworkInfoProvider, TransactionFailure, createAssetsTracker, createBalanceTracker, createDelegationTracker, createHandlesTracker, createProviderStatusTracker, createSimpleConnectionStatusTracker, createTransactionReemitter, createTransactionsTracker, createUtxoTracker, createWalletUtil, currentEpochTracker, distinctBlock, distinctEraSummaries, groupedAddressesEquals } from '../services';
+var _PersonalWallet_instances, _PersonalWallet_inputSelector, _PersonalWallet_logger, _PersonalWallet_tip$, _PersonalWallet_newTransactions, _PersonalWallet_reemitSubscriptions, _PersonalWallet_failedFromReemitter$, _PersonalWallet_trackedTxSubmitProvider, _PersonalWallet_addressTracker, _PersonalWallet_addressDiscovery, _PersonalWallet_submittingPromises, _PersonalWallet_submitTx, _PersonalWallet_isTxInFlight, _PersonalWallet_firstValueFromSettled;
+import { ConnectionStatus, DynamicChangeAddressResolver, HDSequentialDiscovery, PersistentDocumentTrackerSubject, SmartTxSubmitProvider, TipTracker, TrackedAssetProvider, TrackedChainHistoryProvider, TrackedRewardsProvider, TrackedStakePoolProvider, TrackedTxSubmitProvider, TrackedUtxoProvider, TrackedWalletNetworkInfoProvider, TransactionFailure, createAddressTracker, createAssetsTracker, createBalanceTracker, createDelegationTracker, createHandlesTracker, createProviderStatusTracker, createSimpleConnectionStatusTracker, createTransactionReemitter, createTransactionsTracker, createUtxoTracker, createWalletUtil, currentEpochTracker, distinctBlock, distinctEraSummaries } from '../services';
 import { CardanoNodeUtil, ProviderError, Serialization, TxCBOR } from '@cardano-sdk/core';
-import { TrackerSubject, coldObservableProvider } from '@cardano-sdk/util-rxjs';
-import { BehaviorSubject, EMPTY, Subject, Subscription, catchError, concat, distinctUntilChanged, filter, firstValueFrom, from, map, mergeMap, switchMap, tap, throwError } from 'rxjs';
+import { coldObservableProvider } from '@cardano-sdk/util-rxjs';
+import { BehaviorSubject, EMPTY, Subject, Subscription, catchError, filter, firstValueFrom, from, map, mergeMap, switchMap, take, tap, throwError } from 'rxjs';
+import { cip8, util as keyManagementUtil, util } from '@cardano-sdk/key-management';
 import { roundRobinRandomImprove } from '@cardano-sdk/input-selection';
 import { GenericTxBuilder, InvalidConfigurationError, finalizeTx, initializeTx } from '@cardano-sdk/tx-construction';
-import { cip8, util as keyManagementUtil } from '@cardano-sdk/key-management';
 import { createPublicStakeKeysTracker } from '../services/PublicStakeKeysTracker';
 import { contextLogger, deepEquals } from '@cardano-sdk/util';
 import { createInMemoryWalletStores } from '../persistence';
@@ -62,7 +62,7 @@ export class PersonalWallet {
     constructor({ name, polling: { interval: pollInterval = DEFAULT_POLLING_CONFIG.pollInterval, maxInterval = pollInterval * DEFAULT_POLLING_CONFIG.maxIntervalMultiplier, consideredOutOfSyncAfter = 1000 * 60 * 3 } = {}, retryBackoffConfig = {
         initialInterval: Math.min(pollInterval, 1000),
         maxInterval
-    } }, { txSubmitProvider, stakePoolProvider, witnesser, addressManager, assetProvider, handleProvider, networkInfoProvider, utxoProvider, chainHistoryProvider, rewardsProvider, logger, inputSelector, stores = createInMemoryWalletStores(), connectionStatusTracker$ = createSimpleConnectionStatusTracker(), addressDiscovery = new HDSequentialDiscovery(chainHistoryProvider, DEFAULT_LOOK_AHEAD_SEARCH) }) {
+    } }, { txSubmitProvider, stakePoolProvider, witnesser, bip32Account: addressManager, assetProvider, handleProvider, networkInfoProvider, utxoProvider, chainHistoryProvider, rewardsProvider, logger, inputSelector, stores = createInMemoryWalletStores(), connectionStatusTracker$ = createSimpleConnectionStatusTracker(), addressDiscovery = new HDSequentialDiscovery(chainHistoryProvider, DEFAULT_LOOK_AHEAD_SEARCH) }) {
         _PersonalWallet_instances.add(this);
         _PersonalWallet_inputSelector.set(this, void 0);
         _PersonalWallet_logger.set(this, void 0);
@@ -75,10 +75,10 @@ export class PersonalWallet {
         _PersonalWallet_reemitSubscriptions.set(this, void 0);
         _PersonalWallet_failedFromReemitter$.set(this, void 0);
         _PersonalWallet_trackedTxSubmitProvider.set(this, void 0);
+        _PersonalWallet_addressTracker.set(this, void 0);
         _PersonalWallet_addressDiscovery.set(this, void 0);
         _PersonalWallet_submittingPromises.set(this, {});
         __classPrivateFieldSet(this, _PersonalWallet_logger, contextLogger(logger, name), "f");
-        __classPrivateFieldSet(this, _PersonalWallet_addressDiscovery, addressDiscovery, "f");
         __classPrivateFieldSet(this, _PersonalWallet_trackedTxSubmitProvider, new TrackedTxSubmitProvider(txSubmitProvider), "f");
         this.utxoProvider = new TrackedUtxoProvider(utxoProvider);
         this.networkInfoProvider = new TrackedWalletNetworkInfoProvider(networkInfoProvider);
@@ -96,23 +96,27 @@ export class PersonalWallet {
             stakePoolProvider: this.stakePoolProvider,
             utxoProvider: this.utxoProvider
         }, { consideredOutOfSyncAfter });
-        this.addressManager = addressManager;
+        this.bip32Account = addressManager;
         this.witnesser = witnesser;
         this.fatalError$ = new Subject();
         const onFatalError = this.fatalError$.next.bind(this.fatalError$);
         this.name = name;
         const cancel$ = connectionStatusTracker$.pipe(tap((status) => (status === ConnectionStatus.up ? 'Connection UP' : 'Connection DOWN')), filter((status) => status === ConnectionStatus.down));
-        this.addresses$ = new TrackerSubject(concat(stores.addresses.get(), this.addressManager.knownAddresses$.pipe(distinctUntilChanged(groupedAddressesEquals), tap((addresses) => {
-            if (addresses.length === 0) {
-                __classPrivateFieldGet(this, _PersonalWallet_logger, "f").debug('No addresses available; initiating address discovery process');
-                firstValueFrom(coldObservableProvider({
-                    cancel$,
-                    onFatalError,
-                    provider: () => __classPrivateFieldGet(this, _PersonalWallet_addressDiscovery, "f").discover(this.addressManager),
-                    retryBackoffConfig
-                })).catch(() => __classPrivateFieldGet(this, _PersonalWallet_logger, "f").error('Failed to complete the address discovery process'));
-            }
-        }), filter((addresses) => addresses.length > 0), tap(stores.addresses.set.bind(stores.addresses)))));
+        __classPrivateFieldSet(this, _PersonalWallet_addressDiscovery, addressDiscovery, "f");
+        __classPrivateFieldSet(this, _PersonalWallet_addressTracker, createAddressTracker({
+            addressDiscovery$: coldObservableProvider({
+                cancel$,
+                onFatalError,
+                provider: () => addressDiscovery.discover(this.bip32Account),
+                retryBackoffConfig
+            }).pipe(take(1), catchError((error) => {
+                __classPrivateFieldGet(this, _PersonalWallet_logger, "f").error('Failed to complete the address discovery process', error);
+                throw error;
+            })),
+            logger: __classPrivateFieldGet(this, _PersonalWallet_logger, "f"),
+            store: stores.addresses
+        }), "f");
+        this.addresses$ = __classPrivateFieldGet(this, _PersonalWallet_addressTracker, "f").addresses$;
         __classPrivateFieldSet(this, _PersonalWallet_tip$, this.tip$ = new TipTracker({
             connectionStatus$: connectionStatusTracker$,
             logger: contextLogger(__classPrivateFieldGet(this, _PersonalWallet_logger, "f"), 'tip$'),
@@ -205,7 +209,7 @@ export class PersonalWallet {
         this.delegation = createDelegationTracker({
             epoch$,
             eraSummaries$,
-            knownAddresses$: this.addressManager.knownAddresses$,
+            knownAddresses$: this.addresses$,
             logger: contextLogger(__classPrivateFieldGet(this, _PersonalWallet_logger, "f"), 'delegation'),
             onFatalError,
             retryBackoffConfig,
@@ -222,8 +226,8 @@ export class PersonalWallet {
                 changeAddressResolver: new DynamicChangeAddressResolver(this.syncStatus.isSettled$.pipe(filter((isSettled) => isSettled), switchMap(() => this.addresses$)), this.delegation.distribution$, () => firstValueFrom(this.delegation.portfolio$), logger)
             }), "f");
         this.publicStakeKeys$ = createPublicStakeKeysTracker({
-            addressManager: this.addressManager,
             addresses$: this.addresses$,
+            bip32Account: this.bip32Account,
             rewardAccounts$: this.delegation.rewardAccounts$
         });
         this.balance = createBalanceTracker(this.protocolParameters$, this.utxo, this.delegation);
@@ -257,7 +261,14 @@ export class PersonalWallet {
         return initializeTx(props, this.getTxBuilderDependencies());
     }
     async finalizeTx({ tx, ...rest }, stubSign = false) {
-        const { tx: signedTx } = await finalizeTx(tx, { ...rest, ownAddresses: await firstValueFrom(this.addresses$) }, { addressManager: this.addressManager, inputResolver: this.util, witnesser: this.witnesser }, stubSign);
+        const knownAddresses = await firstValueFrom(this.addresses$);
+        const { tx: signedTx } = await finalizeTx(tx, {
+            ...rest,
+            signingContext: {
+                knownAddresses,
+                txInKeyPathMap: await util.createTxInKeyPathMap(tx.body, knownAddresses, this.util)
+            }
+        }, { bip32Account: this.bip32Account, witnesser: this.witnesser }, stubSign);
         return signedTx;
     }
     initializeHandles(handlePolicyIds$) {
@@ -289,9 +300,9 @@ export class PersonalWallet {
             return outgoingTx.id;
         })());
     }
-    signData(props) {
+    async signData(props) {
         return cip8.cip30signData({
-            addressManager: this.addressManager,
+            knownAddresses: await firstValueFrom(this.addresses$),
             witnesser: this.witnesser,
             ...props
         });
@@ -306,7 +317,7 @@ export class PersonalWallet {
         this.protocolParameters$.complete();
         this.genesisParameters$.complete();
         __classPrivateFieldGet(this, _PersonalWallet_tip$, "f").complete();
-        this.addresses$.complete();
+        __classPrivateFieldGet(this, _PersonalWallet_addressTracker, "f").shutdown();
         this.assetProvider.stats.shutdown();
         __classPrivateFieldGet(this, _PersonalWallet_trackedTxSubmitProvider, "f").stats.shutdown();
         this.networkInfoProvider.stats.shutdown();
@@ -314,7 +325,6 @@ export class PersonalWallet {
         this.utxoProvider.stats.shutdown();
         this.rewardsProvider.stats.shutdown();
         this.chainHistoryProvider.stats.shutdown();
-        this.addressManager.shutdown();
         this.currentEpoch$.complete();
         this.delegation.shutdown();
         this.assetInfo$.complete();
@@ -336,13 +346,17 @@ export class PersonalWallet {
     }
     getTxBuilderDependencies() {
         return {
-            addressManager: this.addressManager,
+            bip32Account: this.bip32Account,
             handleProvider: this.handleProvider,
             inputResolver: this.util,
             inputSelector: __classPrivateFieldGet(this, _PersonalWallet_inputSelector, "f"),
             logger: __classPrivateFieldGet(this, _PersonalWallet_logger, "f"),
             outputValidator: this.util,
             txBuilderProviders: {
+                addresses: {
+                    add: (...newAddresses) => firstValueFrom(__classPrivateFieldGet(this, _PersonalWallet_addressTracker, "f").addAddresses(newAddresses)),
+                    get: () => firstValueFrom(this.addresses$)
+                },
                 genesisParameters: () => __classPrivateFieldGet(this, _PersonalWallet_instances, "m", _PersonalWallet_firstValueFromSettled).call(this, this.genesisParameters$),
                 protocolParameters: () => __classPrivateFieldGet(this, _PersonalWallet_instances, "m", _PersonalWallet_firstValueFromSettled).call(this, this.protocolParameters$),
                 rewardAccounts: () => __classPrivateFieldGet(this, _PersonalWallet_instances, "m", _PersonalWallet_firstValueFromSettled).call(this, this.delegation.rewardAccounts$),
@@ -355,7 +369,7 @@ export class PersonalWallet {
     async getPubDRepKey() {
         if (!this.drepPubKey) {
             try {
-                this.drepPubKey = await this.addressManager.derivePublicKey(keyManagementUtil.DREP_KEY_DERIVATION_PATH);
+                this.drepPubKey = (await this.bip32Account.derivePublicKey(keyManagementUtil.DREP_KEY_DERIVATION_PATH)).hex();
             }
             catch (error) {
                 __classPrivateFieldGet(this, _PersonalWallet_logger, "f").error(error);
@@ -364,8 +378,15 @@ export class PersonalWallet {
         }
         return Promise.resolve(this.drepPubKey);
     }
+    async discoverAddresses() {
+        const addresses = await __classPrivateFieldGet(this, _PersonalWallet_addressDiscovery, "f").discover(this.bip32Account);
+        const knownAddresses = await firstValueFrom(this.addresses$);
+        const newAddresses = addresses.filter(({ address }) => !knownAddresses.some((knownAddr) => knownAddr.address === address));
+        await firstValueFrom(__classPrivateFieldGet(this, _PersonalWallet_addressTracker, "f").addAddresses(newAddresses));
+        return firstValueFrom(this.addresses$);
+    }
 }
-_PersonalWallet_inputSelector = new WeakMap(), _PersonalWallet_logger = new WeakMap(), _PersonalWallet_tip$ = new WeakMap(), _PersonalWallet_newTransactions = new WeakMap(), _PersonalWallet_reemitSubscriptions = new WeakMap(), _PersonalWallet_failedFromReemitter$ = new WeakMap(), _PersonalWallet_trackedTxSubmitProvider = new WeakMap(), _PersonalWallet_addressDiscovery = new WeakMap(), _PersonalWallet_submittingPromises = new WeakMap(), _PersonalWallet_instances = new WeakSet(), _PersonalWallet_submitTx = async function _PersonalWallet_submitTx(outgoingTx, { mightBeAlreadySubmitted } = {}) {
+_PersonalWallet_inputSelector = new WeakMap(), _PersonalWallet_logger = new WeakMap(), _PersonalWallet_tip$ = new WeakMap(), _PersonalWallet_newTransactions = new WeakMap(), _PersonalWallet_reemitSubscriptions = new WeakMap(), _PersonalWallet_failedFromReemitter$ = new WeakMap(), _PersonalWallet_trackedTxSubmitProvider = new WeakMap(), _PersonalWallet_addressTracker = new WeakMap(), _PersonalWallet_addressDiscovery = new WeakMap(), _PersonalWallet_submittingPromises = new WeakMap(), _PersonalWallet_instances = new WeakSet(), _PersonalWallet_submitTx = async function _PersonalWallet_submitTx(outgoingTx, { mightBeAlreadySubmitted } = {}) {
     __classPrivateFieldGet(this, _PersonalWallet_logger, "f").debug(`Submitting transaction ${outgoingTx.id}`);
     __classPrivateFieldGet(this, _PersonalWallet_newTransactions, "f").submitting$.next(outgoingTx);
     try {

package/dist/esm/PersonalWallet/PersonalWallet.js.map CHANGED Viewed

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

package/dist/esm/index.d.ts CHANGED Viewed

@@ -3,5 +3,4 @@ export * from './types';
 export * from './services';
 export * as storage from './persistence';
 export * as cip30 from './cip30';
-export * from './setupWallet';
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC~~;AACjC,cAAc,eAAe,CAAC~~"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC"}

package/dist/esm/index.js CHANGED Viewed

@@ -3,5 +3,4 @@ export * from './types';
 export * from './services';
 export * as storage from './persistence';
 export * as cip30 from './cip30';
-export * from './setupWallet';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC~~;AACjC,cAAc,eAAe,CAAC~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC"}

package/dist/esm/services/AddressDiscovery/HDSequentialDiscovery.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
-import { GroupedAddress, util } from '@cardano-sdk/key-management';
+import { Bip32Account, GroupedAddress } from '@cardano-sdk/key-management';
 import { AddressDiscovery } from '../types';
 import { ChainHistoryProvider } from '@cardano-sdk/core';
 export declare class HDSequentialDiscovery implements AddressDiscovery {
     #private;
     constructor(chainHistoryProvider: ChainHistoryProvider, lookAheadCount: number);
-    discover(manager: util.Bip32Ed25519AddressManager): Promise<GroupedAddress[]>;
+    discover(manager: Bip32Account): Promise<GroupedAddress[]>;
 }
 //# sourceMappingURL=HDSequentialDiscovery.d.ts.map

package/dist/esm/services/AddressDiscovery/HDSequentialDiscovery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"HDSequentialDiscovery.d.ts","sourceRoot":"","sources":["../../../../src/services/AddressDiscovery/HDSequentialDiscovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6C,~~cAAc~~,EAAE,~~IAAI~~,EAAE,MAAM,6BAA6B,CAAC;~~AAC9G~~,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;~~AAkGzD~~,qBAAa,qBAAsB,YAAW,gBAAgB;;gBAIhD,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM;IAYjE,QAAQ,CAAC,OAAO,EAAE,~~IAAI~~,~~CAAC,0BAA0B,~~GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;~~CA4C3F~~"}
1	+ {"version":3,"file":"HDSequentialDiscovery.d.ts","sourceRoot":"","sources":["../../../../src/services/AddressDiscovery/HDSequentialDiscovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6C,YAAY,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AACtH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAgGzD,qBAAa,qBAAsB,YAAW,gBAAgB;;gBAIhD,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM;IAYjE,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CA2CxE"}

package/dist/esm/services/AddressDiscovery/HDSequentialDiscovery.js CHANGED Viewed

@@ -23,15 +23,15 @@ const addressHasTx = async (address, chainHistoryProvider) => {
     });
     return txs.totalResultCount > 0;
 };
-const discoverAddresses = async (manager, chainHistoryProvider, lookAheadCount, getDeriveAddressArgs) => {
+const discoverAddresses = async (account, chainHistoryProvider, lookAheadCount, getDeriveAddressArgs) => {
     let currentGap = 0;
     let currentIndex = 0;
     const addresses = new Array();
     while (currentGap <= lookAheadCount) {
         const externalAddressArgs = getDeriveAddressArgs(currentIndex, AddressType.External);
         const internalAddressArgs = getDeriveAddressArgs(currentIndex, AddressType.Internal);
-        const externalAddress = await manager.deriveAddress(externalAddressArgs.paymentKeyDerivationPath, externalAddressArgs.stakeKeyDerivationIndex, true);
-        const internalAddress = await manager.deriveAddress(internalAddressArgs.paymentKeyDerivationPath, internalAddressArgs.stakeKeyDerivationIndex, true);
+        const externalAddress = await account.deriveAddress(externalAddressArgs.paymentKeyDerivationPath, externalAddressArgs.stakeKeyDerivationIndex);
+        const internalAddress = await account.deriveAddress(internalAddressArgs.paymentKeyDerivationPath, internalAddressArgs.stakeKeyDerivationIndex);
         const externalHasTx = await addressHasTx(externalAddress, chainHistoryProvider);
         const internalHasTx = await addressHasTx(internalAddress, chainHistoryProvider);
         if (externalHasTx)
@@ -56,8 +56,8 @@ export class HDSequentialDiscovery {
         __classPrivateFieldSet(this, _HDSequentialDiscovery_lookAheadCount, lookAheadCount, "f");
     }
     async discover(manager) {
-        const firstAddresses = [await manager.deriveAddress({ index: 0, type: AddressType.External }, 0, true)];
-        const firstInternalAddress = await manager.deriveAddress({ index: 0, type: AddressType.Internal }, 0, true);
+        const firstAddresses = [await manager.deriveAddress({ index: 0, type: AddressType.External }, 0)];
+        const firstInternalAddress = await manager.deriveAddress({ index: 0, type: AddressType.Internal }, 0);
         if (await addressHasTx(firstInternalAddress, __classPrivateFieldGet(this, _HDSequentialDiscovery_chainHistoryProvider, "f"))) {
             firstAddresses.push(firstInternalAddress);
         }
@@ -76,9 +76,7 @@ export class HDSequentialDiscovery {
             stakeKeyDerivationIndex: 0
         }));
         const addresses = uniqBy([...firstAddresses, ...stakeKeyAddresses, ...paymentKeyAddresses], 'address');
-        addresses.sort((a, b) => a.index - b.index || a.stakeKeyDerivationPath.index - b.stakeKeyDerivationPath.index);
-        await manager.setKnownAddresses(addresses);
-        return addresses;
+        return addresses.sort((a, b) => a.index - b.index || a.stakeKeyDerivationPath.index - b.stakeKeyDerivationPath.index);
     }
 }
 _HDSequentialDiscovery_chainHistoryProvider = new WeakMap(), _HDSequentialDiscovery_lookAheadCount = new WeakMap();

package/dist/esm/services/AddressDiscovery/HDSequentialDiscovery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"HDSequentialDiscovery.js","sourceRoot":"","sources":["../../../../src/services/AddressDiscovery/HDSequentialDiscovery.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAgC,WAAW,~~EAAwB~~,MAAM,6BAA6B,CAAC;~~AAG9G~~,OAAO,MAAM,MAAM,eAAe,CAAC;AAEnC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAQpC,MAAM,YAAY,GAAG,KAAK,EAAE,OAAuB,EAAE,oBAA0C,EAAoB,EAAE;IACnH,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAAC;QAC7D,SAAS,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;QAC5B,UAAU,EAAE;YACV,KAAK,EAAE,CAAC;YACR,OAAO,EAAE,CAAC;SACX;KACF,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC,gBAAgB,GAAG,CAAC,CAAC;AAClC,CAAC,CAAC;AAWF,MAAM,iBAAiB,GAAG,KAAK,EAC7B,~~OAAwC~~,~~EACxC~~,oBAA0C,EAC1C,cAAsB,EACtB,oBAMC,EAC0B,EAAE;IAC7B,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,MAAM,SAAS,GAAG,IAAI,KAAK,EAAkB,CAAC;IAE9C,OAAO,UAAU,IAAI,cAAc,EAAE;QACnC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QACrF,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QAErF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,aAAa,CACjD,mBAAmB,CAAC,wBAAwB,EAC5C,mBAAmB,CAAC,uBAAuB,~~EAC3C~~,~~IAAI,CACL,~~CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,aAAa,CACjD,mBAAmB,CAAC,wBAAwB,EAC5C,mBAAmB,CAAC,uBAAuB,~~EAC3C~~,~~IAAI,CACL,~~CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC;QAChF,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC;QAEhF,IAAI,aAAa;YAAE,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACnD,IAAI,aAAa;YAAE,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAEnD,IAAI,aAAa,IAAI,aAAa,EAAE;YAClC,UAAU,GAAG,CAAC,CAAC;SAChB;aAAM;YACL,EAAE,UAAU,CAAC;SACd;QAED,EAAE,YAAY,CAAC;KAChB;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAkBF,MAAM,OAAO,qBAAqB;IAIhC,YAAY,oBAA0C,EAAE,cAAsB;QAH9E,8DAAqD;QACrD,wDAAiC;QAG/B,uBAAA,IAAI,+CAAyB,oBAAoB,MAAA,CAAC;QAClD,uBAAA,IAAI,yCAAmB,cAAc,MAAA,CAAC;IACxC,CAAC;IASM,KAAK,CAAC,QAAQ,CAAC,~~OAAwC~~;~~QAC5D~~,MAAM,cAAc,GAAG,CAAC,MAAM,OAAO,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,~~EAAE,IAAI,~~CAAC,CAAC,CAAC;~~QACxG~~,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,~~EAAE,IAAI,~~CAAC,CAAC;~~QAC5G~~,IAAI,MAAM,YAAY,CAAC,oBAAoB,EAAE,uBAAA,IAAI,mDAAsB,CAAC,EAAE;YACxE,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SAC3C;QAED,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAC/C,OAAO,EACP,uBAAA,IAAI,mDAAsB,EAC1B,yBAAyB,EACzB,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YACvB,wBAAwB,EAAE;gBACxB,KAAK,EAAE,CAAC;gBACR,IAAI;aACL;YAED,uBAAuB,EAAE,YAAY,GAAG,CAAC;SAC1C,CAAC,CACH,CAAC;QAEF,MAAM,mBAAmB,GAAG,MAAM,iBAAiB,CACjD,OAAO,EACP,uBAAA,IAAI,mDAAsB,EAC1B,uBAAA,IAAI,6CAAgB,EACpB,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YACvB,wBAAwB,EAAE;gBAExB,KAAK,EAAE,YAAY,GAAG,CAAC;gBACvB,IAAI;aACL;YACD,uBAAuB,EAAE,CAAC;SAC3B,CAAC,CACH,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,GAAG,cAAc,EAAE,GAAG,iBAAiB,EAAE,GAAG,mBAAmB,CAAC,EAAE,SAAS,CAAC,CAAC;QAIvG,SAAS,CAAC,IAAI,~~CAAC~~,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,sBAAuB,CAAC,KAAK,GAAG,CAAC,CAAC,sBAAuB,CAAC,KAAK,~~CAAC~~,CAAC;~~QACjH~~,~~MAAM,OAAO,~~CAAC~~,iBAAiB,CAAC,SAAS,CAAC,CAAC~~;~~QAE3C,OAAO,SAAS,CAAC;IACnB,CAAC;~~CACF"}
1	+ {"version":3,"file":"HDSequentialDiscovery.js","sourceRoot":"","sources":["../../../../src/services/AddressDiscovery/HDSequentialDiscovery.ts"],"names":[],"mappings":"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"}

package/dist/esm/services/AddressDiscovery/SingleAddressDiscovery.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { AddressDiscovery } from '../types';
-import { GroupedAddress, util } from '@cardano-sdk/key-management';
+import { Bip32Account, GroupedAddress } from '@cardano-sdk/key-management';
 export declare class SingleAddressDiscovery implements AddressDiscovery {
-    discover(manager: util.Bip32Ed25519AddressManager): Promise<GroupedAddress[]>;
+    discover(manager: Bip32Account): Promise<GroupedAddress[]>;
 }
 //# sourceMappingURL=SingleAddressDiscovery.d.ts.map

package/dist/esm/services/AddressDiscovery/SingleAddressDiscovery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SingleAddressDiscovery.d.ts","sourceRoot":"","sources":["../../../../src/services/AddressDiscovery/SingleAddressDiscovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAe,~~cAAc~~,EAAE,~~IAAI~~,EAAE,MAAM,6BAA6B,CAAC;~~AAMhF~~,qBAAa,sBAAuB,YAAW,gBAAgB;IAChD,QAAQ,CAAC,OAAO,EAAE,~~IAAI~~,~~CAAC,0BAA0B,~~GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;~~CAI3F~~"}
1	+ {"version":3,"file":"SingleAddressDiscovery.d.ts","sourceRoot":"","sources":["../../../../src/services/AddressDiscovery/SingleAddressDiscovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAe,YAAY,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAMxF,qBAAa,sBAAuB,YAAW,gBAAgB;IAChD,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAIxE"}

package/dist/esm/services/AddressDiscovery/SingleAddressDiscovery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SingleAddressDiscovery.js","sourceRoot":"","sources":["../../../../src/services/AddressDiscovery/SingleAddressDiscovery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,~~EAAwB~~,MAAM,6BAA6B,CAAC;~~AAMhF~~,MAAM,OAAO,sBAAsB;IAC1B,KAAK,CAAC,QAAQ,CAAC,~~OAAwC~~;~~QAC5D~~,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;QACzF,OAAO,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;CACF"}
1	+ {"version":3,"file":"SingleAddressDiscovery.js","sourceRoot":"","sources":["../../../../src/services/AddressDiscovery/SingleAddressDiscovery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAgC,MAAM,6BAA6B,CAAC;AAMxF,MAAM,OAAO,sBAAsB;IAC1B,KAAK,CAAC,QAAQ,CAAC,OAAqB;QACzC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;QACzF,OAAO,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;CACF"}

package/dist/esm/services/AddressTracker.d.ts ADDED Viewed

@@ -0,0 +1,16 @@
+import { GroupedAddress } from '@cardano-sdk/key-management';
+import { Logger } from 'ts-log';
+import { Observable } from 'rxjs';
+import { WalletStores } from '../persistence';
+export declare type AddressTrackerDependencies = {
+    store: WalletStores['addresses'];
+    addressDiscovery$: Observable<GroupedAddress[]>;
+    logger: Logger;
+};
+export declare const createAddressTracker: ({ addressDiscovery$, store, logger }: AddressTrackerDependencies) => {
+    addAddresses: (newAddresses: GroupedAddress[]) => Observable<GroupedAddress[]>;
+    addresses$: Observable<GroupedAddress[]>;
+    shutdown: () => void;
+};
+export declare type AddressTracker = ReturnType<typeof createAddressTracker>;
+//# sourceMappingURL=AddressTracker.d.ts.map

package/dist/esm/services/AddressTracker.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"AddressTracker.d.ts","sourceRoot":"","sources":["../../../src/services/AddressTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EACL,UAAU,EAaX,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,oBAAY,0BAA0B,GAAG;IACvC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;IACjC,iBAAiB,EAAE,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,oBAAoB,yCAA0C,0BAA0B;iCAqDpE,cAAc,EAAE;;;CAYhD,CAAC;AAEF,oBAAY,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/dist/esm/services/AddressTracker.js ADDED Viewed

@@ -0,0 +1,41 @@
+import { Subject, defaultIfEmpty, distinctUntilChanged, filter, map, merge, mergeMap, of, shareReplay, switchMap, take, tap } from 'rxjs';
+import { groupedAddressesEquals } from './util';
+export const createAddressTracker = ({ addressDiscovery$, store, logger }) => {
+    const storeAddresses = () => (addresses$) => addresses$.pipe(switchMap((addresses) => store.set(addresses).pipe(map(() => addresses))));
+    const newAddresses$ = new Subject();
+    const addresses$ = store
+        .get()
+        .pipe(defaultIfEmpty([]), mergeMap((addresses) => {
+        if (addresses.length === 0) {
+            logger.debug('No addresses available; initiating address discovery process');
+            return addressDiscovery$.pipe(tap((derivedAddresses) => {
+                if (derivedAddresses.length === 0) {
+                    throw new Error('Address discovery derived 0 addresses');
+                }
+            }), storeAddresses());
+        }
+        return of(addresses);
+    }), switchMap((addresses) => {
+        const addressCache = [...addresses];
+        return merge(of(addresses), newAddresses$.pipe(map((newAddresses) => {
+            for (const newAddress of newAddresses) {
+                if (addressCache.some((addr) => addr.address === newAddress.address)) {
+                    logger.warn('Address already exists', newAddress.address);
+                    continue;
+                }
+                addressCache.push(newAddress);
+            }
+            return [...addressCache];
+        }), storeAddresses())).pipe(distinctUntilChanged(groupedAddressesEquals));
+    }))
+        .pipe(shareReplay(1));
+    return {
+        addAddresses: (newAddresses) => {
+            newAddresses$.next(newAddresses);
+            return addresses$.pipe(filter((addresses) => newAddresses.every(({ address: newAddress }) => addresses.some(({ address }) => address === newAddress))), take(1));
+        },
+        addresses$,
+        shutdown: newAddresses$.complete.bind(newAddresses$)
+    };
+};
+//# sourceMappingURL=AddressTracker.js.map

package/dist/esm/services/AddressTracker.js.map ADDED Viewed

@@ -0,0 +1 @@

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