@arkade-os/sdk 0.2.0 → 0.2.2

package/README.md

@@ -2,6 +2,7 @@
 The Arkade SDK is a TypeScript library for building Bitcoin wallets with support for both on-chain and off-chain transactions via the Ark protocol.
 
 [![TypeScript Documentation](https://img.shields.io/badge/TypeScript-Documentation-blue?style=flat-square)](https://arkade-os.github.io/ts-sdk/)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/arkade-os/ts-sdk)
 
 ## Installation
 

package/dist/cjs/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Unroll = exports.P2A = exports.TxTree = exports.BIP322 = exports.IndexedDBVtxoRepository = exports.networks = exports.ArkNote = exports.waitForIncomingFunds = exports.buildOffchainTx = exports.ConditionWitness = exports.VtxoTaprootTree = exports.VtxoTreeExpiry = exports.CosignerPublicKey = exports.getArkPsbtFields = exports.setArkPsbtField = exports.ArkPsbtFieldKeyType = exports.ArkPsbtFieldKey = exports.CLTVMultisigTapscript = exports.ConditionMultisigTapscript = exports.ConditionCSVMultisigTapscript = exports.CSVMultisigTapscript = exports.MultisigTapscript = exports.decodeTapscript = exports.Response = exports.Request = exports.ServiceWorkerWallet = exports.Worker = exports.setupServiceWorker = exports.SettlementEventType = exports.ChainTxType = exports.IndexerTxType = exports.TxType = exports.VHTLC = exports.VtxoScript = exports.DefaultVtxo = exports.ArkAddress = exports.RestIndexerProvider = exports.RestArkProvider = exports.EsploraProvider = exports.ESPLORA_URL = exports.Ramps = exports.OnchainWallet = exports.SingleKey = exports.Wallet = void 0;
+exports.Transaction = exports.Unroll = exports.P2A = exports.TxTree = exports.BIP322 = exports.IndexedDBVtxoRepository = exports.networks = exports.ArkNote = exports.waitForIncomingFunds = exports.buildOffchainTx = exports.ConditionWitness = exports.VtxoTaprootTree = exports.VtxoTreeExpiry = exports.CosignerPublicKey = exports.getArkPsbtFields = exports.setArkPsbtField = exports.ArkPsbtFieldKeyType = exports.ArkPsbtFieldKey = exports.CLTVMultisigTapscript = exports.ConditionMultisigTapscript = exports.ConditionCSVMultisigTapscript = exports.CSVMultisigTapscript = exports.MultisigTapscript = exports.decodeTapscript = exports.Response = exports.Request = exports.ServiceWorkerWallet = exports.Worker = exports.setupServiceWorker = exports.SettlementEventType = exports.ChainTxType = exports.IndexerTxType = exports.TxType = exports.VHTLC = exports.VtxoScript = exports.DefaultVtxo = exports.ArkAddress = exports.RestIndexerProvider = exports.RestArkProvider = exports.EsploraProvider = exports.ESPLORA_URL = exports.Ramps = exports.OnchainWallet = exports.SingleKey = exports.Wallet = void 0;
+const btc_signer_1 = require("@scure/btc-signer");
+Object.defineProperty(exports, "Transaction", { enumerable: true, get: function () { return btc_signer_1.Transaction; } });
 const singleKey_1 = require("./identity/singleKey");
 Object.defineProperty(exports, "SingleKey", { enumerable: true, get: function () { return singleKey_1.SingleKey; } });
 const address_1 = require("./script/address");

package/dist/cjs/providers/ark.js

@@ -469,11 +469,15 @@ function decodeMusig2Nonces(str) {
 }
 function isFetchTimeoutError(err) {
     const checkError = (error) => {
-        return (error instanceof Error &&
-            (error.name === "HeadersTimeoutError" ||
-                error.name === "BodyTimeoutError" ||
-                error.code === "UND_ERR_HEADERS_TIMEOUT" ||
-                error.code === "UND_ERR_BODY_TIMEOUT"));
+        if (!(error instanceof Error))
+            return false;
+        // TODO: get something more robust than this
+        const isCloudflare524 = error.name === "TypeError" && error.message === "Failed to fetch";
+        return (isCloudflare524 ||
+            error.name === "HeadersTimeoutError" ||
+            error.name === "BodyTimeoutError" ||
+            error.code === "UND_ERR_HEADERS_TIMEOUT" ||
+            error.code === "UND_ERR_BODY_TIMEOUT");
     };
     return checkError(err) || checkError(err.cause);
 }

package/dist/cjs/script/tapscript.js

@@ -39,6 +39,7 @@ const bip68 = __importStar(require("bip68"));
 const script_1 = require("@scure/btc-signer/script");
 const payment_1 = require("@scure/btc-signer/payment");
 const base_1 = require("@scure/base");
+const MinimalScriptNum = (0, script_1.ScriptNum)(undefined, true);
 var TapscriptType;
 (function (TapscriptType) {
     TapscriptType["Multisig"] = "multisig";
@@ -267,10 +268,14 @@ var CSVMultisigTapscript;
                 throw new Error(`Invalid pubkey length: expected 32, got ${pubkey.length}`);
             }
         }
-        const sequence = (0, script_1.ScriptNum)().encode(BigInt(bip68.encode(params.timelock.type === "blocks"
+        const sequence = MinimalScriptNum.encode(BigInt(bip68.encode(params.timelock.type === "blocks"
             ? { blocks: Number(params.timelock.value) }
             : { seconds: Number(params.timelock.value) })));
-        const asm = [sequence, "CHECKSEQUENCEVERIFY", "DROP"];
+        const asm = [
+            sequence.length === 1 ? sequence[0] : sequence,
+            "CHECKSEQUENCEVERIFY",
+            "DROP",
+        ];
         const multisigScript = MultisigTapscript.encode(params);
         const script = new Uint8Array([
             ...script_1.Script.encode(asm),
@@ -306,7 +311,7 @@ var CSVMultisigTapscript;
         catch (error) {
             throw new Error(`Invalid multisig script: ${error instanceof Error ? error.message : String(error)}`);
         }
-        const sequenceNum = Number((0, script_1.ScriptNum)().decode(sequence));
+        const sequenceNum = Number(MinimalScriptNum.decode(sequence));
         const decodedTimelock = bip68.decode(sequenceNum);
         const timelock = decodedTimelock.blocks !== undefined
             ? { type: "blocks", value: BigInt(decodedTimelock.blocks) }
@@ -498,8 +503,12 @@ var ConditionMultisigTapscript;
 var CLTVMultisigTapscript;
 (function (CLTVMultisigTapscript) {
     function encode(params) {
-        const locktime = (0, script_1.ScriptNum)().encode(params.absoluteTimelock);
-        const asm = [locktime, "CHECKLOCKTIMEVERIFY", "DROP"];
+        const locktime = MinimalScriptNum.encode(params.absoluteTimelock);
+        const asm = [
+            locktime.length === 1 ? locktime[0] : locktime,
+            "CHECKLOCKTIMEVERIFY",
+            "DROP",
+        ];
         const timelockedScript = script_1.Script.encode(asm);
         const script = new Uint8Array([
             ...timelockedScript,
@@ -535,7 +544,7 @@ var CLTVMultisigTapscript;
         catch (error) {
             throw new Error(`Invalid multisig script: ${error instanceof Error ? error.message : String(error)}`);
         }
-        const absoluteTimelock = (0, script_1.ScriptNum)().decode(locktime);
+        const absoluteTimelock = MinimalScriptNum.decode(locktime);
         const reconstructed = encode({
             absoluteTimelock,
             ...multisig.params,

package/dist/cjs/script/vhtlc.js

@@ -36,6 +36,7 @@ var VHTLC;
 (function (VHTLC) {
     class Script extends base_2.VtxoScript {
         constructor(options) {
+            validateOptions(options);
             const { sender, receiver, server, preimageHash, refundLocktime, unilateralClaimDelay, unilateralRefundDelay, unilateralRefundWithoutReceiverDelay, } = options;
             const conditionScript = preimageConditionScript(preimageHash);
             const claimScript = tapscript_1.ConditionMultisigTapscript.encode({
@@ -98,6 +99,63 @@ var VHTLC;
         }
     }
     VHTLC.Script = Script;
+    function validateOptions(options) {
+        const { sender, receiver, server, preimageHash, refundLocktime, unilateralClaimDelay, unilateralRefundDelay, unilateralRefundWithoutReceiverDelay, } = options;
+        if (!preimageHash || preimageHash.length !== 20) {
+            throw new Error("preimage hash must be 20 bytes");
+        }
+        if (!receiver || receiver.length !== 32) {
+            throw new Error("Invalid public key length (receiver)");
+        }
+        if (!sender || sender.length !== 32) {
+            throw new Error("Invalid public key length (sender)");
+        }
+        if (!server || server.length !== 32) {
+            throw new Error("Invalid public key length (server)");
+        }
+        if (typeof refundLocktime !== "bigint" || refundLocktime <= 0n) {
+            throw new Error("refund locktime must be greater than 0");
+        }
+        if (!unilateralClaimDelay ||
+            typeof unilateralClaimDelay.value !== "bigint" ||
+            unilateralClaimDelay.value <= 0n) {
+            throw new Error("unilateral claim delay must greater than 0");
+        }
+        if (unilateralClaimDelay.type === "seconds" &&
+            unilateralClaimDelay.value % 512n !== 0n) {
+            throw new Error("seconds timelock must be multiple of 512");
+        }
+        if (unilateralClaimDelay.type === "seconds" &&
+            unilateralClaimDelay.value < 512n) {
+            throw new Error("seconds timelock must be greater or equal to 512");
+        }
+        if (!unilateralRefundDelay ||
+            typeof unilateralRefundDelay.value !== "bigint" ||
+            unilateralRefundDelay.value <= 0n) {
+            throw new Error("unilateral refund delay must greater than 0");
+        }
+        if (unilateralRefundDelay.type === "seconds" &&
+            unilateralRefundDelay.value % 512n !== 0n) {
+            throw new Error("seconds timelock must be multiple of 512");
+        }
+        if (unilateralRefundDelay.type === "seconds" &&
+            unilateralRefundDelay.value < 512n) {
+            throw new Error("seconds timelock must be greater or equal to 512");
+        }
+        if (!unilateralRefundWithoutReceiverDelay ||
+            typeof unilateralRefundWithoutReceiverDelay.value !== "bigint" ||
+            unilateralRefundWithoutReceiverDelay.value <= 0n) {
+            throw new Error("unilateral refund without receiver delay must greater than 0");
+        }
+        if (unilateralRefundWithoutReceiverDelay.type === "seconds" &&
+            unilateralRefundWithoutReceiverDelay.value % 512n !== 0n) {
+            throw new Error("seconds timelock must be multiple of 512");
+        }
+        if (unilateralRefundWithoutReceiverDelay.type === "seconds" &&
+            unilateralRefundWithoutReceiverDelay.value < 512n) {
+            throw new Error("seconds timelock must be greater or equal to 512");
+        }
+    }
 })(VHTLC || (exports.VHTLC = VHTLC = {}));
 function preimageConditionScript(preimageHash) {
     return btc_signer_1.Script.encode(["HASH160", preimageHash, "EQUAL"]);

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

@@ -73,7 +73,7 @@ var Request;
         return (message.type === "SIGN" &&
             "tx" in message &&
             typeof message.tx === "string" &&
-            ("inputIndexes" in message
+            ("inputIndexes" in message && message.inputIndexes != undefined
                 ? Array.isArray(message.inputIndexes) &&
                     message.inputIndexes.every((index) => typeof index === "number")
                 : true));

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

@@ -151,12 +151,13 @@ var Response;
         return response.type === "WALLET_STATUS" && response.success === true;
     }
     Response.isWalletStatus = isWalletStatus;
-    function walletStatus(id, walletInitialized) {
+    function walletStatus(id, walletInitialized, xOnlyPublicKey) {
         return {
             type: "WALLET_STATUS",
             success: true,
             status: {
                 walletInitialized,
+                xOnlyPublicKey,
             },
             id,
         };

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

@@ -23,12 +23,27 @@ async function setupServiceWorker(path) {
         throw new Error("Failed to get service worker instance");
     }
     // wait for the service worker to be ready
-    if (serviceWorker.state !== "activated") {
-        await new Promise((resolve) => {
-            if (!serviceWorker)
-                return resolve();
-            serviceWorker.addEventListener("activate", () => resolve());
-        });
-    }
-    return serviceWorker;
+    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 = () => {
+            serviceWorker.removeEventListener("activate", onActivate);
+            serviceWorker.removeEventListener("error", onError);
+            clearTimeout(timeout);
+        };
+        serviceWorker.addEventListener("activate", onActivate);
+        serviceWorker.addEventListener("error", onError);
+    });
 }

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

@@ -46,6 +46,9 @@ class ServiceWorkerWallet {
         };
         const response = await this.sendMessage(message);
         if (response_1.Response.isWalletStatus(response)) {
+            const { walletInitialized, xOnlyPublicKey } = response.status;
+            if (walletInitialized)
+                this.cachedXOnlyPublicKey = xOnlyPublicKey;
             return response.status;
         }
         throw new UnexpectedResponseError(response);
@@ -62,6 +65,7 @@ class ServiceWorkerWallet {
             if (failIfInitialized) {
                 throw new Error("Wallet already initialized");
             }
+            this.cachedXOnlyPublicKey = response.status.xOnlyPublicKey;
             return;
         }
         // If not initialized, proceed with initialization
@@ -281,7 +285,10 @@ class ServiceWorkerWallet {
         try {
             const response = await this.sendMessage(message);
             if (response_1.Response.isSignSuccess(response)) {
-                return btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(response.tx));
+                return btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(response.tx), {
+                    allowUnknown: true,
+                    allowUnknownInputs: true,
+                });
             }
             throw new UnexpectedResponseError(response);
         }

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

@@ -407,7 +407,7 @@ class Worker {
             event.source?.postMessage(response_1.Response.error(message.id, "Invalid GET_STATUS message format"));
             return;
         }
-        event.source?.postMessage(response_1.Response.walletStatus(message.id, this.wallet !== undefined));
+        event.source?.postMessage(response_1.Response.walletStatus(message.id, this.wallet !== undefined, this.wallet?.identity.xOnlyPublicKey()));
     }
     async handleSign(event) {
         const message = event.data;
@@ -422,7 +422,10 @@ class Worker {
             return;
         }
         try {
-            const tx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(message.tx));
+            const tx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(message.tx), {
+                allowUnknown: true,
+                allowUnknownInputs: true,
+            });
             const signedTx = await this.wallet.identity.sign(tx, message.inputIndexes);
             event.source?.postMessage(response_1.Response.signSuccess(message.id, base_1.base64.encode(signedTx.toPSBT())));
         }

package/dist/esm/index.js

@@ -1,3 +1,4 @@
+import { Transaction } from "@scure/btc-signer";
 import { SingleKey } from './identity/singleKey.js';
 import { ArkAddress } from './script/address.js';
 import { VHTLC } from './script/vhtlc.js';
@@ -53,4 +54,4 @@ BIP322,
 // TxTree
 TxTree, 
 // Anchor
-P2A, Unroll, };
+P2A, Unroll, Transaction, };

package/dist/esm/providers/ark.js

@@ -464,11 +464,15 @@ function decodeMusig2Nonces(str) {
 }
 export function isFetchTimeoutError(err) {
     const checkError = (error) => {
-        return (error instanceof Error &&
-            (error.name === "HeadersTimeoutError" ||
-                error.name === "BodyTimeoutError" ||
-                error.code === "UND_ERR_HEADERS_TIMEOUT" ||
-                error.code === "UND_ERR_BODY_TIMEOUT"));
+        if (!(error instanceof Error))
+            return false;
+        // TODO: get something more robust than this
+        const isCloudflare524 = error.name === "TypeError" && error.message === "Failed to fetch";
+        return (isCloudflare524 ||
+            error.name === "HeadersTimeoutError" ||
+            error.name === "BodyTimeoutError" ||
+            error.code === "UND_ERR_HEADERS_TIMEOUT" ||
+            error.code === "UND_ERR_BODY_TIMEOUT");
     };
     return checkError(err) || checkError(err.cause);
 }

package/dist/esm/script/tapscript.js

@@ -2,6 +2,7 @@ import * as bip68 from "bip68";
 import { Script, ScriptNum } from "@scure/btc-signer/script";
 import { p2tr_ms } from "@scure/btc-signer/payment";
 import { hex } from "@scure/base";
+const MinimalScriptNum = ScriptNum(undefined, true);
 export var TapscriptType;
 (function (TapscriptType) {
     TapscriptType["Multisig"] = "multisig";
@@ -230,10 +231,14 @@ export var CSVMultisigTapscript;
                 throw new Error(`Invalid pubkey length: expected 32, got ${pubkey.length}`);
             }
         }
-        const sequence = ScriptNum().encode(BigInt(bip68.encode(params.timelock.type === "blocks"
+        const sequence = MinimalScriptNum.encode(BigInt(bip68.encode(params.timelock.type === "blocks"
             ? { blocks: Number(params.timelock.value) }
             : { seconds: Number(params.timelock.value) })));
-        const asm = [sequence, "CHECKSEQUENCEVERIFY", "DROP"];
+        const asm = [
+            sequence.length === 1 ? sequence[0] : sequence,
+            "CHECKSEQUENCEVERIFY",
+            "DROP",
+        ];
         const multisigScript = MultisigTapscript.encode(params);
         const script = new Uint8Array([
             ...Script.encode(asm),
@@ -269,7 +274,7 @@ export var CSVMultisigTapscript;
         catch (error) {
             throw new Error(`Invalid multisig script: ${error instanceof Error ? error.message : String(error)}`);
         }
-        const sequenceNum = Number(ScriptNum().decode(sequence));
+        const sequenceNum = Number(MinimalScriptNum.decode(sequence));
         const decodedTimelock = bip68.decode(sequenceNum);
         const timelock = decodedTimelock.blocks !== undefined
             ? { type: "blocks", value: BigInt(decodedTimelock.blocks) }
@@ -461,8 +466,12 @@ export var ConditionMultisigTapscript;
 export var CLTVMultisigTapscript;
 (function (CLTVMultisigTapscript) {
     function encode(params) {
-        const locktime = ScriptNum().encode(params.absoluteTimelock);
-        const asm = [locktime, "CHECKLOCKTIMEVERIFY", "DROP"];
+        const locktime = MinimalScriptNum.encode(params.absoluteTimelock);
+        const asm = [
+            locktime.length === 1 ? locktime[0] : locktime,
+            "CHECKLOCKTIMEVERIFY",
+            "DROP",
+        ];
         const timelockedScript = Script.encode(asm);
         const script = new Uint8Array([
             ...timelockedScript,
@@ -498,7 +507,7 @@ export var CLTVMultisigTapscript;
         catch (error) {
             throw new Error(`Invalid multisig script: ${error instanceof Error ? error.message : String(error)}`);
         }
-        const absoluteTimelock = ScriptNum().decode(locktime);
+        const absoluteTimelock = MinimalScriptNum.decode(locktime);
         const reconstructed = encode({
             absoluteTimelock,
             ...multisig.params,

package/dist/esm/script/vhtlc.js

@@ -33,6 +33,7 @@ export var VHTLC;
 (function (VHTLC) {
     class Script extends VtxoScript {
         constructor(options) {
+            validateOptions(options);
             const { sender, receiver, server, preimageHash, refundLocktime, unilateralClaimDelay, unilateralRefundDelay, unilateralRefundWithoutReceiverDelay, } = options;
             const conditionScript = preimageConditionScript(preimageHash);
             const claimScript = ConditionMultisigTapscript.encode({
@@ -95,6 +96,63 @@ export var VHTLC;
         }
     }
     VHTLC.Script = Script;
+    function validateOptions(options) {
+        const { sender, receiver, server, preimageHash, refundLocktime, unilateralClaimDelay, unilateralRefundDelay, unilateralRefundWithoutReceiverDelay, } = options;
+        if (!preimageHash || preimageHash.length !== 20) {
+            throw new Error("preimage hash must be 20 bytes");
+        }
+        if (!receiver || receiver.length !== 32) {
+            throw new Error("Invalid public key length (receiver)");
+        }
+        if (!sender || sender.length !== 32) {
+            throw new Error("Invalid public key length (sender)");
+        }
+        if (!server || server.length !== 32) {
+            throw new Error("Invalid public key length (server)");
+        }
+        if (typeof refundLocktime !== "bigint" || refundLocktime <= 0n) {
+            throw new Error("refund locktime must be greater than 0");
+        }
+        if (!unilateralClaimDelay ||
+            typeof unilateralClaimDelay.value !== "bigint" ||
+            unilateralClaimDelay.value <= 0n) {
+            throw new Error("unilateral claim delay must greater than 0");
+        }
+        if (unilateralClaimDelay.type === "seconds" &&
+            unilateralClaimDelay.value % 512n !== 0n) {
+            throw new Error("seconds timelock must be multiple of 512");
+        }
+        if (unilateralClaimDelay.type === "seconds" &&
+            unilateralClaimDelay.value < 512n) {
+            throw new Error("seconds timelock must be greater or equal to 512");
+        }
+        if (!unilateralRefundDelay ||
+            typeof unilateralRefundDelay.value !== "bigint" ||
+            unilateralRefundDelay.value <= 0n) {
+            throw new Error("unilateral refund delay must greater than 0");
+        }
+        if (unilateralRefundDelay.type === "seconds" &&
+            unilateralRefundDelay.value % 512n !== 0n) {
+            throw new Error("seconds timelock must be multiple of 512");
+        }
+        if (unilateralRefundDelay.type === "seconds" &&
+            unilateralRefundDelay.value < 512n) {
+            throw new Error("seconds timelock must be greater or equal to 512");
+        }
+        if (!unilateralRefundWithoutReceiverDelay ||
+            typeof unilateralRefundWithoutReceiverDelay.value !== "bigint" ||
+            unilateralRefundWithoutReceiverDelay.value <= 0n) {
+            throw new Error("unilateral refund without receiver delay must greater than 0");
+        }
+        if (unilateralRefundWithoutReceiverDelay.type === "seconds" &&
+            unilateralRefundWithoutReceiverDelay.value % 512n !== 0n) {
+            throw new Error("seconds timelock must be multiple of 512");
+        }
+        if (unilateralRefundWithoutReceiverDelay.type === "seconds" &&
+            unilateralRefundWithoutReceiverDelay.value < 512n) {
+            throw new Error("seconds timelock must be greater or equal to 512");
+        }
+    }
 })(VHTLC || (VHTLC = {}));
 function preimageConditionScript(preimageHash) {
     return Script.encode(["HASH160", preimageHash, "EQUAL"]);

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

@@ -70,7 +70,7 @@ export var Request;
         return (message.type === "SIGN" &&
             "tx" in message &&
             typeof message.tx === "string" &&
-            ("inputIndexes" in message
+            ("inputIndexes" in message && message.inputIndexes != undefined
                 ? Array.isArray(message.inputIndexes) &&
                     message.inputIndexes.every((index) => typeof index === "number")
                 : true));

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

@@ -148,12 +148,13 @@ export var Response;
         return response.type === "WALLET_STATUS" && response.success === true;
     }
     Response.isWalletStatus = isWalletStatus;
-    function walletStatus(id, walletInitialized) {
+    function walletStatus(id, walletInitialized, xOnlyPublicKey) {
         return {
             type: "WALLET_STATUS",
             success: true,
             status: {
                 walletInitialized,
+                xOnlyPublicKey,
             },
             id,
         };

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

@@ -20,12 +20,27 @@ export async function setupServiceWorker(path) {
         throw new Error("Failed to get service worker instance");
     }
     // wait for the service worker to be ready
-    if (serviceWorker.state !== "activated") {
-        await new Promise((resolve) => {
-            if (!serviceWorker)
-                return resolve();
-            serviceWorker.addEventListener("activate", () => resolve());
-        });
-    }
-    return serviceWorker;
+    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 = () => {
+            serviceWorker.removeEventListener("activate", onActivate);
+            serviceWorker.removeEventListener("error", onError);
+            clearTimeout(timeout);
+        };
+        serviceWorker.addEventListener("activate", onActivate);
+        serviceWorker.addEventListener("error", onError);
+    });
 }

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

@@ -43,6 +43,9 @@ export class ServiceWorkerWallet {
         };
         const response = await this.sendMessage(message);
         if (Response.isWalletStatus(response)) {
+            const { walletInitialized, xOnlyPublicKey } = response.status;
+            if (walletInitialized)
+                this.cachedXOnlyPublicKey = xOnlyPublicKey;
             return response.status;
         }
         throw new UnexpectedResponseError(response);
@@ -59,6 +62,7 @@ export class ServiceWorkerWallet {
             if (failIfInitialized) {
                 throw new Error("Wallet already initialized");
             }
+            this.cachedXOnlyPublicKey = response.status.xOnlyPublicKey;
             return;
         }
         // If not initialized, proceed with initialization
@@ -278,7 +282,10 @@ export class ServiceWorkerWallet {
         try {
             const response = await this.sendMessage(message);
             if (Response.isSignSuccess(response)) {
-                return Transaction.fromPSBT(base64.decode(response.tx));
+                return Transaction.fromPSBT(base64.decode(response.tx), {
+                    allowUnknown: true,
+                    allowUnknownInputs: true,
+                });
             }
             throw new UnexpectedResponseError(response);
         }

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

@@ -404,7 +404,7 @@ export class Worker {
             event.source?.postMessage(Response.error(message.id, "Invalid GET_STATUS message format"));
             return;
         }
-        event.source?.postMessage(Response.walletStatus(message.id, this.wallet !== undefined));
+        event.source?.postMessage(Response.walletStatus(message.id, this.wallet !== undefined, this.wallet?.identity.xOnlyPublicKey()));
     }
     async handleSign(event) {
         const message = event.data;
@@ -419,7 +419,10 @@ export class Worker {
             return;
         }
         try {
-            const tx = Transaction.fromPSBT(base64.decode(message.tx));
+            const tx = Transaction.fromPSBT(base64.decode(message.tx), {
+                allowUnknown: true,
+                allowUnknownInputs: true,
+            });
             const signedTx = await this.wallet.identity.sign(tx, message.inputIndexes);
             event.source?.postMessage(Response.signSuccess(message.id, base64.encode(signedTx.toPSBT())));
         }

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
+import { Transaction } from "@scure/btc-signer";
 import { SingleKey } from "./identity/singleKey";
 import { Identity } from "./identity";
 import { ArkAddress } from "./script/address";
@@ -30,5 +31,5 @@ import { Nonces } from "./musig2/nonces";
 import { PartialSig } from "./musig2/sign";
 import { AnchorBumper, P2A } from "./utils/anchor";
 import { Unroll } from "./wallet/unroll";
-export { Wallet, SingleKey, OnchainWallet, Ramps, ESPLORA_URL, EsploraProvider, RestArkProvider, RestIndexerProvider, ArkAddress, DefaultVtxo, VtxoScript, VHTLC, TxType, IndexerTxType, ChainTxType, SettlementEventType, setupServiceWorker, Worker, ServiceWorkerWallet, Request, Response, decodeTapscript, MultisigTapscript, CSVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CLTVMultisigTapscript, ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, buildOffchainTx, waitForIncomingFunds, ArkNote, networks, IndexedDBVtxoRepository, BIP322, TxTree, P2A, Unroll, };
+export { Wallet, SingleKey, OnchainWallet, Ramps, ESPLORA_URL, EsploraProvider, RestArkProvider, RestIndexerProvider, ArkAddress, DefaultVtxo, VtxoScript, VHTLC, TxType, IndexerTxType, ChainTxType, SettlementEventType, setupServiceWorker, Worker, ServiceWorkerWallet, Request, Response, decodeTapscript, MultisigTapscript, CSVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CLTVMultisigTapscript, ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, buildOffchainTx, waitForIncomingFunds, ArkNote, networks, IndexedDBVtxoRepository, BIP322, TxTree, P2A, Unroll, Transaction, };
 export type { Identity, IWallet, WalletConfig, ArkTransaction, Coin, ExtendedCoin, ExtendedVirtualCoin, WalletBalance, SendBitcoinParams, Recipient, SettleParams, Status, VirtualStatus, Outpoint, VirtualCoin, TxKey, TapscriptType, VtxoRepository, ArkTxInput, OffchainTx, TapLeaves, IncomingFunds, IndexerProvider, PageResponse, Batch, ChainTx, CommitmentTx, TxHistoryRecord, Vtxo, VtxoChain, Tx, OnchainProvider, ArkProvider, SettlementEvent, ArkInfo, Intent, Output, TxNotification, ExplorerTransaction, BatchFinalizationEvent, BatchFinalizedEvent, BatchFailedEvent, TreeSigningStartedEvent, TreeNoncesAggregatedEvent, BatchStartedEvent, TreeTxEvent, TreeSignatureEvent, MarketHour, PaginationOptions, SubscriptionResponse, Network, NetworkName, ArkTapscript, RelativeTimelock, EncodedVtxoScript, TapLeafScript, SignerSession, TreeNonces, TreePartialSigs, GetVtxosFilter, Nonces, PartialSig, ArkPsbtFieldCoder, TxTreeNode, AnchorBumper, };

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

@@ -91,10 +91,11 @@ export declare namespace Response {
         success: true;
         status: {
             walletInitialized: boolean;
+            xOnlyPublicKey: Uint8Array | undefined;
         };
     }
     function isWalletStatus(response: Base): response is WalletStatus;
-    function walletStatus(id: string, walletInitialized: boolean): WalletStatus;
+    function walletStatus(id: string, walletInitialized: boolean, xOnlyPublicKey: Uint8Array | undefined): WalletStatus;
     interface ClearResponse extends Base {
         type: "CLEAR_RESPONSE";
     }

package/package.json

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