@arkade-os/sdk 0.1.0 → 0.1.1

package/dist/cjs/utils/psbt.js

@@ -43,16 +43,25 @@ function addConditionWitness(inIndex, tx, witness) {
     });
 }
 function createVirtualTx(inputs, outputs) {
-    let lockTime;
+    let lockTime = 0n;
     for (const input of inputs) {
         const tapscript = (0, tapscript_1.decodeTapscript)((0, base_1.scriptFromTapLeafScript)(input.tapLeafScript));
         if (tapscript_1.CLTVMultisigTapscript.is(tapscript)) {
-            lockTime = Number(tapscript.params.absoluteTimelock);
+            if (lockTime !== 0n) {
+                // if a locktime is already set, check if the new locktime is in the same unit
+                if (isSeconds(lockTime) !==
+                    isSeconds(tapscript.params.absoluteTimelock)) {
+                    throw new Error("cannot mix seconds and blocks locktime");
+                }
+            }
+            if (tapscript.params.absoluteTimelock > lockTime) {
+                lockTime = tapscript.params.absoluteTimelock;
+            }
         }
     }
     const tx = new btc_signer_1.Transaction({
         allowUnknown: true,
-        lockTime,
+        lockTime: Number(lockTime),
     });
     for (const [i, input] of inputs.entries()) {
         tx.addInput({
@@ -122,3 +131,7 @@ function encodeCompactSizeUint(value) {
         return buffer;
     }
 }
+const nLocktimeMinSeconds = 500000000n;
+function isSeconds(locktime) {
+    return locktime >= nLocktimeMinSeconds;
+}

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

@@ -82,20 +82,17 @@ class ServiceWorkerWallet {
             registration = await navigator.serviceWorker.register(path);
             // Handle updates
             registration.addEventListener("updatefound", () => {
-                console.info("@arklabs/wallet-sdk: Service worker auto-update...");
                 const newWorker = registration.installing;
                 if (!newWorker)
                     return;
                 newWorker.addEventListener("statechange", () => {
-                    if (newWorker.state === "installed" &&
+                    if (newWorker.state === "activated" &&
                         navigator.serviceWorker.controller) {
-                        console.info("@arklabs/wallet-sdk: Service worker updated, reloading...");
+                        console.info("Service worker activated, reloading...");
                         window.location.reload();
                     }
                 });
             });
-            // Check for updates
-            await registration.update();
             const sw = registration.active ||
                 registration.waiting ||
                 registration.installing;

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

@@ -17,10 +17,20 @@ class Worker {
         this.vtxoRepository = vtxoRepository;
         this.messageCallback = messageCallback;
     }
-    async start() {
+    async start(withServiceWorkerUpdate = true) {
         self.addEventListener("message", async (event) => {
             await this.handleMessage(event);
         });
+        if (withServiceWorkerUpdate) {
+            // activate service worker immediately
+            self.addEventListener("install", () => {
+                self.skipWaiting();
+            });
+            // take control of clients immediately
+            self.addEventListener("activate", () => {
+                self.clients.claim();
+            });
+        }
     }
     async clear() {
         if (this.vtxoSubscription) {

package/dist/cjs/wallet/wallet.js

@@ -369,7 +369,6 @@ class Wallet {
                     amount: BigInt(input.value),
                 },
                 tapInternalKey: this.onchainP2TR.tapInternalKey,
-                tapMerkleRoot: this.onchainP2TR.tapMerkleRoot,
             });
         }
         // Add payment output

package/dist/esm/utils/psbt.js

@@ -37,16 +37,25 @@ export function addConditionWitness(inIndex, tx, witness) {
     });
 }
 export function createVirtualTx(inputs, outputs) {
-    let lockTime;
+    let lockTime = 0n;
     for (const input of inputs) {
         const tapscript = decodeTapscript(scriptFromTapLeafScript(input.tapLeafScript));
         if (CLTVMultisigTapscript.is(tapscript)) {
-            lockTime = Number(tapscript.params.absoluteTimelock);
+            if (lockTime !== 0n) {
+                // if a locktime is already set, check if the new locktime is in the same unit
+                if (isSeconds(lockTime) !==
+                    isSeconds(tapscript.params.absoluteTimelock)) {
+                    throw new Error("cannot mix seconds and blocks locktime");
+                }
+            }
+            if (tapscript.params.absoluteTimelock > lockTime) {
+                lockTime = tapscript.params.absoluteTimelock;
+            }
         }
     }
     const tx = new Transaction({
         allowUnknown: true,
-        lockTime,
+        lockTime: Number(lockTime),
     });
     for (const [i, input] of inputs.entries()) {
         tx.addInput({
@@ -116,3 +125,7 @@ function encodeCompactSizeUint(value) {
         return buffer;
     }
 }
+const nLocktimeMinSeconds = 500000000n;
+function isSeconds(locktime) {
+    return locktime >= nLocktimeMinSeconds;
+}

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

@@ -79,20 +79,17 @@ export class ServiceWorkerWallet {
             registration = await navigator.serviceWorker.register(path);
             // Handle updates
             registration.addEventListener("updatefound", () => {
-                console.info("@arklabs/wallet-sdk: Service worker auto-update...");
                 const newWorker = registration.installing;
                 if (!newWorker)
                     return;
                 newWorker.addEventListener("statechange", () => {
-                    if (newWorker.state === "installed" &&
+                    if (newWorker.state === "activated" &&
                         navigator.serviceWorker.controller) {
-                        console.info("@arklabs/wallet-sdk: Service worker updated, reloading...");
+                        console.info("Service worker activated, reloading...");
                         window.location.reload();
                     }
                 });
             });
-            // Check for updates
-            await registration.update();
             const sw = registration.active ||
                 registration.waiting ||
                 registration.installing;

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

@@ -14,10 +14,20 @@ export class Worker {
         this.vtxoRepository = vtxoRepository;
         this.messageCallback = messageCallback;
     }
-    async start() {
+    async start(withServiceWorkerUpdate = true) {
         self.addEventListener("message", async (event) => {
             await this.handleMessage(event);
         });
+        if (withServiceWorkerUpdate) {
+            // activate service worker immediately
+            self.addEventListener("install", () => {
+                self.skipWaiting();
+            });
+            // take control of clients immediately
+            self.addEventListener("activate", () => {
+                self.clients.claim();
+            });
+        }
     }
     async clear() {
         if (this.vtxoSubscription) {

package/dist/esm/wallet/wallet.js

@@ -366,7 +366,6 @@ export class Wallet {
                     amount: BigInt(input.value),
                 },
                 tapInternalKey: this.onchainP2TR.tapInternalKey,
-                tapMerkleRoot: this.onchainP2TR.tapMerkleRoot,
             });
         }
         // Add payment output

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

@@ -6,7 +6,7 @@ export declare class Worker {
     private arkProvider;
     private vtxoSubscription;
     constructor(vtxoRepository?: VtxoRepository, messageCallback?: (message: ExtendableMessageEvent) => void);
-    start(): Promise<void>;
+    start(withServiceWorkerUpdate?: boolean): Promise<void>;
     clear(): Promise<void>;
     private onWalletInitialized;
     private processVtxoSubscription;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -23,11 +23,11 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@noble/curves": "1.7.0",
-    "@noble/hashes": "1.6.1",
+    "@noble/curves": "1.9.1",
+    "@noble/hashes": "1.8.0",
     "@noble/secp256k1": "2.2.3",
-    "@scure/base": "1.2.1",
-    "@scure/btc-signer": "1.7.0",
+    "@scure/base": "1.2.6",
+    "@scure/btc-signer": "1.8.1",
     "bip68": "1.0.4"
   },
   "devDependencies": {
@@ -36,7 +36,7 @@
     "@types/node": "22.10.2",
     "@typescript-eslint/eslint-plugin": "8.18.2",
     "@typescript-eslint/parser": "8.18.2",
-    "@vitest/coverage-v8": "2.1.8",
+    "@vitest/coverage-v8": "2.1.9",
     "esbuild": "^0.20.1",
     "eslint": "^9.17.0",
     "glob": "11.0.1",
@@ -44,7 +44,7 @@
     "lint-staged": "15.3.0",
     "prettier": "3.4.2",
     "typescript": "5.7.2",
-    "vitest": "2.1.8"
+    "vitest": "2.1.9"
   },
   "keywords": [
     "bitcoin",