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

package/dist/cjs/arknote/index.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArkNote = void 0;
 const base_1 = require("@scure/base");
 const base_2 = require("../script/base");
-const utils_1 = require("@scure/btc-signer/utils");
-const btc_signer_1 = require("@scure/btc-signer");
+const utils_js_1 = require("@scure/btc-signer/utils.js");
+const script_js_1 = require("@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
@@ -29,7 +29,7 @@ class ArkNote {
         this.value = value;
         this.HRP = HRP;
         this.vout = 0;
-        const preimageHash = (0, utils_1.sha256)(this.preimage);
+        const preimageHash = (0, utils_js_1.sha256)(this.preimage);
         this.vtxoScript = new base_2.VtxoScript([noteTapscript(preimageHash)]);
         const leaf = this.vtxoScript.leaves[0];
         this.txid = base_1.hex.encode(new Uint8Array(preimageHash).reverse());
@@ -85,5 +85,5 @@ function readUInt32BE(array, offset) {
     return view.getUint32(0, false);
 }
 function noteTapscript(preimageHash) {
-    return btc_signer_1.Script.encode(["SHA256", preimageHash, "EQUAL"]);
+    return script_js_1.Script.encode(["SHA256", preimageHash, "EQUAL"]);
 }

package/dist/cjs/bip322/index.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BIP322 = void 0;
 exports.craftToSpendTx = craftToSpendTx;
-const btc_signer_1 = require("@scure/btc-signer");
+const script_js_1 = require("@scure/btc-signer/script.js");
+const transaction_js_1 = require("@scure/btc-signer/transaction.js");
+const script_js_2 = require("@scure/btc-signer/script.js");
 const errors_1 = require("./errors");
 const secp256k1_js_1 = require("@noble/curves/secp256k1.js");
 const base_1 = require("@scure/base");
@@ -75,7 +77,7 @@ var BIP322;
     }
     BIP322.signature = signature;
 })(BIP322 || (exports.BIP322 = BIP322 = {}));
-const OP_RETURN_EMPTY_PKSCRIPT = new Uint8Array([btc_signer_1.OP.RETURN]);
+const OP_RETURN_EMPTY_PKSCRIPT = new Uint8Array([script_js_1.OP.RETURN]);
 const ZERO_32 = new Uint8Array(32).fill(0);
 const MAX_INDEX = 0xffffffff;
 const TAG_BIP322 = "BIP0322-signed-message";
@@ -106,7 +108,7 @@ function validateOutputs(outputs) {
 // craftToSpendTx creates the initial transaction that will be spent in the proof
 function craftToSpendTx(message, pkScript) {
     const messageHash = hashMessage(message);
-    const tx = new btc_signer_1.Transaction({
+    const tx = new transaction_js_1.Transaction({
         version: 0,
         allowUnknownOutputs: true,
         allowUnknown: true,
@@ -124,14 +126,14 @@ function craftToSpendTx(message, pkScript) {
         script: pkScript,
     });
     tx.updateInput(0, {
-        finalScriptSig: btc_signer_1.Script.encode(["OP_0", messageHash]),
+        finalScriptSig: script_js_2.Script.encode(["OP_0", messageHash]),
     });
     return tx;
 }
 // craftToSignTx creates the transaction that will be signed for the proof
 function craftToSignTx(toSpend, inputs, outputs) {
     const firstInput = inputs[0];
-    const tx = new btc_signer_1.Transaction({
+    const tx = new transaction_js_1.Transaction({
         version: 2,
         allowUnknownOutputs: outputs.length === 0,
         allowUnknown: true,
@@ -147,13 +149,13 @@ function craftToSignTx(toSpend, inputs, outputs) {
             script: firstInput.witnessUtxo.script,
             amount: 0n,
         },
-        sighashType: btc_signer_1.SigHash.ALL,
+        sighashType: transaction_js_1.SigHash.ALL,
     });
     // add other inputs
     for (const input of inputs) {
         tx.addInput({
             ...input,
-            sighashType: btc_signer_1.SigHash.ALL,
+            sighashType: transaction_js_1.SigHash.ALL,
         });
     }
     // add the special OP_RETURN output if no outputs are provided

package/dist/cjs/forfeit.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildForfeitTx = buildForfeitTx;
-const btc_signer_1 = require("@scure/btc-signer");
+const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 const anchor_1 = require("./utils/anchor");
 function buildForfeitTx(inputs, forfeitPkScript, txLocktime) {
-    const tx = new btc_signer_1.Transaction({
+    const tx = new transaction_js_1.Transaction({
         version: 3,
         lockTime: txLocktime,
     });

package/dist/cjs/identity/singleKey.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingleKey = void 0;
-const utils_1 = require("@scure/btc-signer/utils");
+const utils_js_1 = require("@scure/btc-signer/utils.js");
 const base_1 = require("@scure/base");
-const btc_signer_1 = require("@scure/btc-signer");
+const transaction_js_1 = require("@scure/btc-signer/transaction.js");
 const signingSession_1 = require("../tree/signingSession");
 const secp256k1_1 = require("@noble/secp256k1");
 const ZERO_32 = new Uint8Array(32).fill(0);
-const ALL_SIGHASH = Object.values(btc_signer_1.SigHash).filter((x) => typeof x === "number");
+const ALL_SIGHASH = Object.values(transaction_js_1.SigHash).filter((x) => typeof x === "number");
 /**
  * In-memory single key implementation for Bitcoin transaction signing.
  *
@@ -28,7 +28,7 @@ const ALL_SIGHASH = Object.values(btc_signer_1.SigHash).filter((x) => typeof x =
  */
 class SingleKey {
     constructor(key) {
-        this.key = key || (0, utils_1.randomPrivateKeyBytes)();
+        this.key = key || (0, utils_js_1.randomPrivateKeyBytes)();
     }
     static fromPrivateKey(privateKey) {
         return new SingleKey(privateKey);
@@ -37,7 +37,7 @@ class SingleKey {
         return new SingleKey(base_1.hex.decode(privateKeyHex));
     }
     static fromRandomBytes() {
-        return new SingleKey((0, utils_1.randomPrivateKeyBytes)());
+        return new SingleKey((0, utils_js_1.randomPrivateKeyBytes)());
     }
     /**
      * Export the private key as a hex string.
@@ -73,15 +73,18 @@ class SingleKey {
         }
         return txCpy;
     }
+    compressedPublicKey() {
+        return Promise.resolve((0, utils_js_1.pubECDSA)(this.key, true));
+    }
     xOnlyPublicKey() {
-        return Promise.resolve((0, utils_1.pubSchnorr)(this.key));
+        return Promise.resolve((0, utils_js_1.pubSchnorr)(this.key));
     }
     signerSession() {
         return signingSession_1.TreeSignerSession.random();
     }
     async signMessage(message) {
         const msgBytes = new TextEncoder().encode(message);
-        return secp256k1_1.schnorr.sign((0, utils_1.sha256)(msgBytes), this.key);
+        return secp256k1_1.schnorr.sign((0, utils_js_1.sha256)(msgBytes), this.key);
     }
 }
 exports.SingleKey = SingleKey;

package/dist/cjs/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Transaction = exports.Unroll = exports.P2A = exports.TxTree = exports.BIP322 = exports.ContractRepositoryImpl = exports.WalletRepositoryImpl = 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 transaction_js_1 = require("@scure/btc-signer/transaction.js");
+Object.defineProperty(exports, "Transaction", { enumerable: true, get: function () { return transaction_js_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/musig2/keys.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregateKeys = aggregateKeys;
-const musig = __importStar(require("@scure/btc-signer/musig2"));
+const musig = __importStar(require("@scure/btc-signer/musig2.js"));
 const secp256k1_js_1 = require("@noble/curves/secp256k1.js");
 // Aggregates multiple public keys according to the MuSig2 algorithm
 function aggregateKeys(publicKeys, sort, options = {}) {

package/dist/cjs/musig2/nonces.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateNonces = generateNonces;
-const musig = __importStar(require("@scure/btc-signer/musig2"));
+const musig = __importStar(require("@scure/btc-signer/musig2.js"));
 /**
  * Generates a pair of public and secret nonces for MuSig2 signing
  */

package/dist/cjs/musig2/sign.js

@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PartialSig = exports.PartialSignatureError = void 0;
 exports.sign = sign;
-const musig = __importStar(require("@scure/btc-signer/musig2"));
+const musig = __importStar(require("@scure/btc-signer/musig2.js"));
 const utils_js_1 = require("@noble/curves/utils.js");
 const secp256k1_1 = require("@noble/secp256k1");
 const keys_1 = require("./keys");

package/dist/cjs/networks.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.networks = exports.getNetwork = void 0;
-const btc_signer_1 = require("@scure/btc-signer");
+const utils_js_1 = require("@scure/btc-signer/utils.js");
 const getNetwork = (network) => {
     return exports.networks[network];
 };
 exports.getNetwork = getNetwork;
 exports.networks = {
-    bitcoin: withArkPrefix(btc_signer_1.NETWORK, "ark"),
-    testnet: withArkPrefix(btc_signer_1.TEST_NETWORK, "tark"),
-    signet: withArkPrefix(btc_signer_1.TEST_NETWORK, "tark"),
-    mutinynet: withArkPrefix(btc_signer_1.TEST_NETWORK, "tark"),
+    bitcoin: withArkPrefix(utils_js_1.NETWORK, "ark"),
+    testnet: withArkPrefix(utils_js_1.TEST_NETWORK, "tark"),
+    signet: withArkPrefix(utils_js_1.TEST_NETWORK, "tark"),
+    mutinynet: withArkPrefix(utils_js_1.TEST_NETWORK, "tark"),
     regtest: withArkPrefix({
-        ...btc_signer_1.TEST_NETWORK,
+        ...utils_js_1.TEST_NETWORK,
         bech32: "bcrt",
         pubKeyHash: 0x6f,
         scriptHash: 0xc4,

package/dist/cjs/providers/ark.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestArkProvider = exports.SettlementEventType = void 0;
 exports.isFetchTimeoutError = isFetchTimeoutError;
 const base_1 = require("@scure/base");
+const utils_1 = require("./utils");
 var SettlementEventType;
 (function (SettlementEventType) {
     SettlementEventType["BatchStarted"] = "batch_started";
@@ -45,6 +46,7 @@ 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),
@@ -219,39 +221,21 @@ 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 (0, utils_1.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) {
@@ -259,8 +243,10 @@ 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) {
@@ -268,7 +254,6 @@ 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;
@@ -282,42 +267,32 @@ 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 (0, utils_1.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) {
@@ -325,12 +300,11 @@ 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;
             }
         }
@@ -413,6 +387,10 @@ class RestArkProvider {
                 signature: data.treeSignature.signature,
             };
         }
+        // Skip heartbeat events
+        if (data.heartbeat) {
+            return null;
+        }
         console.warn("Unknown event type:", data);
         return null;
     }
@@ -439,6 +417,10 @@ class RestArkProvider {
                 },
             };
         }
+        // Skip heartbeat events
+        if (data.heartbeat) {
+            return null;
+        }
         console.warn("Unknown transaction notification type:", data);
         return null;
     }

package/dist/cjs/providers/indexer.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestIndexerProvider = exports.ChainTxType = exports.IndexerTxType = void 0;
 const ark_1 = require("./ark");
+const utils_1 = require("./utils");
 var IndexerTxType;
 (function (IndexerTxType) {
     IndexerTxType[IndexerTxType["INDEXER_TX_TYPE_UNSPECIFIED"] = 0] = "INDEXER_TX_TYPE_UNSPECIFIED";
@@ -30,7 +31,7 @@ class RestIndexerProvider {
         this.serverUrl = serverUrl;
     }
     async getVtxoTree(batchOutpoint, opts) {
-        let url = `${this.serverUrl}/v1/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/tree`;
+        let url = `${this.serverUrl}/v1/indexer/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/tree`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -58,7 +59,7 @@ class RestIndexerProvider {
         return data;
     }
     async getVtxoTreeLeaves(batchOutpoint, opts) {
-        let url = `${this.serverUrl}/v1/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/tree/leaves`;
+        let url = `${this.serverUrl}/v1/indexer/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/tree/leaves`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -80,7 +81,7 @@ class RestIndexerProvider {
         return data;
     }
     async getBatchSweepTransactions(batchOutpoint) {
-        const url = `${this.serverUrl}/v1/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/sweepTxs`;
+        const url = `${this.serverUrl}/v1/indexer/batch/${batchOutpoint.txid}/${batchOutpoint.vout}/sweepTxs`;
         const res = await fetch(url);
         if (!res.ok) {
             throw new Error(`Failed to fetch batch sweep transactions: ${res.statusText}`);
@@ -92,7 +93,7 @@ class RestIndexerProvider {
         return data;
     }
     async getCommitmentTx(txid) {
-        const url = `${this.serverUrl}/v1/commitmentTx/${txid}`;
+        const url = `${this.serverUrl}/v1/indexer/commitmentTx/${txid}`;
         const res = await fetch(url);
         if (!res.ok) {
             throw new Error(`Failed to fetch commitment tx: ${res.statusText}`);
@@ -104,7 +105,7 @@ class RestIndexerProvider {
         return data;
     }
     async getCommitmentTxConnectors(txid, opts) {
-        let url = `${this.serverUrl}/v1/commitmentTx/${txid}/connectors`;
+        let url = `${this.serverUrl}/v1/indexer/commitmentTx/${txid}/connectors`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -132,7 +133,7 @@ class RestIndexerProvider {
         return data;
     }
     async getCommitmentTxForfeitTxs(txid, opts) {
-        let url = `${this.serverUrl}/v1/commitmentTx/${txid}/forfeitTxs`;
+        let url = `${this.serverUrl}/v1/indexer/commitmentTx/${txid}/forfeitTxs`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -154,47 +155,41 @@ class RestIndexerProvider {
         return data;
     }
     async *getSubscription(subscriptionId, abortSignal) {
-        const url = `${this.serverUrl}/v1/script/subscription/${subscriptionId}`;
-        while (!abortSignal.aborted) {
+        const url = `${this.serverUrl}/v1/indexer/script/subscription/${subscriptionId}`;
+        while (!abortSignal?.aborted) {
             try {
-                const res = await fetch(url, {
-                    headers: {
-                        Accept: "application/json",
-                    },
-                });
-                if (!res.ok) {
-                    throw new Error(`Unexpected status ${res.status} when subscribing to address updates`);
-                }
-                if (!res.body) {
-                    throw new Error("Response body is null");
-                }
-                const reader = res.body.getReader();
-                const decoder = new TextDecoder();
-                let buffer = "";
-                while (!abortSignal.aborted) {
-                    const { done, value } = await reader.read();
-                    if (done) {
-                        break;
-                    }
-                    buffer += decoder.decode(value, { stream: true });
-                    const lines = buffer.split("\n");
-                    for (let i = 0; i < lines.length - 1; i++) {
-                        const line = lines[i].trim();
-                        if (!line)
-                            continue;
-                        const data = JSON.parse(line);
-                        if ("result" in data) {
-                            yield {
-                                txid: data.result.txid,
-                                scripts: data.result.scripts || [],
-                                newVtxos: (data.result.newVtxos || []).map(convertVtxo),
-                                spentVtxos: (data.result.spentVtxos || []).map(convertVtxo),
-                                tx: data.result.tx,
-                                checkpointTxs: data.result.checkpointTxs,
-                            };
+                const eventSource = new EventSource(url);
+                // Set up abort handling
+                const abortHandler = () => {
+                    eventSource.close();
+                };
+                abortSignal?.addEventListener("abort", abortHandler);
+                try {
+                    for await (const event of (0, utils_1.eventSourceIterator)(eventSource)) {
+                        if (abortSignal?.aborted)
+                            break;
+                        try {
+                            const data = JSON.parse(event.data);
+                            if (data.event) {
+                                yield {
+                                    txid: data.event.txid,
+                                    scripts: data.event.scripts || [],
+                                    newVtxos: (data.event.newVtxos || []).map(convertVtxo),
+                                    spentVtxos: (data.event.spentVtxos || []).map(convertVtxo),
+                                    tx: data.event.tx,
+                                    checkpointTxs: data.event.checkpointTxs,
+                                };
+                            }
+                        }
+                        catch (err) {
+                            console.error("Failed to parse subscription event:", err);
+                            throw err;
                         }
                     }
-                    buffer = lines[lines.length - 1];
+                }
+                finally {
+                    abortSignal?.removeEventListener("abort", abortHandler);
+                    eventSource.close();
                 }
             }
             catch (error) {
@@ -202,7 +197,6 @@ class RestIndexerProvider {
                     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 ((0, ark_1.isFetchTimeoutError)(error)) {
                     console.debug("Timeout error ignored");
                     continue;
@@ -213,7 +207,7 @@ class RestIndexerProvider {
         }
     }
     async getVirtualTxs(txids, opts) {
-        let url = `${this.serverUrl}/v1/virtualTx/${txids.join(",")}`;
+        let url = `${this.serverUrl}/v1/indexer/virtualTx/${txids.join(",")}`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -235,7 +229,7 @@ class RestIndexerProvider {
         return data;
     }
     async getVtxoChain(vtxoOutpoint, opts) {
-        let url = `${this.serverUrl}/v1/vtxo/${vtxoOutpoint.txid}/${vtxoOutpoint.vout}/chain`;
+        let url = `${this.serverUrl}/v1/indexer/vtxo/${vtxoOutpoint.txid}/${vtxoOutpoint.vout}/chain`;
         const params = new URLSearchParams();
         if (opts) {
             if (opts.pageIndex !== undefined)
@@ -264,7 +258,7 @@ class RestIndexerProvider {
         if (!opts?.scripts && !opts?.outpoints) {
             throw new Error("Either scripts or outpoints must be provided");
         }
-        let url = `${this.serverUrl}/v1/vtxos`;
+        let url = `${this.serverUrl}/v1/indexer/vtxos`;
         const params = new URLSearchParams();
         // Handle scripts with multi collection format
         if (opts?.scripts && opts.scripts.length > 0) {
@@ -307,7 +301,7 @@ class RestIndexerProvider {
         };
     }
     async subscribeForScripts(scripts, subscriptionId) {
-        const url = `${this.serverUrl}/v1/script/subscribe`;
+        const url = `${this.serverUrl}/v1/indexer/script/subscribe`;
         const res = await fetch(url, {
             headers: {
                 "Content-Type": "application/json",
@@ -325,7 +319,7 @@ class RestIndexerProvider {
         return data.subscriptionId;
     }
     async unsubscribeForScripts(subscriptionId, scripts) {
-        const url = `${this.serverUrl}/v1/script/unsubscribe`;
+        const url = `${this.serverUrl}/v1/indexer/script/unsubscribe`;
         const res = await fetch(url, {
             headers: {
                 "Content-Type": "application/json",
@@ -442,7 +436,7 @@ var Response;
         return (typeof data === "object" &&
             isOutpoint(data.outpoint) &&
             typeof data.createdAt === "string" &&
-            typeof data.expiresAt === "string" &&
+            (data.expiresAt === null || typeof data.expiresAt === "string") &&
             typeof data.amount === "string" &&
             typeof data.script === "string" &&
             typeof data.isPreconfirmed === "boolean" &&