@arkade-os/sdk 0.3.0-alpha.0 → 0.3.0-alpha.2

package/dist/cjs/wallet/onchain.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnchainWallet = void 0;
 exports.selectCoins = selectCoins;
-const payment_1 = require("@scure/btc-signer/payment");
+const payment_js_1 = require("@scure/btc-signer/payment.js");
 const networks_1 = require("../networks");
 const onchain_1 = require("../providers/onchain");
-const btc_signer_1 = require("@scure/btc-signer");
+const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 const anchor_1 = require("../utils/anchor");
 const txSizeEstimator_1 = require("../utils/txSizeEstimator");
 /**
@@ -39,7 +39,7 @@ class OnchainWallet {
         }
         const network = (0, networks_1.getNetwork)(networkName);
         const onchainProvider = provider || new onchain_1.EsploraProvider(onchain_1.ESPLORA_URL[networkName]);
-        const onchainP2TR = (0, payment_1.p2tr)(pubkey, undefined, network);
+        const onchainP2TR = (0, payment_js_1.p2tr)(pubkey, undefined, network);
         return new OnchainWallet(identity, network, onchainP2TR, onchainProvider);
     }
     get address() {
@@ -80,7 +80,7 @@ class OnchainWallet {
         // Select coins
         const selected = selectCoins(coins, totalNeeded);
         // Create transaction
-        let tx = new btc_signer_1.Transaction();
+        let tx = new transaction_js_1.Transaction();
         // Add inputs
         for (const input of selected.inputs) {
             tx.addInput({
@@ -108,7 +108,7 @@ class OnchainWallet {
     }
     async bumpP2A(parent) {
         const parentVsize = parent.vsize;
-        let child = new btc_signer_1.Transaction({
+        let child = new transaction_js_1.Transaction({
             allowUnknownInputs: true,
             allowLegacyWitnessUtxo: true,
             version: 3,

package/dist/cjs/wallet/unroll.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Unroll = void 0;
-const btc_signer_1 = require("@scure/btc-signer");
+const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 const indexer_1 = require("../providers/indexer");
 const base_1 = require("@scure/base");
 const base_2 = require("../script/base");
-const psbt_1 = require("@scure/btc-signer/psbt");
+const psbt_js_1 = require("@scure/btc-signer/psbt.js");
 const txSizeEstimator_1 = require("../utils/txSizeEstimator");
 const wallet_1 = require("./wallet");
 var Unroll;
@@ -106,7 +106,7 @@ var Unroll;
             if (virtualTxs.txs.length === 0) {
                 throw new Error(`Tx ${nextTxToBroadcast.txid} not found`);
             }
-            const tx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(virtualTxs.txs[0]), {
+            const tx = transaction_js_1.Transaction.fromPSBT(base_1.base64.decode(virtualTxs.txs[0]), {
                 allowUnknownInputs: true,
             });
             // finalize the tree transaction
@@ -197,11 +197,11 @@ var Unroll;
                     amount: BigInt(vtxo.value),
                     script: base_2.VtxoScript.decode(vtxo.tapTree).pkScript,
                 },
-                sighashType: btc_signer_1.SigHash.DEFAULT,
+                sighashType: transaction_js_1.SigHash.DEFAULT,
             });
-            txWeightEstimator.addTapscriptInput(64, spendingLeaf[1].length, psbt_1.TaprootControlBlock.encode(spendingLeaf[0]).length);
+            txWeightEstimator.addTapscriptInput(64, spendingLeaf[1].length, psbt_js_1.TaprootControlBlock.encode(spendingLeaf[0]).length);
         }
-        const tx = new btc_signer_1.Transaction({ allowUnknownInputs: true, version: 2 });
+        const tx = new transaction_js_1.Transaction({ allowUnknownInputs: true, version: 2 });
         for (const input of inputs) {
             tx.addInput(input);
         }

package/dist/cjs/wallet/wallet.js

@@ -37,9 +37,9 @@ exports.Wallet = void 0;
 exports.waitForIncomingFunds = waitForIncomingFunds;
 const base_1 = require("@scure/base");
 const bip68 = __importStar(require("bip68"));
-const payment_1 = require("@scure/btc-signer/payment");
-const btc_signer_1 = require("@scure/btc-signer");
-const psbt_1 = require("@scure/btc-signer/psbt");
+const payment_js_1 = require("@scure/btc-signer/payment.js");
+const transaction_js_1 = require("@scure/btc-signer/transaction.js");
+const psbt_js_1 = require("@scure/btc-signer/psbt.js");
 const transactionHistory_1 = require("../utils/transactionHistory");
 const address_1 = require("../script/address");
 const default_1 = require("../script/default");
@@ -49,7 +49,7 @@ const ark_1 = require("../providers/ark");
 const forfeit_1 = require("../forfeit");
 const validation_1 = require("../tree/validation");
 const _1 = require(".");
-const utils_1 = require("@scure/btc-signer/utils");
+const utils_js_1 = require("@scure/btc-signer/utils.js");
 const base_2 = require("../script/base");
 const tapscript_1 = require("../script/tapscript");
 const arkTransaction_1 = require("../utils/arkTransaction");
@@ -135,14 +135,12 @@ class Wallet {
         // Save tapscripts
         const offchainTapscript = bareVtxoTapscript;
         // the serverUnrollScript is the one used to create output scripts of the checkpoint transactions
-        const serverUnrollScript = tapscript_1.CSVMultisigTapscript.encode({
-            timelock: exitTimelock,
-            pubkeys: [serverPubKey],
-        });
+        const rawCheckpointExitClosure = base_1.hex.decode(info.checkpointExitClosure);
+        const serverUnrollScript = tapscript_1.CSVMultisigTapscript.decode(rawCheckpointExitClosure);
         // parse the server forfeit address
         // server is expecting funds to be sent to this address
-        const forfeitAddress = (0, payment_1.Address)(network).decode(info.forfeitAddress);
-        const forfeitOutputScript = payment_1.OutScript.encode(forfeitAddress);
+        const forfeitAddress = (0, payment_js_1.Address)(network).decode(info.forfeitAddress);
+        const forfeitOutputScript = payment_js_1.OutScript.encode(forfeitAddress);
         // Set up storage and repositories
         const storage = config.storage || new inMemory_1.InMemoryStorageAdapter();
         const walletRepository = new walletRepository_1.WalletRepositoryImpl(storage);
@@ -204,8 +202,9 @@ class Wallet {
     }
     async getVtxos(filter) {
         const address = await this.getAddress();
-        // Try to get from cache first
-        const cachedVtxos = await this.walletRepository.getVtxos(address);
+        // Try to get from cache first first (optional fast path)
+        // const cachedVtxos = await this.walletRepository.getVtxos(address);
+        // if (cachedVtxos.length) return cachedVtxos;
         // For now, always fetch fresh data from provider and update cache
         // In future, we can add cache invalidation logic based on timestamps
         const spendableVtxos = await this.getVirtualCoins(filter);
@@ -402,7 +401,7 @@ class Wallet {
         // TODO persist final virtual tx and checkpoints to repository
         // sign the checkpoints
         const finalCheckpoints = await Promise.all(signedCheckpointTxs.map(async (c) => {
-            const tx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(c));
+            const tx = transaction_js_1.Transaction.fromPSBT(base_1.base64.decode(c));
             const signedCheckpoint = await this.identity.sign(tx);
             return base_1.base64.encode(signedCheckpoint.toPSBT());
         }));
@@ -458,8 +457,8 @@ class Wallet {
             }
             catch {
                 // onchain
-                const addr = (0, payment_1.Address)(this.network).decode(output.address);
-                script = payment_1.OutScript.encode(addr);
+                const addr = (0, payment_js_1.Address)(this.network).decode(output.address);
+                script = payment_js_1.OutScript.encode(addr);
                 onchainOutputIndexes.push(index);
             }
             outputs.push({
@@ -697,7 +696,7 @@ class Wallet {
     }
     async handleBatchStartedEvent(event, intentId, serverPubKey, forfeitOutputScript) {
         const utf8IntentId = new TextEncoder().encode(intentId);
-        const intentIdHash = (0, utils_1.sha256)(utf8IntentId);
+        const intentIdHash = (0, utils_js_1.sha256)(utf8IntentId);
         const intentIdHashStr = base_1.hex.encode(new Uint8Array(intentIdHash));
         let skip = true;
         // check if our intent ID hash matches any in the event
@@ -720,7 +719,7 @@ class Wallet {
             },
             pubkeys: [serverPubKey],
         }).script;
-        const sweepTapTreeRoot = (0, payment_1.tapLeafHash)(sweepTapscript);
+        const sweepTapTreeRoot = (0, payment_js_1.tapLeafHash)(sweepTapscript);
         return {
             roundId: event.id,
             sweepTapTreeRoot,
@@ -731,7 +730,7 @@ class Wallet {
     // validates the vtxo tree, creates a signing session and generates the musig2 nonces
     async handleSettlementSigningEvent(event, sweepTapTreeRoot, session, vtxoGraph) {
         // validate the unsigned vtxo tree
-        const commitmentTx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(event.unsignedCommitmentTx));
+        const commitmentTx = transaction_js_1.Transaction.fromPSBT(base_1.base64.decode(event.unsignedCommitmentTx));
         (0, validation_1.validateVtxoTxGraph)(vtxoGraph, commitmentTx, sweepTapTreeRoot);
         // TODO check if our registered outputs are in the vtxo tree
         const sharedOutput = commitmentTx.getOutput(0);
@@ -750,7 +749,7 @@ class Wallet {
         // the signed forfeits transactions to submit
         const signedForfeits = [];
         const vtxos = await this.getVirtualCoins();
-        let settlementPsbt = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(event.commitmentTx));
+        let settlementPsbt = transaction_js_1.Transaction.fromPSBT(base_1.base64.decode(event.commitmentTx));
         let hasBoardingUtxos = false;
         let connectorIndex = 0;
         const connectorsLeaves = connectorsGraph?.leaves() || [];
@@ -792,7 +791,7 @@ class Wallet {
                 throw new Error("not enough connectors received");
             }
             const connectorLeaf = connectorsLeaves[connectorIndex];
-            const connectorTxId = base_1.hex.encode((0, utils_1.sha256x2)(connectorLeaf.toBytes(true)).reverse());
+            const connectorTxId = base_1.hex.encode((0, utils_js_1.sha256x2)(connectorLeaf.toBytes(true)).reverse());
             const connectorOutput = connectorLeaf.getOutput(0);
             if (!connectorOutput) {
                 throw new Error("connector output not found");
@@ -811,7 +810,7 @@ class Wallet {
                         amount: BigInt(vtxo.value),
                         script: base_2.VtxoScript.decode(input.tapTree).pkScript,
                     },
-                    sighashType: btc_signer_1.SigHash.DEFAULT,
+                    sighashType: transaction_js_1.SigHash.DEFAULT,
                     tapLeafScript: [input.forfeitTapLeafScript],
                 },
                 {
@@ -917,7 +916,7 @@ function finalizeWithExtraWitnesses(inputExtraWitnesses) {
                     tx.updateInput(i, {
                         finalScriptWitness: [
                             script,
-                            psbt_1.TaprootControlBlock.encode(cb),
+                            psbt_js_1.TaprootControlBlock.encode(cb),
                         ],
                     });
                 }

package/dist/esm/arknote/index.js

@@ -1,7 +1,7 @@
 import { base58, hex } from "@scure/base";
 import { VtxoScript } from '../script/base.js';
-import { sha256 } from "@scure/btc-signer/utils";
-import { Script } from "@scure/btc-signer";
+import { sha256 } from "@scure/btc-signer/utils.js";
+import { Script } from "@scure/btc-signer/script.js";
 /**
  * ArkNotes are special virtual coins in the Ark protocol that can be created
  * and spent without requiring any transactions. The server mints them, and they

package/dist/esm/bip322/index.js

@@ -1,4 +1,6 @@
-import { OP, Transaction, Script, SigHash } from "@scure/btc-signer";
+import { OP } from "@scure/btc-signer/script.js";
+import { Transaction, SigHash } from "@scure/btc-signer/transaction.js";
+import { Script } from "@scure/btc-signer/script.js";
 import { ErrMissingData, ErrMissingInputs, ErrMissingWitnessUtxo, } from './errors.js';
 import { schnorr } from "@noble/curves/secp256k1.js";
 import { base64 } from "@scure/base";

package/dist/esm/forfeit.js

@@ -1,4 +1,4 @@
-import { Transaction } from "@scure/btc-signer";
+import { Transaction } from "@scure/btc-signer/transaction.js";
 import { P2A } from './utils/anchor.js';
 export function buildForfeitTx(inputs, forfeitPkScript, txLocktime) {
     const tx = new Transaction({

package/dist/esm/identity/singleKey.js

@@ -1,6 +1,6 @@
-import { pubSchnorr, randomPrivateKeyBytes, sha256, } from "@scure/btc-signer/utils";
+import { pubECDSA, pubSchnorr, randomPrivateKeyBytes, sha256, } from "@scure/btc-signer/utils.js";
 import { hex } from "@scure/base";
-import { SigHash } from "@scure/btc-signer";
+import { SigHash } from "@scure/btc-signer/transaction.js";
 import { TreeSignerSession } from '../tree/signingSession.js';
 import { schnorr } from "@noble/secp256k1";
 const ZERO_32 = new Uint8Array(32).fill(0);
@@ -70,6 +70,9 @@ export class SingleKey {
         }
         return txCpy;
     }
+    compressedPublicKey() {
+        return Promise.resolve(pubECDSA(this.key, true));
+    }
     xOnlyPublicKey() {
         return Promise.resolve(pubSchnorr(this.key));
     }

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-import { Transaction } from "@scure/btc-signer";
+import { Transaction } from "@scure/btc-signer/transaction.js";
 import { SingleKey } from './identity/singleKey.js';
 import { ArkAddress } from './script/address.js';
 import { VHTLC } from './script/vhtlc.js';

package/dist/esm/musig2/keys.js

@@ -1,4 +1,4 @@
-import * as musig from "@scure/btc-signer/musig2";
+import * as musig from "@scure/btc-signer/musig2.js";
 import { schnorr } from "@noble/curves/secp256k1.js";
 // Aggregates multiple public keys according to the MuSig2 algorithm
 export function aggregateKeys(publicKeys, sort, options = {}) {

package/dist/esm/musig2/nonces.js

@@ -1,4 +1,4 @@
-import * as musig from "@scure/btc-signer/musig2";
+import * as musig from "@scure/btc-signer/musig2.js";
 /**
  * Generates a pair of public and secret nonces for MuSig2 signing
  */

package/dist/esm/musig2/sign.js

@@ -1,4 +1,4 @@
-import * as musig from "@scure/btc-signer/musig2";
+import * as musig from "@scure/btc-signer/musig2.js";
 import { bytesToNumberBE } from "@noble/curves/utils.js";
 import { Point } from "@noble/secp256k1";
 import { aggregateKeys } from './keys.js';

package/dist/esm/networks.js

@@ -1,4 +1,4 @@
-import { NETWORK, TEST_NETWORK } from "@scure/btc-signer";
+import { NETWORK, TEST_NETWORK } from "@scure/btc-signer/utils.js";
 export const getNetwork = (network) => {
     return networks[network];
 };

package/dist/esm/providers/ark.js

@@ -1,4 +1,5 @@
 import { hex } from "@scure/base";
+import { eventSourceIterator } from './utils.js';
 export var SettlementEventType;
 (function (SettlementEventType) {
     SettlementEventType["BatchStarted"] = "batch_started";
@@ -41,6 +42,7 @@ export class RestArkProvider {
             vtxoMinAmount: BigInt(fromServer.vtxoMinAmount ?? 0),
             vtxoMaxAmount: BigInt(fromServer.vtxoMaxAmount ?? -1),
             boardingExitDelay: BigInt(fromServer.boardingExitDelay ?? 0),
+            checkpointExitClosure: fromServer.checkpointTapscript ?? "",
             marketHour: "marketHour" in fromServer && fromServer.marketHour != null
                 ? {
                     nextStartTime: BigInt(fromServer.marketHour.nextStartTime ?? 0),
@@ -215,39 +217,21 @@ export class RestArkProvider {
             : "";
         while (!signal?.aborted) {
             try {
-                const response = await fetch(url + queryParams, {
-                    headers: {
-                        Accept: "application/json",
-                    },
-                    signal,
-                });
-                if (!response.ok) {
-                    throw new Error(`Unexpected status ${response.status} when fetching event stream`);
-                }
-                if (!response.body) {
-                    throw new Error("Response body is null");
-                }
-                const reader = response.body.getReader();
-                const decoder = new TextDecoder();
-                let buffer = "";
-                while (!signal?.aborted) {
-                    const { done, value } = await reader.read();
-                    if (done) {
-                        break;
-                    }
-                    // Append new data to buffer and split by newlines
-                    buffer += decoder.decode(value, { stream: true });
-                    const lines = buffer.split("\n");
-                    // Process all complete lines
-                    for (let i = 0; i < lines.length - 1; i++) {
-                        const line = lines[i].trim();
-                        if (!line)
-                            continue;
+                const eventSource = new EventSource(url + queryParams);
+                // Set up abort handling
+                const abortHandler = () => {
+                    eventSource.close();
+                };
+                signal?.addEventListener("abort", abortHandler);
+                try {
+                    for await (const event of eventSourceIterator(eventSource)) {
+                        if (signal?.aborted)
+                            break;
                         try {
-                            const data = JSON.parse(line);
-                            const event = this.parseSettlementEvent(data.result);
-                            if (event) {
-                                yield event;
+                            const data = JSON.parse(event.data);
+                            const settlementEvent = this.parseSettlementEvent(data);
+                            if (settlementEvent) {
+                                yield settlementEvent;
                             }
                         }
                         catch (err) {
@@ -255,8 +239,10 @@ export class RestArkProvider {
                             throw err;
                         }
                     }
-                    // Keep the last partial line in the buffer
-                    buffer = lines[lines.length - 1];
+                }
+                finally {
+                    signal?.removeEventListener("abort", abortHandler);
+                    eventSource.close();
                 }
             }
             catch (error) {
@@ -264,7 +250,6 @@ export class RestArkProvider {
                     break;
                 }
                 // ignore timeout errors, they're expected when the server is not sending anything for 5 min
-                // these timeouts are set by builtin fetch function
                 if (isFetchTimeoutError(error)) {
                     console.debug("Timeout error ignored");
                     continue;
@@ -278,42 +263,32 @@ export class RestArkProvider {
         const url = `${this.serverUrl}/v1/txs`;
         while (!signal?.aborted) {
             try {
-                const response = await fetch(url, {
-                    headers: {
-                        Accept: "application/json",
-                    },
-                    signal,
-                });
-                if (!response.ok) {
-                    throw new Error(`Unexpected status ${response.status} when fetching transaction stream`);
-                }
-                if (!response.body) {
-                    throw new Error("Response body is null");
-                }
-                const reader = response.body.getReader();
-                const decoder = new TextDecoder();
-                let buffer = "";
-                while (!signal?.aborted) {
-                    const { done, value } = await reader.read();
-                    if (done) {
-                        break;
-                    }
-                    // Append new data to buffer and split by newlines
-                    buffer += decoder.decode(value, { stream: true });
-                    const lines = buffer.split("\n");
-                    // Process all complete lines
-                    for (let i = 0; i < lines.length - 1; i++) {
-                        const line = lines[i].trim();
-                        if (!line)
-                            continue;
-                        const data = JSON.parse(line);
-                        const txNotification = this.parseTransactionNotification(data.result);
-                        if (txNotification) {
-                            yield txNotification;
+                const eventSource = new EventSource(url);
+                // Set up abort handling
+                const abortHandler = () => {
+                    eventSource.close();
+                };
+                signal?.addEventListener("abort", abortHandler);
+                try {
+                    for await (const event of eventSourceIterator(eventSource)) {
+                        if (signal?.aborted)
+                            break;
+                        try {
+                            const data = JSON.parse(event.data);
+                            const txNotification = this.parseTransactionNotification(data);
+                            if (txNotification) {
+                                yield txNotification;
+                            }
+                        }
+                        catch (err) {
+                            console.error("Failed to parse transaction notification:", err);
+                            throw err;
                         }
                     }
-                    // Keep the last partial line in the buffer
-                    buffer = lines[lines.length - 1];
+                }
+                finally {
+                    signal?.removeEventListener("abort", abortHandler);
+                    eventSource.close();
                 }
             }
             catch (error) {
@@ -321,12 +296,11 @@ export class RestArkProvider {
                     break;
                 }
                 // ignore timeout errors, they're expected when the server is not sending anything for 5 min
-                // these timeouts are set by builtin fetch function
                 if (isFetchTimeoutError(error)) {
                     console.debug("Timeout error ignored");
                     continue;
                 }
-                console.error("Address subscription error:", error);
+                console.error("Transaction stream error:", error);
                 throw error;
             }
         }
@@ -409,6 +383,10 @@ export class RestArkProvider {
                 signature: data.treeSignature.signature,
             };
         }
+        // Skip heartbeat events
+        if (data.heartbeat) {
+            return null;
+        }
         console.warn("Unknown event type:", data);
         return null;
     }
@@ -435,6 +413,10 @@ export class RestArkProvider {
                 },
             };
         }
+        // Skip heartbeat events
+        if (data.heartbeat) {
+            return null;
+        }
         console.warn("Unknown transaction notification type:", data);
         return null;
     }