@arkade-os/sdk 0.4.0-next.6 → 0.4.0-next.8

package/dist/cjs/wallet/serviceWorker/wallet.js

@@ -95,6 +95,9 @@ class ServiceWorkerReadonlyWallet {
     constructor(serviceWorker, identity, walletRepository, contractRepository, messageTag) {
         this.serviceWorker = serviceWorker;
         this.messageTag = messageTag;
+        this.initConfig = null;
+        this.initWalletPayload = null;
+        this.reinitPromise = null;
         this.identity = identity;
         this.walletRepository = walletRepository;
         this.contractRepository = contractRepository;
@@ -135,6 +138,16 @@ class ServiceWorkerReadonlyWallet {
             payload: initConfig,
         };
         await wallet.sendMessage(initMessage);
+        wallet.initConfig = {
+            wallet: initConfig.key,
+            arkServer: {
+                url: initConfig.arkServerUrl,
+                publicKey: initConfig.arkServerPublicKey,
+            },
+            delegatorUrl: initConfig.delegatorUrl,
+        };
+        wallet.initWalletPayload = initConfig;
+        wallet.messageBusTimeoutMs = options.messageBusTimeoutMs;
         return wallet;
     }
     /**
@@ -160,15 +173,17 @@ class ServiceWorkerReadonlyWallet {
      */
     static async setup(options) {
         // Register and setup the service worker
-        const serviceWorker = await (0, utils_1.setupServiceWorker)(options.serviceWorkerPath);
+        const serviceWorker = await (0, utils_1.setupServiceWorker)({
+            path: options.serviceWorkerPath,
+            activationTimeoutMs: options.serviceWorkerActivationTimeoutMs,
+        });
         // Use the existing create method
         return await ServiceWorkerReadonlyWallet.create({
             ...options,
             serviceWorker,
         });
     }
-    // send a message and wait for a response
-    async sendMessage(request) {
+    sendMessageDirect(request) {
         return new Promise((resolve, reject) => {
             const cleanup = () => {
                 clearTimeout(timeoutId);
@@ -195,6 +210,44 @@ class ServiceWorkerReadonlyWallet {
             this.serviceWorker.postMessage(request);
         });
     }
+    // send a message, retrying up to 2 times if the service worker was
+    // killed and restarted by the OS (mobile browsers do this aggressively)
+    async sendMessage(request) {
+        const maxRetries = 2;
+        for (let attempt = 0;; attempt++) {
+            try {
+                return await this.sendMessageDirect(request);
+            }
+            catch (error) {
+                const isNotInitialized = typeof error?.message === "string" &&
+                    error.message.includes("MessageBus not initialized");
+                if (!isNotInitialized || attempt >= maxRetries) {
+                    throw error;
+                }
+                await this.reinitialize();
+            }
+        }
+    }
+    async reinitialize() {
+        if (this.reinitPromise)
+            return this.reinitPromise;
+        this.reinitPromise = (async () => {
+            if (!this.initConfig || !this.initWalletPayload) {
+                throw new Error("Cannot re-initialize: missing configuration");
+            }
+            await initializeMessageBus(this.serviceWorker, this.initConfig, this.messageBusTimeoutMs);
+            const initMessage = {
+                tag: this.messageTag,
+                type: "INIT_WALLET",
+                id: (0, utils_2.getRandomId)(),
+                payload: this.initWalletPayload,
+            };
+            await this.sendMessageDirect(initMessage);
+        })().finally(() => {
+            this.reinitPromise = null;
+        });
+        return this.reinitPromise;
+    }
     async clear() {
         const message = {
             id: (0, utils_2.getRandomId)(),
@@ -554,6 +607,16 @@ class ServiceWorkerWallet extends ServiceWorkerReadonlyWallet {
         };
         // Initialize the service worker
         await wallet.sendMessage(initMessage);
+        wallet.initConfig = {
+            wallet: initConfig.key,
+            arkServer: {
+                url: initConfig.arkServerUrl,
+                publicKey: initConfig.arkServerPublicKey,
+            },
+            delegatorUrl: initConfig.delegatorUrl,
+        };
+        wallet.initWalletPayload = initConfig;
+        wallet.messageBusTimeoutMs = options.messageBusTimeoutMs;
         return wallet;
     }
     /**
@@ -579,7 +642,10 @@ class ServiceWorkerWallet extends ServiceWorkerReadonlyWallet {
      */
     static async setup(options) {
         // Register and setup the service worker
-        const serviceWorker = await (0, utils_1.setupServiceWorker)(options.serviceWorkerPath);
+        const serviceWorker = await (0, utils_1.setupServiceWorker)({
+            path: options.serviceWorkerPath,
+            activationTimeoutMs: options.serviceWorkerActivationTimeoutMs,
+        });
         // Use the existing create method
         return ServiceWorkerWallet.create({
             ...options,

package/dist/cjs/wallet/wallet.js

@@ -273,21 +273,6 @@ class ReadonlyWallet {
         await this.walletRepository.saveVtxos(address, allExtended);
         return allExtended;
     }
-    async getVirtualCoins(filter = { withRecoverable: true, withUnrolled: false }) {
-        const scripts = [base_1.hex.encode(this.offchainTapscript.pkScript)];
-        const response = await this.indexerProvider.getVtxos({ scripts });
-        const allVtxos = response.vtxos;
-        let vtxos = allVtxos.filter(_1.isSpendable);
-        // all recoverable vtxos are spendable by definition
-        if (!filter.withRecoverable) {
-            vtxos = vtxos.filter((vtxo) => !(0, _1.isRecoverable)(vtxo) && !(0, _1.isExpired)(vtxo));
-        }
-        if (filter.withUnrolled) {
-            const spentVtxos = allVtxos.filter((vtxo) => !(0, _1.isSpendable)(vtxo));
-            vtxos.push(...spentVtxos.filter((vtxo) => vtxo.isUnrolled));
-        }
-        return vtxos;
-    }
     async getTransactionHistory() {
         const scripts = await this.getWalletScripts();
         const response = await this.indexerProvider.getVtxos({ scripts });
@@ -738,6 +723,10 @@ class Wallet extends ReadonlyWallet {
     async getDelegatorManager() {
         return this._delegatorManager;
     }
+    /**
+     * @deprecated Use `send`
+     * @param params
+     */
     async sendBitcoin(params) {
         if (params.amount <= 0) {
             throw new Error("Amount must be positive");
@@ -971,7 +960,7 @@ class Wallet extends ReadonlyWallet {
     async handleSettlementFinalizationEvent(event, inputs, forfeitOutputScript, connectorsGraph) {
         // the signed forfeits transactions to submit
         const signedForfeits = [];
-        const vtxos = await this.getVirtualCoins();
+        const vtxos = await this.getVtxos();
         let settlementPsbt = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(event.commitmentTx));
         let hasBoardingUtxos = false;
         let connectorIndex = 0;
@@ -1290,7 +1279,7 @@ class Wallet extends ReadonlyWallet {
         const recipients = (0, utils_1.validateRecipients)(args, Number(this.dustAmount));
         const address = await this.getAddress();
         const outputAddress = address_1.ArkAddress.decode(address);
-        const virtualCoins = await this.getVirtualCoins({
+        const virtualCoins = await this.getVtxos({
             withRecoverable: false,
         });
         // keep track of asset changes
@@ -1425,16 +1414,12 @@ class Wallet extends ReadonlyWallet {
      * @returns The ark transaction id and server-signed checkpoint PSBTs (for bookkeeping)
      */
     async buildAndSubmitOffchainTx(inputs, outputs) {
-        const tapLeafScript = this.offchainTapscript.forfeit();
-        if (!tapLeafScript) {
-            throw new Error("Selected leaf not found");
-        }
-        const tapTree = this.offchainTapscript.encode();
-        const offchainTx = (0, arkTransaction_1.buildOffchainTx)(inputs.map((input) => ({
-            ...input,
-            tapLeafScript,
-            tapTree,
-        })), outputs, this.serverUnrollScript);
+        const offchainTx = (0, arkTransaction_1.buildOffchainTx)(inputs.map((input) => {
+            return {
+                ...input,
+                tapLeafScript: input.forfeitTapLeafScript,
+            };
+        }), outputs, this.serverUnrollScript);
         const signedVirtualTx = await this.identity.sign(offchainTx.arkTx);
         const { arkTxid, signedCheckpointTxs } = await this.arkProvider.submitTx(base_1.base64.encode(signedVirtualTx.toPSBT()), offchainTx.checkpoints.map((c) => base_1.base64.encode(c.toPSBT())));
         const finalCheckpoints = await Promise.all(signedCheckpointTxs.map(async (c) => {

package/dist/cjs/worker/browser/utils.js

@@ -1,22 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_DB_NAME = void 0;
+exports.DEFAULT_SERVICE_WORKER_ACTIVATION_TIMEOUT_MS = exports.DEFAULT_DB_NAME = void 0;
 exports.setupServiceWorker = setupServiceWorker;
 exports.DEFAULT_DB_NAME = "arkade-service-worker";
+exports.DEFAULT_SERVICE_WORKER_ACTIVATION_TIMEOUT_MS = 10000;
+function normalizeOptions(pathOrOptions) {
+    if (typeof pathOrOptions === "string") {
+        return {
+            path: pathOrOptions,
+            activationTimeoutMs: exports.DEFAULT_SERVICE_WORKER_ACTIVATION_TIMEOUT_MS,
+        };
+    }
+    return {
+        path: pathOrOptions.path,
+        activationTimeoutMs: pathOrOptions.activationTimeoutMs ??
+            exports.DEFAULT_SERVICE_WORKER_ACTIVATION_TIMEOUT_MS,
+    };
+}
+function waitForServiceWorkerReady(timeoutMs) {
+    return new Promise((resolve, reject) => {
+        const timeoutId = setTimeout(() => {
+            reject(new Error(`Service worker activation timed out after ${timeoutMs}ms`));
+        }, timeoutMs);
+        navigator.serviceWorker.ready
+            .then((registration) => {
+            clearTimeout(timeoutId);
+            resolve(registration);
+        })
+            .catch((error) => {
+            clearTimeout(timeoutId);
+            reject(error);
+        });
+    });
+}
 /**
  * setupServiceWorker sets up the service worker.
- * @param path - the path to the service worker script
+ * @param pathOrOptions - the path to the service worker script or setup options
  * @throws if service workers are not supported or activation fails
  * @example
  * ```typescript
  * const worker = await setupServiceWorker("/service-worker.js");
  * ```
  */
-async function setupServiceWorker(path) {
+async function setupServiceWorker(pathOrOptions) {
     // check if service workers are supported
     if (!("serviceWorker" in navigator)) {
         throw new Error("Service workers are not supported in this browser");
     }
+    const { path, activationTimeoutMs } = normalizeOptions(pathOrOptions);
     // register service worker
     const registration = await navigator.serviceWorker.register(path);
     // force update to ensure the service worker is active
@@ -25,28 +56,12 @@ async function setupServiceWorker(path) {
     if (!serviceWorker) {
         throw new Error("Failed to get service worker instance");
     }
-    // wait for the service worker to be ready
-    return new Promise((resolve, reject) => {
-        if (serviceWorker.state === "activated")
-            return resolve(serviceWorker);
-        const onActivate = () => {
-            cleanup();
-            resolve(serviceWorker);
-        };
-        const onError = () => {
-            cleanup();
-            reject(new Error("Service worker failed to activate"));
-        };
-        const timeout = setTimeout(() => {
-            cleanup();
-            reject(new Error("Service worker activation timed out"));
-        }, 10000);
-        const cleanup = () => {
-            navigator.serviceWorker.removeEventListener("activate", onActivate);
-            navigator.serviceWorker.removeEventListener("error", onError);
-            clearTimeout(timeout);
-        };
-        navigator.serviceWorker.addEventListener("activate", onActivate);
-        navigator.serviceWorker.addEventListener("error", onError);
-    });
+    if (serviceWorker.state === "activated") {
+        return serviceWorker;
+    }
+    const readyRegistration = await waitForServiceWorkerReady(activationTimeoutMs);
+    if (!readyRegistration.active) {
+        throw new Error("Service worker registration is ready but has no active worker");
+    }
+    return readyRegistration.active;
 }

package/dist/esm/wallet/serviceWorker/wallet.js

@@ -92,6 +92,9 @@ export class ServiceWorkerReadonlyWallet {
     constructor(serviceWorker, identity, walletRepository, contractRepository, messageTag) {
         this.serviceWorker = serviceWorker;
         this.messageTag = messageTag;
+        this.initConfig = null;
+        this.initWalletPayload = null;
+        this.reinitPromise = null;
         this.identity = identity;
         this.walletRepository = walletRepository;
         this.contractRepository = contractRepository;
@@ -132,6 +135,16 @@ export class ServiceWorkerReadonlyWallet {
             payload: initConfig,
         };
         await wallet.sendMessage(initMessage);
+        wallet.initConfig = {
+            wallet: initConfig.key,
+            arkServer: {
+                url: initConfig.arkServerUrl,
+                publicKey: initConfig.arkServerPublicKey,
+            },
+            delegatorUrl: initConfig.delegatorUrl,
+        };
+        wallet.initWalletPayload = initConfig;
+        wallet.messageBusTimeoutMs = options.messageBusTimeoutMs;
         return wallet;
     }
     /**
@@ -157,15 +170,17 @@ export class ServiceWorkerReadonlyWallet {
      */
     static async setup(options) {
         // Register and setup the service worker
-        const serviceWorker = await setupServiceWorker(options.serviceWorkerPath);
+        const serviceWorker = await setupServiceWorker({
+            path: options.serviceWorkerPath,
+            activationTimeoutMs: options.serviceWorkerActivationTimeoutMs,
+        });
         // Use the existing create method
         return await ServiceWorkerReadonlyWallet.create({
             ...options,
             serviceWorker,
         });
     }
-    // send a message and wait for a response
-    async sendMessage(request) {
+    sendMessageDirect(request) {
         return new Promise((resolve, reject) => {
             const cleanup = () => {
                 clearTimeout(timeoutId);
@@ -192,6 +207,44 @@ export class ServiceWorkerReadonlyWallet {
             this.serviceWorker.postMessage(request);
         });
     }
+    // send a message, retrying up to 2 times if the service worker was
+    // killed and restarted by the OS (mobile browsers do this aggressively)
+    async sendMessage(request) {
+        const maxRetries = 2;
+        for (let attempt = 0;; attempt++) {
+            try {
+                return await this.sendMessageDirect(request);
+            }
+            catch (error) {
+                const isNotInitialized = typeof error?.message === "string" &&
+                    error.message.includes("MessageBus not initialized");
+                if (!isNotInitialized || attempt >= maxRetries) {
+                    throw error;
+                }
+                await this.reinitialize();
+            }
+        }
+    }
+    async reinitialize() {
+        if (this.reinitPromise)
+            return this.reinitPromise;
+        this.reinitPromise = (async () => {
+            if (!this.initConfig || !this.initWalletPayload) {
+                throw new Error("Cannot re-initialize: missing configuration");
+            }
+            await initializeMessageBus(this.serviceWorker, this.initConfig, this.messageBusTimeoutMs);
+            const initMessage = {
+                tag: this.messageTag,
+                type: "INIT_WALLET",
+                id: getRandomId(),
+                payload: this.initWalletPayload,
+            };
+            await this.sendMessageDirect(initMessage);
+        })().finally(() => {
+            this.reinitPromise = null;
+        });
+        return this.reinitPromise;
+    }
     async clear() {
         const message = {
             id: getRandomId(),
@@ -550,6 +603,16 @@ export class ServiceWorkerWallet extends ServiceWorkerReadonlyWallet {
         };
         // Initialize the service worker
         await wallet.sendMessage(initMessage);
+        wallet.initConfig = {
+            wallet: initConfig.key,
+            arkServer: {
+                url: initConfig.arkServerUrl,
+                publicKey: initConfig.arkServerPublicKey,
+            },
+            delegatorUrl: initConfig.delegatorUrl,
+        };
+        wallet.initWalletPayload = initConfig;
+        wallet.messageBusTimeoutMs = options.messageBusTimeoutMs;
         return wallet;
     }
     /**
@@ -575,7 +638,10 @@ export class ServiceWorkerWallet extends ServiceWorkerReadonlyWallet {
      */
     static async setup(options) {
         // Register and setup the service worker
-        const serviceWorker = await setupServiceWorker(options.serviceWorkerPath);
+        const serviceWorker = await setupServiceWorker({
+            path: options.serviceWorkerPath,
+            activationTimeoutMs: options.serviceWorkerActivationTimeoutMs,
+        });
         // Use the existing create method
         return ServiceWorkerWallet.create({
             ...options,

package/dist/esm/wallet/wallet.js

@@ -268,21 +268,6 @@ export class ReadonlyWallet {
         await this.walletRepository.saveVtxos(address, allExtended);
         return allExtended;
     }
-    async getVirtualCoins(filter = { withRecoverable: true, withUnrolled: false }) {
-        const scripts = [hex.encode(this.offchainTapscript.pkScript)];
-        const response = await this.indexerProvider.getVtxos({ scripts });
-        const allVtxos = response.vtxos;
-        let vtxos = allVtxos.filter(isSpendable);
-        // all recoverable vtxos are spendable by definition
-        if (!filter.withRecoverable) {
-            vtxos = vtxos.filter((vtxo) => !isRecoverable(vtxo) && !isExpired(vtxo));
-        }
-        if (filter.withUnrolled) {
-            const spentVtxos = allVtxos.filter((vtxo) => !isSpendable(vtxo));
-            vtxos.push(...spentVtxos.filter((vtxo) => vtxo.isUnrolled));
-        }
-        return vtxos;
-    }
     async getTransactionHistory() {
         const scripts = await this.getWalletScripts();
         const response = await this.indexerProvider.getVtxos({ scripts });
@@ -732,6 +717,10 @@ export class Wallet extends ReadonlyWallet {
     async getDelegatorManager() {
         return this._delegatorManager;
     }
+    /**
+     * @deprecated Use `send`
+     * @param params
+     */
     async sendBitcoin(params) {
         if (params.amount <= 0) {
             throw new Error("Amount must be positive");
@@ -965,7 +954,7 @@ export class Wallet extends ReadonlyWallet {
     async handleSettlementFinalizationEvent(event, inputs, forfeitOutputScript, connectorsGraph) {
         // the signed forfeits transactions to submit
         const signedForfeits = [];
-        const vtxos = await this.getVirtualCoins();
+        const vtxos = await this.getVtxos();
         let settlementPsbt = Transaction.fromPSBT(base64.decode(event.commitmentTx));
         let hasBoardingUtxos = false;
         let connectorIndex = 0;
@@ -1284,7 +1273,7 @@ export class Wallet extends ReadonlyWallet {
         const recipients = validateRecipients(args, Number(this.dustAmount));
         const address = await this.getAddress();
         const outputAddress = ArkAddress.decode(address);
-        const virtualCoins = await this.getVirtualCoins({
+        const virtualCoins = await this.getVtxos({
             withRecoverable: false,
         });
         // keep track of asset changes
@@ -1419,16 +1408,12 @@ export class Wallet extends ReadonlyWallet {
      * @returns The ark transaction id and server-signed checkpoint PSBTs (for bookkeeping)
      */
     async buildAndSubmitOffchainTx(inputs, outputs) {
-        const tapLeafScript = this.offchainTapscript.forfeit();
-        if (!tapLeafScript) {
-            throw new Error("Selected leaf not found");
-        }
-        const tapTree = this.offchainTapscript.encode();
-        const offchainTx = buildOffchainTx(inputs.map((input) => ({
-            ...input,
-            tapLeafScript,
-            tapTree,
-        })), outputs, this.serverUnrollScript);
+        const offchainTx = buildOffchainTx(inputs.map((input) => {
+            return {
+                ...input,
+                tapLeafScript: input.forfeitTapLeafScript,
+            };
+        }), outputs, this.serverUnrollScript);
         const signedVirtualTx = await this.identity.sign(offchainTx.arkTx);
         const { arkTxid, signedCheckpointTxs } = await this.arkProvider.submitTx(base64.encode(signedVirtualTx.toPSBT()), offchainTx.checkpoints.map((c) => base64.encode(c.toPSBT())));
         const finalCheckpoints = await Promise.all(signedCheckpointTxs.map(async (c) => {

package/dist/esm/worker/browser/utils.js

@@ -1,18 +1,49 @@
 export const DEFAULT_DB_NAME = "arkade-service-worker";
+export const DEFAULT_SERVICE_WORKER_ACTIVATION_TIMEOUT_MS = 10000;
+function normalizeOptions(pathOrOptions) {
+    if (typeof pathOrOptions === "string") {
+        return {
+            path: pathOrOptions,
+            activationTimeoutMs: DEFAULT_SERVICE_WORKER_ACTIVATION_TIMEOUT_MS,
+        };
+    }
+    return {
+        path: pathOrOptions.path,
+        activationTimeoutMs: pathOrOptions.activationTimeoutMs ??
+            DEFAULT_SERVICE_WORKER_ACTIVATION_TIMEOUT_MS,
+    };
+}
+function waitForServiceWorkerReady(timeoutMs) {
+    return new Promise((resolve, reject) => {
+        const timeoutId = setTimeout(() => {
+            reject(new Error(`Service worker activation timed out after ${timeoutMs}ms`));
+        }, timeoutMs);
+        navigator.serviceWorker.ready
+            .then((registration) => {
+            clearTimeout(timeoutId);
+            resolve(registration);
+        })
+            .catch((error) => {
+            clearTimeout(timeoutId);
+            reject(error);
+        });
+    });
+}
 /**
  * setupServiceWorker sets up the service worker.
- * @param path - the path to the service worker script
+ * @param pathOrOptions - the path to the service worker script or setup options
  * @throws if service workers are not supported or activation fails
  * @example
  * ```typescript
  * const worker = await setupServiceWorker("/service-worker.js");
  * ```
  */
-export async function setupServiceWorker(path) {
+export async function setupServiceWorker(pathOrOptions) {
     // check if service workers are supported
     if (!("serviceWorker" in navigator)) {
         throw new Error("Service workers are not supported in this browser");
     }
+    const { path, activationTimeoutMs } = normalizeOptions(pathOrOptions);
     // register service worker
     const registration = await navigator.serviceWorker.register(path);
     // force update to ensure the service worker is active
@@ -21,28 +52,12 @@ export async function setupServiceWorker(path) {
     if (!serviceWorker) {
         throw new Error("Failed to get service worker instance");
     }
-    // wait for the service worker to be ready
-    return new Promise((resolve, reject) => {
-        if (serviceWorker.state === "activated")
-            return resolve(serviceWorker);
-        const onActivate = () => {
-            cleanup();
-            resolve(serviceWorker);
-        };
-        const onError = () => {
-            cleanup();
-            reject(new Error("Service worker failed to activate"));
-        };
-        const timeout = setTimeout(() => {
-            cleanup();
-            reject(new Error("Service worker activation timed out"));
-        }, 10000);
-        const cleanup = () => {
-            navigator.serviceWorker.removeEventListener("activate", onActivate);
-            navigator.serviceWorker.removeEventListener("error", onError);
-            clearTimeout(timeout);
-        };
-        navigator.serviceWorker.addEventListener("activate", onActivate);
-        navigator.serviceWorker.addEventListener("error", onError);
-    });
+    if (serviceWorker.state === "activated") {
+        return serviceWorker;
+    }
+    const readyRegistration = await waitForServiceWorkerReady(activationTimeoutMs);
+    if (!readyRegistration.active) {
+        throw new Error("Service worker registration is ready but has no active worker");
+    }
+    return readyRegistration.active;
 }

package/dist/types/wallet/asset.d.ts

@@ -1,5 +1,5 @@
 import { Packet } from "../extension/asset";
-import { Asset, Recipient, VirtualCoin } from "./index";
+import { Asset, ExtendedVirtualCoin, Recipient, VirtualCoin } from "./index";
 /**
  * Creates an asset packet from asset inputs and receivers.
  * Groups inputs and outputs by asset ID and creates the Packet object
@@ -13,8 +13,8 @@ export declare function createAssetPacket(assetInputs: Map<number, Asset[]>, rec
  * Selects coins that contain a specific asset.
  * Returns coins sorted by amount (smallest first for better coin selection).
  */
-export declare function selectCoinsWithAsset(coins: VirtualCoin[], assetId: string, requiredAmount: bigint): {
-    selected: VirtualCoin[];
+export declare function selectCoinsWithAsset(coins: ExtendedVirtualCoin[], assetId: string, requiredAmount: bigint): {
+    selected: ExtendedVirtualCoin[];
     totalAssetAmount: bigint;
 };
 export declare function computeAssetChange(inputAssets: Map<string, bigint>, outputAssets: Map<string, bigint>): Map<string, bigint>;

package/dist/types/wallet/index.d.ts

@@ -140,7 +140,7 @@ export interface SendBitcoinParams {
     amount: number;
     feeRate?: number;
     memo?: string;
-    selectedVtxos?: VirtualCoin[];
+    selectedVtxos?: ExtendedVirtualCoin[];
 }
 export interface Asset {
     assetId: string;

package/dist/types/wallet/serviceWorker/wallet.d.ts

@@ -3,7 +3,7 @@ import { SettlementEvent } from "../../providers/ark";
 import { Identity, ReadonlyIdentity } from "../../identity";
 import { WalletRepository } from "../../repositories/walletRepository";
 import { ContractRepository } from "../../repositories/contractRepository";
-import { ResponseGetStatus, WalletUpdaterRequest, WalletUpdaterResponse } from "./wallet-message-handler";
+import { RequestInitWallet, ResponseGetStatus, WalletUpdaterRequest, WalletUpdaterResponse } from "./wallet-message-handler";
 import type { IContractManager } from "../../contracts/contractManager";
 import type { IDelegatorManager } from "../delegator";
 type PrivateKeyIdentity = Identity & {
@@ -56,6 +56,20 @@ export type ServiceWorkerWalletCreateOptions = ServiceWorkerWalletOptions & {
 };
 export type ServiceWorkerWalletSetupOptions = ServiceWorkerWalletOptions & {
     serviceWorkerPath: string;
+    serviceWorkerActivationTimeoutMs?: number;
+};
+type MessageBusInitConfig = {
+    wallet: {
+        privateKey: string;
+    } | {
+        publicKey: string;
+    };
+    arkServer: {
+        url: string;
+        publicKey?: string;
+    };
+    delegatorUrl?: string;
+    timeoutMs?: number;
 };
 export declare class ServiceWorkerReadonlyWallet implements IReadonlyWallet {
     readonly serviceWorker: ServiceWorker;
@@ -64,6 +78,10 @@ export declare class ServiceWorkerReadonlyWallet implements IReadonlyWallet {
     readonly contractRepository: ContractRepository;
     readonly identity: ReadonlyIdentity;
     private readonly _readonlyAssetManager;
+    protected initConfig: MessageBusInitConfig | null;
+    protected initWalletPayload: RequestInitWallet["payload"] | null;
+    protected messageBusTimeoutMs?: number;
+    private reinitPromise;
     get assetManager(): IReadonlyAssetManager;
     protected constructor(serviceWorker: ServiceWorker, identity: ReadonlyIdentity, walletRepository: WalletRepository, contractRepository: ContractRepository, messageTag: string);
     static create(options: ServiceWorkerWalletCreateOptions): Promise<ServiceWorkerReadonlyWallet>;
@@ -89,7 +107,9 @@ export declare class ServiceWorkerReadonlyWallet implements IReadonlyWallet {
      * ```
      */
     static setup(options: ServiceWorkerWalletSetupOptions): Promise<ServiceWorkerReadonlyWallet>;
+    private sendMessageDirect;
     protected sendMessage(request: WalletUpdaterRequest): Promise<WalletUpdaterResponse>;
+    private reinitialize;
     clear(): Promise<void>;
     getAddress(): Promise<string>;
     getBoardingAddress(): Promise<string>;

package/dist/types/wallet/wallet.d.ts

@@ -7,7 +7,7 @@ import { OnchainProvider } from "../providers/onchain";
 import { ArkProvider, SettlementEvent, SignedIntent } from "../providers/ark";
 import { SignerSession } from "../tree/signingSession";
 import { Identity, ReadonlyIdentity } from "../identity";
-import { ArkTransaction, Recipient, Coin, ExtendedCoin, ExtendedVirtualCoin, GetVtxosFilter, IReadonlyWallet, IWallet, ReadonlyWalletConfig, SendBitcoinParams, SettleParams, VirtualCoin, WalletBalance, WalletConfig, IAssetManager, IReadonlyAssetManager } from ".";
+import { ArkTransaction, Recipient, Coin, ExtendedCoin, ExtendedVirtualCoin, GetVtxosFilter, IReadonlyWallet, IWallet, ReadonlyWalletConfig, SendBitcoinParams, SettleParams, WalletBalance, WalletConfig, IAssetManager, IReadonlyAssetManager } from ".";
 import { CSVMultisigTapscript } from "../script/tapscript";
 import { Intent } from "../intent";
 import { IndexerProvider } from "../providers/indexer";
@@ -74,7 +74,6 @@ export declare class ReadonlyWallet implements IReadonlyWallet {
     getBoardingAddress(): Promise<string>;
     getBalance(): Promise<WalletBalance>;
     getVtxos(filter?: GetVtxosFilter): Promise<ExtendedVirtualCoin[]>;
-    protected getVirtualCoins(filter?: GetVtxosFilter): Promise<VirtualCoin[]>;
     getTransactionHistory(): Promise<ArkTransaction[]>;
     getBoardingTxs(): Promise<{
         boardingTxs: ArkTransaction[];
@@ -193,6 +192,10 @@ export declare class Wallet extends ReadonlyWallet implements IWallet {
      */
     toReadonly(): Promise<ReadonlyWallet>;
     getDelegatorManager(): Promise<IDelegatorManager | undefined>;
+    /**
+     * @deprecated Use `send`
+     * @param params
+     */
     sendBitcoin(params: SendBitcoinParams): Promise<string>;
     settle(params?: SettleParams, eventCallback?: (event: SettlementEvent) => void): Promise<string>;
     private handleSettlementFinalizationEvent;
@@ -238,7 +241,7 @@ export declare class Wallet extends ReadonlyWallet implements IWallet {
      * sign it, submit to the ark provider, and finalize.
      * @returns The ark transaction id and server-signed checkpoint PSBTs (for bookkeeping)
      */
-    buildAndSubmitOffchainTx(inputs: VirtualCoin[], outputs: TransactionOutput[]): Promise<{
+    buildAndSubmitOffchainTx(inputs: ExtendedVirtualCoin[], outputs: TransactionOutput[]): Promise<{
         arkTxid: string;
         signedCheckpointTxs: string[];
     }>;
@@ -251,8 +254,8 @@ export declare class Wallet extends ReadonlyWallet implements IWallet {
  * @param targetAmount Target amount to reach in satoshis
  * @returns Selected coins and change amount
  */
-export declare function selectVirtualCoins(coins: VirtualCoin[], targetAmount: number): {
-    inputs: VirtualCoin[];
+export declare function selectVirtualCoins(coins: ExtendedVirtualCoin[], targetAmount: number): {
+    inputs: ExtendedVirtualCoin[];
     changeAmount: bigint;
 };
 /**

package/dist/types/worker/browser/utils.d.ts

@@ -1,11 +1,17 @@
 export declare const DEFAULT_DB_NAME = "arkade-service-worker";
+export declare const DEFAULT_SERVICE_WORKER_ACTIVATION_TIMEOUT_MS = 10000;
+type SetupServiceWorkerOptions = {
+    path: string;
+    activationTimeoutMs?: number;
+};
 /**
  * setupServiceWorker sets up the service worker.
- * @param path - the path to the service worker script
+ * @param pathOrOptions - the path to the service worker script or setup options
  * @throws if service workers are not supported or activation fails
  * @example
  * ```typescript
  * const worker = await setupServiceWorker("/service-worker.js");
  * ```
  */
-export declare function setupServiceWorker(path: string): Promise<ServiceWorker>;
+export declare function setupServiceWorker(pathOrOptions: string | SetupServiceWorkerOptions): Promise<ServiceWorker>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.4.0-next.6",
+  "version": "0.4.0-next.8",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",