@sidhujag/sysweb3-keyring 2.1.2 → 2.1.4

package/esm/utils/watch-descriptor.js

@@ -0,0 +1,138 @@
+import ecc from '@bitcoinerlab/secp256k1';
+import { findCoin, getNetworkConfig, INetworkType, } from '@sidhujag/sysweb3-network';
+import { BIP32Factory } from 'bip32';
+import bs58check from 'bs58check';
+import { Buffer } from 'buffer';
+import { utils as syscoinUtils } from 'syscoinjs-lib';
+const bip32 = BIP32Factory(ecc);
+const bitcoin = syscoinUtils.bitcoinjs;
+const invalid = () => {
+    throw new Error('Unsupported or invalid public watch-only descriptor');
+};
+const childIndex = (value) => {
+    if (!Number.isInteger(value) || value < 0 || value >= 0x80000000)
+        return invalid();
+    return value;
+};
+// Bitcoin Core's descriptor checksum, also used by Pali's public-input guard.
+export const descriptorChecksum = (value) => {
+    const input = '0123456789()[],\'/*abcdefgh@:$%{}IJKLMNOPQRSTUVWXYZ&+-.;<=>?!^_|~ijklmnopqrstuvwxyzABCDEFGH`#"\\ ';
+    const output = 'qpzry9x8gf2tvdw0s3jn54khce6mua7l';
+    const generators = [
+        'f5dee51989',
+        'a9fdca3312',
+        '1bab10e32d',
+        '3706b1677a',
+        '644d626ffd',
+    ].map((hex) => BigInt(`0x${hex}`));
+    const poly = (current, next) => {
+        const top = current >> BigInt(35);
+        let result = ((current & BigInt('0x7ffffffff')) << BigInt(5)) ^ BigInt(next);
+        generators.forEach((generator, index) => {
+            if ((top & (BigInt(1) << BigInt(index))) !== BigInt(0))
+                result ^= generator;
+        });
+        return result;
+    };
+    let checksum = BigInt(1), group = 0, count = 0;
+    for (const character of value) {
+        const position = input.indexOf(character);
+        if (position < 0)
+            return '';
+        checksum = poly(checksum, position & 31);
+        group = group * 3 + (position >> 5);
+        if (++count === 3) {
+            checksum = poly(checksum, group);
+            group = count = 0;
+        }
+    }
+    if (count)
+        checksum = poly(checksum, group);
+    for (let index = 0; index < 8; index++)
+        checksum = poly(checksum, 0);
+    checksum ^= BigInt(1);
+    return Array.from({ length: 8 }, (_, index) => output[Number((checksum >> BigInt(5 * (7 - index))) & BigInt(31))]).join('');
+};
+/** Derive only the single-key public descriptor forms supported by Blockbook. */
+export const deriveDescriptorAddress = (descriptor, network, options) => {
+    if (typeof descriptor !== 'string' ||
+        !descriptor ||
+        descriptor.length > 16384 ||
+        /\s/.test(descriptor) ||
+        (options?.change !== undefined && typeof options.change !== 'boolean'))
+        return invalid();
+    const parts = descriptor.split('#');
+    if (parts.length > 2 ||
+        (parts.length === 2 && descriptorChecksum(parts[0]) !== parts[1]))
+        return invalid();
+    const simple = /^(pkh|wpkh|tr)\(([^()]*)\)$/.exec(parts[0]);
+    const wrapped = /^sh\(wpkh\(([^()]*)\)\)$/.exec(parts[0]);
+    if (!simple && !wrapped)
+        return invalid();
+    const type = simple?.[1] || 'sh(wpkh)';
+    const key = simple?.[2] || wrapped?.[1] || '';
+    const parsed = /^(?:\[([\da-fA-F]{8})\/(\d+)['h]\/(\d+)['h]?\/(\d+)['h]?\])?([1-9A-HJ-NP-Za-km-z]{100,112})(?:\/(\d+|\{\d+(?:,\d+)*\}|<\d+(?:;\d+)*>)\/\*)?$/.exec(key);
+    if (!parsed)
+        return invalid();
+    if (parsed[1])
+        parsed.slice(2, 5).forEach((value) => childIndex(Number(value)));
+    const branches = parsed[6]
+        ? parsed[6]
+            .replace(/[{}<>]/g, '')
+            .split(/[,;]/)
+            .map((value) => childIndex(Number(value)))
+        : [0, 1];
+    if (branches.length > 10)
+        return invalid();
+    const branch = branches[options?.change ? 1 : 0];
+    if (branch === undefined)
+        return invalid();
+    const index = childIndex(options?.index === undefined ? 0 : options.index);
+    if (!network || network.kind !== INetworkType.Syscoin)
+        return invalid();
+    const coin = findCoin({
+        slip44: network.slip44,
+        name: network.currency,
+        exactMatch: true,
+    });
+    if (!coin ||
+        (type !== 'pkh' && coin.segwit !== true) ||
+        (type === 'tr' && coin.taproot !== true))
+        return invalid();
+    const config = getNetworkConfig(network.slip44, network.currency);
+    const addressNetwork = network.slip44 === 1 ? config.networks.testnet : config.networks.mainnet;
+    const payload = Buffer.from(bs58check.decode(parsed[5]));
+    if (payload.length !== 78 || ![2, 3].includes(payload[45]))
+        return invalid();
+    const root = bip32.fromBase58(parsed[5], {
+        ...addressNetwork,
+        bip32: { public: payload.readUInt32BE(0), private: 0x0488ade4 },
+    });
+    if (!root.isNeutered())
+        return invalid();
+    const branchNode = root.derive(branch);
+    const addressNode = branchNode.derive(index);
+    // Do not let BIP32's invalid-child retry silently select a different path.
+    if (branchNode.index !== branch || addressNode.index !== index)
+        return invalid();
+    const pubkey = addressNode.publicKey;
+    const payment = type === 'pkh'
+        ? bitcoin.payments.p2pkh({ pubkey, network: addressNetwork })
+        : type === 'wpkh'
+            ? bitcoin.payments.p2wpkh({ pubkey, network: addressNetwork })
+            : type === 'tr'
+                ? bitcoin.payments.p2tr({
+                    internalPubkey: pubkey.slice(1),
+                    network: addressNetwork,
+                })
+                : bitcoin.payments.p2sh({
+                    redeem: bitcoin.payments.p2wpkh({ pubkey, network: addressNetwork }),
+                    network: addressNetwork,
+                });
+    if (!payment.address ||
+        !payment.output ||
+        !Buffer.from(bitcoin.address.toOutputScript(payment.address, addressNetwork)).equals(Buffer.from(payment.output)))
+        return invalid();
+    return payment.address;
+};
+//# sourceMappingURL=watch-descriptor.js.map

package/esm/utils/watch-descriptor.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sidhujag/sysweb3-keyring",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "Keyring Manager for UTXO and Web3 Wallets",
   "main": "cjs/index.js",
   "types": "types/index.d.ts",
@@ -24,6 +24,12 @@
       "cjs/transactions/evm-submission.js": [
         "types/transactions/evm-submission.d.ts"
       ],
+      "cjs/transactions/evm-cancellation": [
+        "types/transactions/evm-cancellation.d.ts"
+      ],
+      "cjs/transactions/evm-cancellation.js": [
+        "types/transactions/evm-cancellation.d.ts"
+      ],
       "cjs/transactions/ethereum": [
         "types/transactions/ethereum.d.ts"
       ],
@@ -36,18 +42,18 @@
       "cjs/software.js": [
         "types/software.d.ts"
       ],
-      "cjs/keyring-core": [
-        "types/keyring-core.d.ts"
-      ],
-      "cjs/keyring-core.js": [
-        "types/keyring-core.d.ts"
-      ],
       "esm/ledger-host": [
         "types/ledger-host.d.ts"
       ],
       "esm/ledger-host.js": [
         "types/ledger-host.d.ts"
       ],
+      "esm/ledger/dmk-selected-host": [
+        "types/ledger/dmk-selected-host.d.ts"
+      ],
+      "esm/ledger/dmk-selected-host.js": [
+        "types/ledger/dmk-selected-host.d.ts"
+      ],
       "cjs/ledger/host-types": [
         "types/ledger/host-types.d.ts"
       ],
@@ -88,9 +94,9 @@
     "@ledgerhq/device-signer-kit-ethereum": "1.18.2",
     "@ledgerhq/device-transport-kit-web-hid": "1.2.4",
     "@metamask/eth-sig-util": "^8.2.0",
-    "@sidhujag/sysweb3-core": "^1.0.29",
-    "@sidhujag/sysweb3-network": "^1.0.111",
-    "@sidhujag/sysweb3-utils": "^1.1.280",
+    "@sidhujag/sysweb3-core": "1.0.30",
+    "@sidhujag/sysweb3-network": "2.0.0",
+    "@sidhujag/sysweb3-utils": "1.1.281",
     "@trezor/connect-webextension": "10.0.1",
     "bip32": "^5.0.1",
     "bip32-path": "^0.4.2",
@@ -104,7 +110,7 @@
     "varuint-bitcoin": "^2.0.0"
   },
   "peerDependencies": {
-    "syscoinjs-lib": "^1.0.277"
+    "syscoinjs-lib": "^1.0.279"
   },
   "resolutions": {
     "axios": "^1.18.1",

package/types/current-vault-refusal.d.ts

@@ -0,0 +1,2 @@
+/** Internal ciphertext comparison for a current-vault tag refusal. */
+export declare const currentVaultRefusals: WeakMap<Error, (vault: string) => boolean>;

package/types/evm-fees.d.ts

@@ -35,6 +35,31 @@ export declare function parseEvmFeeQuantity(value: unknown, label?: string): big
  * the configured minimum if larger. Callers retain chain/resource bounds.
  */
 export declare function bufferedEvmGasLimit(estimate: bigint, minimum?: bigint): bigint;
+export type EvmCancellationFeeInput = Readonly<{
+    type: 0;
+    currentGasPrice: bigint;
+    originalGasPrice?: bigint;
+} | {
+    type: 2;
+    currentMaxFeePerGas: bigint;
+    currentMaxPriorityFeePerGas: bigint;
+    originalMaxFeePerGas?: bigint;
+    originalMaxPriorityFeePerGas?: bigint;
+}>;
+export declare const EVM_CANCELLATION_GAS_LIMIT = 42000n;
+/** Plan only the cancellation fees. The host validates the rates and envelope. */
+export declare function planEvmCancellationFees(input: EvmCancellationFeeInput): Readonly<{
+    type: 0;
+    gasLimit: 42000n;
+    gasPrice: bigint;
+    maximumFee: bigint;
+}> | Readonly<{
+    type: 2;
+    gasLimit: 42000n;
+    maxFeePerGas: bigint;
+    maxPriorityFeePerGas: bigint;
+    maximumFee: bigint;
+}>;
 /**
  * No signer, transport, network registry or provider implementation is imported.
  * Reads are serialized and guarded; RPC failures never become fabricated fees.

package/types/hardware-transaction-authority.d.ts

@@ -0,0 +1,5 @@
+export type HardwareTransactionAuthority = Readonly<{
+    assertCurrent: () => void;
+    signal: AbortSignal;
+}>;
+export declare function captureHardwareTransactionAuthority(authority: HardwareTransactionAuthority): HardwareTransactionAuthority;

package/types/index.d.ts

@@ -1,16 +1,16 @@
 export * from './transactions';
 export * from './types';
-export * from './storage';
+export { VaultAuthenticationError } from './storage-core';
 export * from './signers';
 export * from './initial-state';
 export * from './keyring-manager';
+export { createKeyringHost } from './keyring-host';
+export type { KeyringHost, KeyringOptions } from './keyring-host';
 export { MAX_PRIVATE_RECORD_BYTES, MAX_PRIVATE_RECORD_LABEL_BYTES, } from './private-records';
 export type { IDecryptPrivateRecordParams, IEncryptedPrivateRecord, IEncryptPrivateRecordParams, } from './private-records';
 export * from './providers';
 export * from './utils/derivation-paths';
 export * from './network-utils';
 export * from './hardware-wallet-manager';
-export * from './hardware-wallet-manager-singleton';
 export { PsbtUtils } from './utils/psbt';
-export { invalidateBlockbookAccountCache } from './utils/blockbook-cache';
 export { deriveDescriptorAddress, descriptorChecksum, } from './utils/watch-descriptor';

package/types/keyring-core.d.ts

@@ -2,20 +2,43 @@ import { INetwork, INetworkType } from '@sidhujag/sysweb3-network';
 import { IDecryptPrivateRecordParams, IEncryptedPrivateRecord, IEncryptPrivateRecordParams } from './private-records';
 import { SyscoinHDSigner } from './signers';
 import { type ISyscoinHardwareSigners } from './transactions/syscoin-core';
-import { IKeyringAccountState, ICreateSmartAccountParams, ISyscoinTransactions, KeyringAccountType, IEthereumTransactions } from './types';
+import { IKeyringAccountState, ICreateSmartAccountParams, ISyscoinTransactions, KeyringAccountType, IEthereumTransactions, type SyscoinOwnedReadOptions } from './types';
+import type { KeyringHostBinding } from './keyring-host';
 import type { LedgerKeyring } from './ledger';
 import type { EncryptedEvmHdRuntimeAccount, EvmHdRuntimeAccountOptions, EvmHdRuntimeAccountRequest } from './software-hd-account';
-import type { VaultPersistence, VaultStoragePort } from './storage-core';
-import type { CaptureEvmSubmission } from './transactions/evm-submission';
+import type { VaultStoragePort } from './storage-core';
 import type { PreparedEvmSigningOptions, PreparedSoftwareEvmSigningRequest, SignedPreparedEvmTransaction } from './transactions/prepared-evm';
 import type { TrezorKeyring } from './trezor';
 /** Explicit asynchronous host storage; no browser or global DI fallback. */
 export interface KeyringStoragePort extends VaultStoragePort {
     get(key: string): Promise<any>;
     deleteItem(key: string): Promise<void>;
-    /** Legacy adapter capability; fixed native hosts can omit it. */
-    setClient?(client: any): void;
+    /** Atomically read this authority's current encrypted vault and salt. */
+    readDeviceUnlockVaultPair?(): Promise<DeviceUnlockVaultPair | null>;
 }
+export type DeviceUnlockVaultPair = Readonly<{
+    vault: string;
+    keys: unknown;
+    pairFingerprint: string;
+}>;
+export type DeviceUnlockCredential = Readonly<{
+    pairFingerprint: string;
+    key: Uint8Array;
+}>;
+/** Only a trusted software host may supply this protected credential I/O. */
+export type DeviceUnlockPort = Readonly<{
+    /** Transfer ownership of the returned key bytes to the SDK. */
+    readCredential(pairFingerprint: string): Promise<DeviceUnlockCredential | null>;
+    /**
+     * Consume the bytes and check the guard before saving. The SDK clears the
+     * bytes on settlement. Publish enrollment only after issue returns true.
+     */
+    writeCredential(credential: DeviceUnlockCredential, assertCurrent: () => void): Promise<void>;
+}>;
+export type DeviceUnlockControls = Readonly<{
+    issue(password: string, assertCurrent: () => void): Promise<boolean>;
+    resume(assertCurrent: () => void): Promise<boolean>;
+}>;
 /** Only the device capabilities consumed by the wallet authority. */
 export interface KeyringLedgerSigner {
     destroy: LedgerKeyring['destroy'];
@@ -24,18 +47,10 @@ export interface KeyringLedgerSigner {
     verifyUtxoAddress: LedgerKeyring['verifyUtxoAddress'];
 }
 export type KeyringTrezorSigner = Pick<TrezorKeyring, 'destroy' | 'getAccountInfo' | 'getPublicKey' | 'signTypedData' | 'signMessage' | 'signEthTransaction' | 'verifyUtxoAddress'>;
-export interface KeyringCoreDependencies<TLedger extends KeyringLedgerSigner | undefined, TTrezor extends KeyringTrezorSigner | undefined> {
-    /** Immutable identity shared only by keyrings in the same wallet authority. */
-    authority: object;
-    storage: KeyringStoragePort;
-    /** Must be bound to this authority's storage and shared across its keyrings. */
-    vaultPersistence: VaultPersistence;
+interface KeyringHardware<TLedger extends KeyringLedgerSigner | undefined, TTrezor extends KeyringTrezorSigner | undefined> {
     ledgerSigner: TLedger;
     trezorSigner: TTrezor;
-    /** Trusted host adapters; absent device capabilities fail closed. */
     syscoinHardwareSigners?: ISyscoinHardwareSigners;
-    /** Trusted host lifecycle, captured before each locally signed EVM submission. */
-    captureEvmSubmission?: CaptureEvmSubmission;
 }
 export interface ISysAccount {
     address: string;
@@ -43,20 +58,8 @@ export interface ISysAccount {
     xprv?: string;
     xpub: string;
 }
-/**
- * Secure Buffer implementation for sensitive data
- * Provides explicit memory clearing capability
- */
-declare class SecureBuffer {
-    private buffer;
-    private _isCleared;
-    constructor(data: string | Buffer);
-    get(): Buffer;
-    toString(): string;
-    clear(): void;
-    isCleared(): boolean;
-}
 export declare class KeyringCore<TLedger extends KeyringLedgerSigner | undefined = KeyringLedgerSigner | undefined, TTrezor extends KeyringTrezorSigner | undefined = KeyringTrezorSigner | undefined> {
+    #private;
     trezorSigner: TTrezor;
     ledgerSigner: TLedger;
     initialTrezorAccountState: IKeyringAccountState;
@@ -76,19 +79,15 @@ export declare class KeyringCore<TLedger extends KeyringLedgerSigner | undefined
     private sessionPassword;
     private sessionMnemonic;
     private privateRecordSessionRevision;
-    constructor(dependencies: KeyringCoreDependencies<TLedger, TTrezor>);
+    constructor(binding: KeyringHostBinding, hardware: KeyringHardware<TLedger, TTrezor>);
     private createSyscoinTransactions;
     private requireLedgerSigner;
     private requireTrezorSigner;
     initialize(seed: string, password: string, network?: INetwork): Promise<IKeyringAccountState>;
-    setStorage: (client: any) => void;
     validateAccountType: (account: IKeyringAccountState) => KeyringAccountType.HDAccount | KeyringAccountType.Imported;
     isUnlocked: () => boolean;
     lockWallet: () => Promise<void>;
-    transferSessionTo: (targetKeyring: Pick<KeyringCore, "receiveSessionOwnership">) => void;
-    private acceptSessionFrom;
-    receiveSessionOwnership: (sessionPassword: SecureBuffer, sessionMnemonic: SecureBuffer) => void;
-    private replaceSessionBuffers;
+    transferSessionTo: (targetKeyring: KeyringCore) => void;
     addNewAccount: (label?: string) => Promise<IKeyringAccountState>;
     createSmartAccount: ({ address, deriveAccount, label, metadata, }: ICreateSmartAccountParams) => Promise<IKeyringAccountState>;
     /**
@@ -100,11 +99,14 @@ export declare class KeyringCore<TLedger extends KeyringLedgerSigner | undefined
         canLogin: boolean;
         needsAccountCreation?: boolean;
     }>;
-    getNewChangeAddress: () => Promise<string>;
-    getChangeAddress: (id: number) => Promise<string>;
-    getPubkey: (id: number, isChangeAddress: boolean) => Promise<string>;
-    getBip32Path: (id: number, isChangeAddress: boolean) => Promise<string>;
-    updateReceivingAddress: () => Promise<string>;
+    private getActiveUtxoAddressAccount;
+    getNewChangeAddress: (ownedRead: SyscoinOwnedReadOptions) => Promise<string>;
+    getChangeAddress: (id: number, ownedRead: SyscoinOwnedReadOptions) => Promise<string>;
+    getPubkey: (id: number, isChangeAddress: boolean, ownedRead: SyscoinOwnedReadOptions) => Promise<string>;
+    getBip32Path: (id: number, isChangeAddress: boolean, ownedRead: SyscoinOwnedReadOptions) => Promise<string>;
+    updateReceivingAddress: (ownedRead: SyscoinOwnedReadOptions) => Promise<string>;
+    private getAddressForUtxoAccount;
+    private assertUtxoDerivationAvailable;
     getAccountById: (id: number, accountType: KeyringAccountType) => Omit<IKeyringAccountState, "xprv">;
     getPrivateKeyByAccountId: (id: number, accountType: KeyringAccountType, pwd: string) => Promise<string>;
     getActiveAccount: () => {
@@ -145,12 +147,15 @@ export declare class KeyringCore<TLedger extends KeyringLedgerSigner | undefined
     getActiveUTXOAccountState: () => any;
     getNetwork: () => any;
     createEthAccount: (privateKey: string) => import("./transactions/evm-local-signer").EvmLocalAccount;
+    private loadBip84AddressAccount;
+    private deriveFirstUtxoAddress;
     private fetchCurrentAccountData;
-    getAddress: (xpub: string, isChangeAddress: boolean, options?: {
-        forceIndex0?: boolean;
-    }) => Promise<string>;
-    getCurrentAddressPubkey: (xpub: string, isChangeAddress: boolean) => Promise<string>;
-    getCurrentAddressBip32Path: (xpub: string, isChangeAddress: boolean) => Promise<string>;
+    private discoverUtxoAddress;
+    getAddress: (xpub: string, isChangeAddress: boolean, ownedRead: SyscoinOwnedReadOptions) => Promise<string>;
+    private getAddressPubkey;
+    getCurrentAddressPubkey: (xpub: string, isChangeAddress: boolean, ownedRead: SyscoinOwnedReadOptions) => Promise<string>;
+    private getAddressBip32Path;
+    getCurrentAddressBip32Path: (xpub: string, isChangeAddress: boolean, ownedRead: SyscoinOwnedReadOptions) => Promise<string>;
     logout: () => void;
     importAccount(privKey: string, label?: string, options?: {
         utxoAddressType?: 'p2wpkh' | 'p2pkh' | 'p2tr';
@@ -228,7 +233,6 @@ export declare class KeyringCore<TLedger extends KeyringLedgerSigner | undefined
     private setDerivedWeb3Accounts;
     private setSignerEVM;
     private clearTemporaryLocalKeys;
-    private recreateSessionFromVault;
     private _getPrivateKeyAccountInfos;
     /**
      * Common method to decrypt mnemonic from session

package/types/keyring-host.d.ts

@@ -0,0 +1,46 @@
+import type { DeviceUnlockControls, DeviceUnlockPort, KeyringStoragePort } from './keyring-core';
+import type { VaultPersistence } from './storage-core';
+import type { CaptureEvmSubmission } from './transactions/evm-submission';
+declare const keyringHostBrand: unique symbol;
+/** Opaque identity for one fixed wallet store and its unlock session. */
+export interface KeyringHost {
+    readonly [keyringHostBrand]: true;
+}
+export type SessionOwner = {
+    current?: symbol;
+    epoch: number;
+};
+type BoundHost = {
+    storage: KeyringStoragePort;
+    vaultPersistence: VaultPersistence;
+    sessionOwner: SessionOwner;
+    deviceUnlockPort?: DeviceUnlockPort;
+};
+export declare function createKeyringHost(storage: KeyringStoragePort, options?: {
+    deviceUnlock?: DeviceUnlockPort;
+}): KeyringHost;
+export type KeyringOptions = {
+    captureEvmSubmission: CaptureEvmSubmission | null;
+    receiveDeviceUnlock?(controls: DeviceUnlockControls): void;
+};
+declare const bindingBrand: unique symbol;
+export interface KeyringHostBinding {
+    readonly [bindingBrand]: true;
+}
+type PreparedHost = Omit<BoundHost, 'deviceUnlockPort'> & {
+    authority: KeyringHost;
+    captureEvmSubmission: CaptureEvmSubmission | null;
+    deviceUnlock?: {
+        port: DeviceUnlockPort;
+        receive(controls: DeviceUnlockControls): void;
+    };
+};
+export declare function takeKeyringHostBinding(binding: KeyringHostBinding): PreparedHost;
+export declare function prepareKeyringHost(host: KeyringHost, options: KeyringOptions): {
+    binding: KeyringHostBinding;
+    publishControls?: undefined;
+} | {
+    binding: KeyringHostBinding;
+    publishControls(): void;
+};
+export {};

package/types/keyring-manager.d.ts

@@ -2,16 +2,23 @@ import { HardwareWalletManager } from './hardware-wallet-manager';
 import { KeyringCore } from './keyring-core';
 import { LedgerKeyring } from './ledger';
 import { TrezorKeyring } from './trezor';
+import type { KeyringHost, KeyringOptions } from './keyring-host';
 import type { LedgerHost } from './ledger/host-types';
 import type { CaptureEvmSubmission } from './transactions/evm-submission';
 import type { IKeyringManager } from './types';
 export type { ISysAccount } from './keyring-core';
-/** Existing browser entry. Native/software hosts must use the software entry. */
+export type { DeviceUnlockControls, DeviceUnlockPort, DeviceUnlockVaultPair, KeyringStoragePort, } from './keyring-core';
+export type KeyringManagerOptions = Omit<KeyringOptions, 'captureEvmSubmission'> & {
+    captureEvmSubmission: CaptureEvmSubmission;
+} & ({
+    ledgerHost: LedgerHost;
+    hardwareManager?: never;
+} | {
+    ledgerHost?: never;
+    hardwareManager: HardwareWalletManager;
+});
+/** Browser keyring with an explicit wallet authority and hardware adapter. */
 export declare class KeyringManager extends KeyringCore<LedgerKeyring, TrezorKeyring> implements IKeyringManager {
-    constructor(sharedHardwareWalletManager?: HardwareWalletManager, ledgerHost?: LedgerHost, options?: {
-        captureEvmSubmission?: CaptureEvmSubmission;
-    });
-    static createInitialized(seed: string, password: string, vaultStateGetter: () => any, options?: {
-        captureEvmSubmission?: CaptureEvmSubmission;
-    }): Promise<KeyringManager>;
+    constructor(host: KeyringHost, options: KeyringManagerOptions);
+    static createInitialized(host: KeyringHost, seed: string, password: string, vaultStateGetter: () => any, options: KeyringManagerOptions): Promise<KeyringManager>;
 }

package/types/ledger/dmk-host.d.ts

@@ -0,0 +1,7 @@
+import { type LedgerEvmConfig, type LedgerHost } from './host-types';
+export interface LedgerDmkHost extends LedgerHost {
+    /** Start before enumerating. The returned capability is single use. */
+    beginDeviceSelection(signal?: AbortSignal): (candidate: object) => Promise<void>;
+}
+/** Shared implementation; the default browser host supplies its own transport. */
+export declare function createLedgerHostForDmk(candidate: object, config: LedgerEvmConfig, requireDeviceSelection?: boolean): LedgerDmkHost;

package/types/ledger/dmk-selected-host.d.ts

@@ -0,0 +1,7 @@
+import { type LedgerDmkHost } from './dmk-host';
+import type { LedgerEvmConfig } from './host-types';
+/** A platform-owned transport and explicit user selection are required. */
+export declare function createSelectedLedgerDmkHost(config: LedgerEvmConfig & {
+    dmk: object;
+}): LedgerDmkHost;
+export type { LedgerDmkHost } from './dmk-host';

package/types/ledger/dmk-session.d.ts

@@ -30,8 +30,9 @@ export interface LedgerDmkOperation {
 /** One owner and one semantic operation at a time, across EVM and UTXO apps. */
 export declare class LedgerDmkSession {
     readonly dmk: DeviceManagementKit;
+    private requireDeviceSelection;
     private generation;
-    private sessionId;
+    private connection;
     private queue;
     private activeCancel;
     private activeAbort;
@@ -39,17 +40,24 @@ export declare class LedgerDmkSession {
     private stateSubscription;
     private connectionAttempt;
     private connectionAbort;
+    private deviceSelection;
     private readonly invalidationListeners;
-    constructor(dmk: DeviceManagementKit);
+    constructor(dmk: DeviceManagementKit, requireDeviceSelection?: boolean);
+    private get readyConnection();
     getStatus(): {
         connected: boolean;
     };
     onInvalidated(listener: () => void): () => void;
     private invalidate;
+    /** The platform passes one candidate from its own current DMK picker. */
+    beginDeviceSelection(signal?: AbortSignal): (candidate: object) => Promise<void>;
     /** Device selection belongs to the visible host, never to a dapp request. */
     connect(request?: {
         useGrantedDevices?: boolean;
     }, options?: LedgerOperationOptions): Promise<void>;
+    private connectionBusy;
+    private startConnection;
+    private discoverDevice;
     private connectDevice;
     /** Cancel revokes the result and closes I/O; it cannot undo on-device approval. */
     disconnect(): Promise<void>;

package/types/ledger/host-types.d.ts

@@ -1,3 +1,4 @@
+import type { HardwareTransactionAuthority } from '../hardware-transaction-authority';
 /** Serializable Ledger requests. This module must remain free of device SDK imports. */
 export interface LedgerProgress {
     status: 'not-started' | 'pending' | 'stopped' | 'completed' | 'error';
@@ -5,9 +6,11 @@ export interface LedgerProgress {
     step?: string;
 }
 export interface LedgerOperationOptions {
+    assertCurrent?: () => void;
     signal?: AbortSignal;
     onProgress?: (progress: LedgerProgress) => void;
 }
+export type LedgerPsbtAuthority = HardwareTransactionAuthority & Pick<LedgerOperationOptions, 'onProgress'>;
 export interface LedgerUtxoAccount {
     currency: string;
     slip44: number;
@@ -106,7 +109,7 @@ export interface LedgerUtxoHost {
     signPsbt(request: LedgerUtxoAccount & {
         psbtBase64: string;
         accountXpub: string;
-    }, options?: LedgerOperationOptions): Promise<{
+    }, authority: LedgerPsbtAuthority): Promise<{
         fingerprint: string;
         signatures: LedgerPartialSignature[];
     }>;

package/types/ledger/index.d.ts

@@ -15,7 +15,7 @@ export declare class LedgerKeyring {
     ensureConnection: () => Promise<void>;
     verifyUtxoAddress: (accountIndex: number, currency: string, slip44: number) => Promise<string>;
     signUtxoMessage: (request: Parameters<LedgerUtxoHost["signMessage"]>[0]) => Promise<string>;
-    signPsbt: (request: Parameters<LedgerUtxoHost["signPsbt"]>[0]) => ReturnType<LedgerUtxoHost["signPsbt"]>;
+    signPsbt: (request: Parameters<LedgerUtxoHost["signPsbt"]>[0], authority: Parameters<LedgerUtxoHost["signPsbt"]>[1]) => ReturnType<LedgerUtxoHost["signPsbt"]>;
     getStatus(): {
         type: HardwareWalletType;
         connected: boolean;

package/types/ledger/types.d.ts

@@ -1,4 +1,5 @@
 import { SignTypedDataVersion } from '@metamask/eth-sig-util';
+import type { HardwareTransactionAuthority } from '../hardware-transaction-authority';
 export interface IUTXOMethods {
     getUtxoAddress: ({ coin, index, slip44, }: {
         coin: string;
@@ -27,11 +28,11 @@ export interface IEvmMethods {
         address: string;
         publicKey: string;
     }>;
-    signEVMTransaction: ({ rawTx, accountIndex, }: {
+    signEVMTransaction: (request: {
         accountIndex: number;
         rawTx: string;
         expectedAddress: string;
-    }) => Promise<{
+    }, authority: HardwareTransactionAuthority) => Promise<{
         r: string;
         s: string;
         v: string;

package/types/ledger-host.d.ts

@@ -1,7 +1,11 @@
-import type { LedgerHost, LedgerEvmConfig } from './ledger/host-types';
+import { type LedgerDmkHost } from './ledger/dmk-host';
+import type { LedgerEvmConfig } from './ledger/host-types';
 export interface LedgerDmkHostConfig extends LedgerEvmConfig {
     /** Platform-owned DMK, allowing a future host to register its own transports. */
     dmk?: object;
+    /** Disable automatic discovery until the platform selects a device. */
+    requireDeviceSelection?: boolean;
 }
-export declare function createLedgerDmkHost(config?: LedgerDmkHostConfig): LedgerHost;
+export declare function createLedgerDmkHost(config?: LedgerDmkHostConfig): LedgerDmkHost;
+export type { LedgerDmkHost } from './ledger/dmk-host';
 export type { LedgerEvmConfig, LedgerBlindSigningIntent, LedgerHost, LedgerEvmHost, LedgerUtxoHost, LedgerUtxoAccount, LedgerPartialSignature, LedgerTypedData, LedgerOperationOptions, LedgerProgress, } from './ledger/host-types';