@arkade-os/sdk 0.3.1-alpha.7 → 0.3.2

package/dist/cjs/repositories/walletRepository.js

@@ -31,6 +31,7 @@ const deserializeTapLeaf = (t) => {
 };
 const deserializeVtxo = (o) => ({
     ...o,
+    createdAt: new Date(o.createdAt),
     tapTree: fromHex(o.tapTree),
     forfeitTapLeafScript: deserializeTapLeaf(o.forfeitTapLeafScript),
     intentTapLeafScript: deserializeTapLeaf(o.intentTapLeafScript),

package/dist/cjs/utils/arkTransaction.js

@@ -112,7 +112,7 @@ function hasBoardingTxExpired(coin, boardingTimelock) {
         return false;
     if (boardingTimelock.value === 0n)
         return true;
-    if (boardingTimelock.type !== "blocks")
+    if (boardingTimelock.type === "blocks")
         return false; // TODO: handle get chain tip
     // validate expiry in terms of seconds
     const now = BigInt(Math.floor(Date.now() / 1000));

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

@@ -69,6 +69,33 @@ class Worker {
         const address = await this.wallet.getBoardingAddress();
         return await this.walletRepository.getUtxos(address);
     }
+    async getTransactionHistory() {
+        if (!this.wallet)
+            return [];
+        let txs = [];
+        try {
+            const { boardingTxs, commitmentsToIgnore: roundsToIgnore } = await this.wallet.getBoardingTxs();
+            const { spendable, spent } = await this.getAllVtxos();
+            // convert VTXOs to offchain transactions
+            console.log("getTransactionHistory - vtxosToTxs:", spendable);
+            const offchainTxs = (0, transactionHistory_1.vtxosToTxs)(spendable, spent, roundsToIgnore);
+            txs = [...boardingTxs, ...offchainTxs];
+            // sort transactions by creation time in descending order (newest first)
+            txs.sort(
+            // place createdAt = 0 (unconfirmed txs) first, then descending
+            (a, b) => {
+                if (a.createdAt === 0)
+                    return -1;
+                if (b.createdAt === 0)
+                    return 1;
+                return b.createdAt - a.createdAt;
+            });
+        }
+        catch (error) {
+            console.error("Error getting transaction history:", error);
+        }
+        return txs;
+    }
     async start(withServiceWorkerUpdate = true) {
         self.addEventListener("message", async (event) => {
             await this.handleMessage(event);
@@ -116,7 +143,7 @@ class Worker {
         const address = await this.wallet.getAddress();
         await this.walletRepository.saveVtxos(address, vtxos);
         // Get transaction history to cache boarding txs
-        const txs = await this.wallet.getTransactionHistory();
+        const txs = await this.getTransactionHistory();
         if (txs)
             await this.walletRepository.saveTransactions(address, txs);
         // unsubscribe previous subscription if any
@@ -139,19 +166,16 @@ class Worker {
                     ...spentVtxos,
                 ]);
                 // notify all clients about the vtxo update
-                this.sendMessageToAllClients(response_1.Response.vtxoUpdate(newVtxos, spentVtxos));
+                await this.sendMessageToAllClients(response_1.Response.vtxoUpdate(newVtxos, spentVtxos));
             }
             if (funds.type === "utxo") {
-                const newUtxos = funds.coins.map((utxo) => (0, utils_1.extendCoin)(this.wallet, utxo));
-                if (newUtxos.length === 0) {
-                    this.sendMessageToAllClients(response_1.Response.utxoUpdate([]));
-                    return;
-                }
+                const utxos = funds.coins.map((utxo) => (0, utils_1.extendCoin)(this.wallet, utxo));
                 const boardingAddress = await this.wallet?.getBoardingAddress();
                 // save utxos using unified repository
-                await this.walletRepository.saveUtxos(boardingAddress, newUtxos);
+                await this.walletRepository.clearUtxos(boardingAddress);
+                await this.walletRepository.saveUtxos(boardingAddress, utxos);
                 // notify all clients about the utxo update
-                this.sendMessageToAllClients(response_1.Response.utxoUpdate(funds.coins));
+                await this.sendMessageToAllClients(response_1.Response.utxoUpdate(utxos));
             }
         });
     }
@@ -437,21 +461,7 @@ class Worker {
             return;
         }
         try {
-            const { boardingTxs, commitmentsToIgnore: roundsToIgnore } = await this.wallet.getBoardingTxs();
-            const { spendable, spent } = await this.getAllVtxos();
-            // convert VTXOs to offchain transactions
-            const offchainTxs = (0, transactionHistory_1.vtxosToTxs)(spendable, spent, roundsToIgnore);
-            const txs = [...boardingTxs, ...offchainTxs];
-            // sort transactions by creation time in descending order (newest first)
-            txs.sort(
-            // place createdAt = 0 (unconfirmed txs) first, then descending
-            (a, b) => {
-                if (a.createdAt === 0)
-                    return -1;
-                if (b.createdAt === 0)
-                    return 1;
-                return b.createdAt - a.createdAt;
-            });
+            const txs = await this.getTransactionHistory();
             event.source?.postMessage(response_1.Response.transactionHistory(message.id, txs));
         }
         catch (error) {

package/dist/cjs/wallet/wallet.js

@@ -512,8 +512,8 @@ class Wallet {
                 ...params.inputs.map((input) => `${input.txid}:${input.vout}`),
             ];
             const settlementStream = this.arkProvider.getEventStream(abortController.signal, topics);
-            // roundId, sweepTapTreeRoot and forfeitOutputScript are set once the BatchStarted event is received
-            let roundId;
+            // batchId, sweepTapTreeRoot and forfeitOutputScript are set once the BatchStarted event is received
+            let batchId;
             let sweepTapTreeRoot;
             const vtxoChunks = [];
             const connectorsChunks = [];
@@ -526,11 +526,7 @@ class Wallet {
                 switch (event.type) {
                     // the settlement failed
                     case ark_1.SettlementEventType.BatchFailed:
-                        // fail if the roundId is the one joined
-                        if (event.id === roundId) {
-                            throw new Error(event.reason);
-                        }
-                        break;
+                        throw new Error(event.reason);
                     case ark_1.SettlementEventType.BatchStarted:
                         if (step !== undefined) {
                             continue;
@@ -539,7 +535,7 @@ class Wallet {
                         if (!res.skip) {
                             step = event.type;
                             sweepTapTreeRoot = res.sweepTapTreeRoot;
-                            roundId = res.roundId;
+                            batchId = res.roundId;
                             if (!hasOffchainOutputs) {
                                 // if there are no offchain outputs, we don't have to handle musig2 tree signatures
                                 // we can directly advance to the finalization step
@@ -644,8 +640,10 @@ class Wallet {
                         if (step !== ark_1.SettlementEventType.BatchFinalization) {
                             continue;
                         }
-                        abortController.abort();
-                        return event.commitmentTxid;
+                        if (event.id === batchId) {
+                            abortController.abort();
+                            return event.commitmentTxid;
+                        }
                 }
             }
         }

package/dist/esm/repositories/walletRepository.js

@@ -28,6 +28,7 @@ const deserializeTapLeaf = (t) => {
 };
 const deserializeVtxo = (o) => ({
     ...o,
+    createdAt: new Date(o.createdAt),
     tapTree: fromHex(o.tapTree),
     forfeitTapLeafScript: deserializeTapLeaf(o.forfeitTapLeafScript),
     intentTapLeafScript: deserializeTapLeaf(o.intentTapLeafScript),

package/dist/esm/utils/arkTransaction.js

@@ -107,7 +107,7 @@ export function hasBoardingTxExpired(coin, boardingTimelock) {
         return false;
     if (boardingTimelock.value === 0n)
         return true;
-    if (boardingTimelock.type !== "blocks")
+    if (boardingTimelock.type === "blocks")
         return false; // TODO: handle get chain tip
     // validate expiry in terms of seconds
     const now = BigInt(Math.floor(Date.now() / 1000));

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

@@ -66,6 +66,33 @@ export class Worker {
         const address = await this.wallet.getBoardingAddress();
         return await this.walletRepository.getUtxos(address);
     }
+    async getTransactionHistory() {
+        if (!this.wallet)
+            return [];
+        let txs = [];
+        try {
+            const { boardingTxs, commitmentsToIgnore: roundsToIgnore } = await this.wallet.getBoardingTxs();
+            const { spendable, spent } = await this.getAllVtxos();
+            // convert VTXOs to offchain transactions
+            console.log("getTransactionHistory - vtxosToTxs:", spendable);
+            const offchainTxs = vtxosToTxs(spendable, spent, roundsToIgnore);
+            txs = [...boardingTxs, ...offchainTxs];
+            // sort transactions by creation time in descending order (newest first)
+            txs.sort(
+            // place createdAt = 0 (unconfirmed txs) first, then descending
+            (a, b) => {
+                if (a.createdAt === 0)
+                    return -1;
+                if (b.createdAt === 0)
+                    return 1;
+                return b.createdAt - a.createdAt;
+            });
+        }
+        catch (error) {
+            console.error("Error getting transaction history:", error);
+        }
+        return txs;
+    }
     async start(withServiceWorkerUpdate = true) {
         self.addEventListener("message", async (event) => {
             await this.handleMessage(event);
@@ -113,7 +140,7 @@ export class Worker {
         const address = await this.wallet.getAddress();
         await this.walletRepository.saveVtxos(address, vtxos);
         // Get transaction history to cache boarding txs
-        const txs = await this.wallet.getTransactionHistory();
+        const txs = await this.getTransactionHistory();
         if (txs)
             await this.walletRepository.saveTransactions(address, txs);
         // unsubscribe previous subscription if any
@@ -136,19 +163,16 @@ export class Worker {
                     ...spentVtxos,
                 ]);
                 // notify all clients about the vtxo update
-                this.sendMessageToAllClients(Response.vtxoUpdate(newVtxos, spentVtxos));
+                await this.sendMessageToAllClients(Response.vtxoUpdate(newVtxos, spentVtxos));
             }
             if (funds.type === "utxo") {
-                const newUtxos = funds.coins.map((utxo) => extendCoin(this.wallet, utxo));
-                if (newUtxos.length === 0) {
-                    this.sendMessageToAllClients(Response.utxoUpdate([]));
-                    return;
-                }
+                const utxos = funds.coins.map((utxo) => extendCoin(this.wallet, utxo));
                 const boardingAddress = await this.wallet?.getBoardingAddress();
                 // save utxos using unified repository
-                await this.walletRepository.saveUtxos(boardingAddress, newUtxos);
+                await this.walletRepository.clearUtxos(boardingAddress);
+                await this.walletRepository.saveUtxos(boardingAddress, utxos);
                 // notify all clients about the utxo update
-                this.sendMessageToAllClients(Response.utxoUpdate(funds.coins));
+                await this.sendMessageToAllClients(Response.utxoUpdate(utxos));
             }
         });
     }
@@ -434,21 +458,7 @@ export class Worker {
             return;
         }
         try {
-            const { boardingTxs, commitmentsToIgnore: roundsToIgnore } = await this.wallet.getBoardingTxs();
-            const { spendable, spent } = await this.getAllVtxos();
-            // convert VTXOs to offchain transactions
-            const offchainTxs = vtxosToTxs(spendable, spent, roundsToIgnore);
-            const txs = [...boardingTxs, ...offchainTxs];
-            // sort transactions by creation time in descending order (newest first)
-            txs.sort(
-            // place createdAt = 0 (unconfirmed txs) first, then descending
-            (a, b) => {
-                if (a.createdAt === 0)
-                    return -1;
-                if (b.createdAt === 0)
-                    return 1;
-                return b.createdAt - a.createdAt;
-            });
+            const txs = await this.getTransactionHistory();
             event.source?.postMessage(Response.transactionHistory(message.id, txs));
         }
         catch (error) {

package/dist/esm/wallet/wallet.js

@@ -475,8 +475,8 @@ export class Wallet {
                 ...params.inputs.map((input) => `${input.txid}:${input.vout}`),
             ];
             const settlementStream = this.arkProvider.getEventStream(abortController.signal, topics);
-            // roundId, sweepTapTreeRoot and forfeitOutputScript are set once the BatchStarted event is received
-            let roundId;
+            // batchId, sweepTapTreeRoot and forfeitOutputScript are set once the BatchStarted event is received
+            let batchId;
             let sweepTapTreeRoot;
             const vtxoChunks = [];
             const connectorsChunks = [];
@@ -489,11 +489,7 @@ export class Wallet {
                 switch (event.type) {
                     // the settlement failed
                     case SettlementEventType.BatchFailed:
-                        // fail if the roundId is the one joined
-                        if (event.id === roundId) {
-                            throw new Error(event.reason);
-                        }
-                        break;
+                        throw new Error(event.reason);
                     case SettlementEventType.BatchStarted:
                         if (step !== undefined) {
                             continue;
@@ -502,7 +498,7 @@ export class Wallet {
                         if (!res.skip) {
                             step = event.type;
                             sweepTapTreeRoot = res.sweepTapTreeRoot;
-                            roundId = res.roundId;
+                            batchId = res.roundId;
                             if (!hasOffchainOutputs) {
                                 // if there are no offchain outputs, we don't have to handle musig2 tree signatures
                                 // we can directly advance to the finalization step
@@ -607,8 +603,10 @@ export class Wallet {
                         if (step !== SettlementEventType.BatchFinalization) {
                             continue;
                         }
-                        abortController.abort();
-                        return event.commitmentTxid;
+                        if (event.id === batchId) {
+                            abortController.abort();
+                            return event.commitmentTxid;
+                        }
                 }
             }
         }

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

@@ -1,4 +1,4 @@
-import { WalletBalance, VirtualCoin, ArkTransaction, IWallet, Coin } from "..";
+import { WalletBalance, VirtualCoin, ArkTransaction, IWallet, ExtendedCoin } from "..";
 import { ExtendedVirtualCoin } from "../..";
 import { SettlementEvent } from "../../providers/ark";
 /**
@@ -116,8 +116,8 @@ export declare namespace Response {
     function vtxoUpdate(newVtxos: ExtendedVirtualCoin[], spentVtxos: ExtendedVirtualCoin[]): VtxoUpdate;
     interface UtxoUpdate extends Base {
         type: "UTXO_UPDATE";
-        coins: Coin[];
+        coins: ExtendedCoin[];
     }
     function isUtxoUpdate(response: Base): response is UtxoUpdate;
-    function utxoUpdate(coins: Coin[]): UtxoUpdate;
+    function utxoUpdate(coins: ExtendedCoin[]): UtxoUpdate;
 }

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

@@ -29,6 +29,7 @@ export declare class Worker {
      * Get all boarding utxos from wallet repository
      */
     private getAllBoardingUtxos;
+    private getTransactionHistory;
     start(withServiceWorkerUpdate?: boolean): Promise<void>;
     clear(): Promise<void>;
     reload(): Promise<void>;

package/package.json

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