Skip to content

fix(wallet): per-input signing after HD rotation #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kukks merged 2 commits into from
May 14, 2026
Merged

fix(wallet): per-input signing after HD rotation #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baa0b90
fix(wallet): route per-input signing through DescriptorProvider after…
pietro909 May 14, 2026
6c01831
fix(worker): forward walletMode to service worker wallet
pietro909 May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ import {
ReadonlyWallet,
waitForIncomingFunds,
IncomingFunds,
MissingSigningDescriptorError,
} from "./wallet/wallet";
import { TxTree, TxTreeNode } from "./tree/txTree";
import {
Expand All @@ -96,7 +97,10 @@ import {
ServiceWorkerReadonlyWallet,
DEFAULT_MESSAGE_TIMEOUTS,
} from "./wallet/serviceWorker/wallet";
import type { MessageTimeouts } from "./wallet/serviceWorker/wallet";
import type {
MessageTimeouts,
ServiceWorkerWalletMode,
} from "./wallet/serviceWorker/wallet";
import { OnchainWallet } from "./wallet/onchain";
import { setupServiceWorker } from "./worker/browser/utils";
import {
Expand Down Expand Up @@ -401,6 +405,7 @@ export {
// Errors
ArkError,
maybeArkError,
MissingSigningDescriptorError,

// Batch session
Batch,
Expand Down Expand Up @@ -575,6 +580,7 @@ export type {
RequestEnvelope,
ResponseEnvelope,
MessageTimeouts,
ServiceWorkerWalletMode,

// Delegator types
IDelegatorManager,
Expand Down
12 changes: 12 additions & 0 deletions src/wallet/serviceWorker/wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ type RequestType = WalletUpdaterRequest["type"];

export type MessageTimeouts = Partial<Record<RequestType, number>>;

export type ServiceWorkerWalletMode = "auto" | "static" | "hd";

export const DEFAULT_MESSAGE_TIMEOUTS: Readonly<Record<RequestType, number>> = {
// Fast reads — fail quickly
GET_ADDRESS: 10_000,
Expand Down Expand Up @@ -356,6 +358,14 @@ interface ServiceWorkerWalletOptions {
messageBusTimeoutMs?: number;
/** Optional settlement configuration forwarded to the worker wallet. */
settlementConfig?: SettlementConfig | false;
/**
* Receive-address strategy forwarded to the worker wallet.
*
* Service workers can only receive serializable configuration, so the
* descriptor-provider object form accepted by `Wallet.create()` is not
* supported here.
*/
walletMode?: ServiceWorkerWalletMode;
/** Optional contract watcher configuration forwarded to the worker wallet. */
watcherConfig?: Partial<Omit<ContractWatcherConfig, "indexerProvider">>;
/**
Expand Down Expand Up @@ -400,6 +410,7 @@ type MessageBusInitConfig = {
esploraUrl?: string;
timeoutMs?: number;
settlementConfig?: SettlementConfig | false;
walletMode?: ServiceWorkerWalletMode;
watcherConfig?: Partial<Omit<ContractWatcherConfig, "indexerProvider">>;
messageTimeouts?: Record<string, number>;
};
Expand Down Expand Up @@ -1428,6 +1439,7 @@ export class ServiceWorkerWallet
indexerUrl: options.indexerUrl,
esploraUrl: options.esploraUrl,
settlementConfig: options.settlementConfig,
walletMode: options.walletMode,
watcherConfig: options.watcherConfig,
messageTimeouts,
};
Expand Down
Loading