@arkade-os/sdk 0.4.11 → 0.4.13

package/dist/cjs/contracts/contractManager.js

@@ -149,7 +149,15 @@ class ContractManager {
         // Persist
         await this.config.contractRepository.saveContract(contract);
         // fetch all VTXOs (including spent/swept) for this contract
+        const requestStartedAt = Date.now();
         await this.fetchContractVxosFromIndexer([contract], true);
+        // Advance the sync cursor so that the watcher's vtxo_received
+        // event (triggered by addContract below) doesn't re-bootstrap
+        // the same script via deltaSyncContracts.
+        const cutoff = (0, syncCursors_1.cursorCutoff)(requestStartedAt);
+        await (0, syncCursors_1.advanceSyncCursors)(this.config.walletRepository, {
+            [contract.script]: cutoff,
+        });
         // Add to watcher
         await this.watcher.addContract(contract);
         return contract;

package/dist/cjs/identity/seedIdentity.js

@@ -7,8 +7,7 @@ const utils_js_1 = require("@scure/btc-signer/utils.js");
 const btc_signer_1 = require("@scure/btc-signer");
 const signingSession_1 = require("../tree/signingSession");
 const secp256k1_1 = require("@noble/secp256k1");
-const bitcoin_descriptors_1 = require("@kukks/bitcoin-descriptors");
-const { expand } = bitcoin_descriptors_1.defaultFactory;
+const descriptors_scure_1 = require("@bitcoinerlab/descriptors-scure");
 const ALL_SIGHASH = Object.values(btc_signer_1.SigHash).filter((x) => typeof x === "number");
 /**
  * Detects the network from a descriptor string by checking for tpub (testnet)
@@ -16,7 +15,7 @@ const ALL_SIGHASH = Object.values(btc_signer_1.SigHash).filter((x) => typeof x =
  * @internal
  */
 function detectNetwork(descriptor) {
-    return descriptor.includes("tpub") ? bitcoin_descriptors_1.networks.testnet : bitcoin_descriptors_1.networks.bitcoin;
+    return descriptor.includes("tpub") ? descriptors_scure_1.networks.testnet : descriptors_scure_1.networks.bitcoin;
 }
 function hasDescriptor(opts) {
     return "descriptor" in opts && typeof opts.descriptor === "string";
@@ -26,9 +25,9 @@ function hasDescriptor(opts) {
  * @internal
  */
 function buildDescriptor(seed, isMainnet) {
-    const network = isMainnet ? bitcoin_descriptors_1.networks.bitcoin : bitcoin_descriptors_1.networks.testnet;
-    const masterNode = bitcoin_descriptors_1.scureBIP32.fromSeed(seed, network);
-    return bitcoin_descriptors_1.scriptExpressions.trBIP32({
+    const network = isMainnet ? descriptors_scure_1.networks.bitcoin : descriptors_scure_1.networks.testnet;
+    const masterNode = descriptors_scure_1.HDKey.fromMasterSeed(seed, network.bip32);
+    return descriptors_scure_1.scriptExpressions.trBIP32({
         masterNode,
         network,
         account: 0,
@@ -72,22 +71,22 @@ class SeedIdentity {
         this.descriptor = descriptor;
         const network = detectNetwork(descriptor);
         // Parse and validate the descriptor using the library
-        const expansion = expand({ descriptor, network });
+        const expansion = (0, descriptors_scure_1.expand)({ descriptor, network });
         const keyInfo = expansion.expansionMap?.["@0"];
         if (!keyInfo?.originPath) {
             throw new Error("Descriptor must include a key origin path");
         }
         // Verify the xpub in the descriptor matches our seed
-        const masterNode = bitcoin_descriptors_1.scureBIP32.fromSeed(seed, network);
-        const accountNode = masterNode.derivePath(`m${keyInfo.originPath}`);
-        if (accountNode.neutered().toBase58() !== keyInfo.bip32?.toBase58()) {
+        const masterNode = descriptors_scure_1.HDKey.fromMasterSeed(seed, network.bip32);
+        const accountNode = masterNode.derive(`m${keyInfo.originPath}`);
+        if (accountNode.publicExtendedKey !== keyInfo.bip32?.toBase58()) {
             throw new Error("xpub mismatch: derived key does not match descriptor");
         }
         // Derive the private key using the full path from the descriptor
         if (!keyInfo.path) {
             throw new Error("Descriptor must specify a full derivation path");
         }
-        const derivedNode = masterNode.derivePath(keyInfo.path);
+        const derivedNode = masterNode.derive(keyInfo.path);
         if (!derivedNode.privateKey) {
             throw new Error("Failed to derive private key");
         }
@@ -217,7 +216,7 @@ class ReadonlyDescriptorIdentity {
     constructor(descriptor) {
         this.descriptor = descriptor;
         const network = detectNetwork(descriptor);
-        const expansion = expand({ descriptor, network });
+        const expansion = (0, descriptors_scure_1.expand)({ descriptor, network });
         const keyInfo = expansion.expansionMap?.["@0"];
         if (!keyInfo?.pubkey) {
             throw new Error("Failed to derive public key from descriptor");

package/dist/cjs/wallet/wallet.js

@@ -309,8 +309,21 @@ class ReadonlyWallet {
      * Delta-sync wallet VTXOs: fetch only changed VTXOs since the last
      * cursor, or do a full bootstrap when no cursor exists. Upserts
      * the result into the cache and advances the sync cursors.
+     *
+     * Concurrent calls are deduplicated: if a sync is already in flight,
+     * subsequent callers receive the same promise instead of triggering
+     * a second network round-trip.
      */
-    async syncVtxos() {
+    syncVtxos() {
+        if (this._syncVtxosInflight)
+            return this._syncVtxosInflight;
+        const p = this.doSyncVtxos().finally(() => {
+            this._syncVtxosInflight = undefined;
+        });
+        this._syncVtxosInflight = p;
+        return p;
+    }
+    async doSyncVtxos() {
         const address = await this.getAddress();
         // Batch cursor read with script map to avoid extra async hops
         // before the fetch (background operations may run between hops).

package/dist/esm/contracts/contractManager.js

@@ -146,7 +146,15 @@ export class ContractManager {
         // Persist
         await this.config.contractRepository.saveContract(contract);
         // fetch all VTXOs (including spent/swept) for this contract
+        const requestStartedAt = Date.now();
         await this.fetchContractVxosFromIndexer([contract], true);
+        // Advance the sync cursor so that the watcher's vtxo_received
+        // event (triggered by addContract below) doesn't re-bootstrap
+        // the same script via deltaSyncContracts.
+        const cutoff = cursorCutoff(requestStartedAt);
+        await advanceSyncCursors(this.config.walletRepository, {
+            [contract.script]: cutoff,
+        });
         // Add to watcher
         await this.watcher.addContract(contract);
         return contract;

package/dist/esm/identity/seedIdentity.js

@@ -4,8 +4,7 @@ import { pubECDSA, pubSchnorr } from "@scure/btc-signer/utils.js";
 import { SigHash } from "@scure/btc-signer";
 import { TreeSignerSession } from '../tree/signingSession.js';
 import { schnorr, signAsync } from "@noble/secp256k1";
-import { defaultFactory, scureBIP32 as BIP32, networks, scriptExpressions, } from "@kukks/bitcoin-descriptors";
-const { expand } = defaultFactory;
+import { HDKey, expand, networks, scriptExpressions, } from "@bitcoinerlab/descriptors-scure";
 const ALL_SIGHASH = Object.values(SigHash).filter((x) => typeof x === "number");
 /**
  * Detects the network from a descriptor string by checking for tpub (testnet)
@@ -24,7 +23,7 @@ function hasDescriptor(opts) {
  */
 function buildDescriptor(seed, isMainnet) {
     const network = isMainnet ? networks.bitcoin : networks.testnet;
-    const masterNode = BIP32.fromSeed(seed, network);
+    const masterNode = HDKey.fromMasterSeed(seed, network.bip32);
     return scriptExpressions.trBIP32({
         masterNode,
         network,
@@ -75,16 +74,16 @@ export class SeedIdentity {
             throw new Error("Descriptor must include a key origin path");
         }
         // Verify the xpub in the descriptor matches our seed
-        const masterNode = BIP32.fromSeed(seed, network);
-        const accountNode = masterNode.derivePath(`m${keyInfo.originPath}`);
-        if (accountNode.neutered().toBase58() !== keyInfo.bip32?.toBase58()) {
+        const masterNode = HDKey.fromMasterSeed(seed, network.bip32);
+        const accountNode = masterNode.derive(`m${keyInfo.originPath}`);
+        if (accountNode.publicExtendedKey !== keyInfo.bip32?.toBase58()) {
             throw new Error("xpub mismatch: derived key does not match descriptor");
         }
         // Derive the private key using the full path from the descriptor
         if (!keyInfo.path) {
             throw new Error("Descriptor must specify a full derivation path");
         }
-        const derivedNode = masterNode.derivePath(keyInfo.path);
+        const derivedNode = masterNode.derive(keyInfo.path);
         if (!derivedNode.privateKey) {
             throw new Error("Failed to derive private key");
         }

package/dist/esm/wallet/wallet.js

@@ -304,8 +304,21 @@ export class ReadonlyWallet {
      * Delta-sync wallet VTXOs: fetch only changed VTXOs since the last
      * cursor, or do a full bootstrap when no cursor exists. Upserts
      * the result into the cache and advances the sync cursors.
+     *
+     * Concurrent calls are deduplicated: if a sync is already in flight,
+     * subsequent callers receive the same promise instead of triggering
+     * a second network round-trip.
      */
-    async syncVtxos() {
+    syncVtxos() {
+        if (this._syncVtxosInflight)
+            return this._syncVtxosInflight;
+        const p = this.doSyncVtxos().finally(() => {
+            this._syncVtxosInflight = undefined;
+        });
+        this._syncVtxosInflight = p;
+        return p;
+    }
+    async doSyncVtxos() {
         const address = await this.getAddress();
         // Batch cursor read with script map to avoid extra async hops
         // before the fetch (background operations may run between hops).

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

@@ -43,6 +43,7 @@ export declare class ReadonlyWallet implements IReadonlyWallet {
     private _contractManagerInitializing?;
     protected readonly watcherConfig?: ReadonlyWalletConfig["watcherConfig"];
     private readonly _assetManager;
+    private _syncVtxosInflight?;
     get assetManager(): IReadonlyAssetManager;
     protected constructor(identity: ReadonlyIdentity, network: Network, onchainProvider: OnchainProvider, indexerProvider: IndexerProvider, arkServerPublicKey: Bytes, offchainTapscript: DefaultVtxo.Script | DelegateVtxo.Script, boardingTapscript: DefaultVtxo.Script, dustAmount: bigint, walletRepository: WalletRepository, contractRepository: ContractRepository, delegatorProvider?: DelegatorProvider | undefined, watcherConfig?: ReadonlyWalletConfig["watcherConfig"]);
     /**
@@ -80,8 +81,13 @@ export declare class ReadonlyWallet implements IReadonlyWallet {
      * Delta-sync wallet VTXOs: fetch only changed VTXOs since the last
      * cursor, or do a full bootstrap when no cursor exists. Upserts
      * the result into the cache and advances the sync cursors.
+     *
+     * Concurrent calls are deduplicated: if a sync is already in flight,
+     * subsequent callers receive the same promise instead of triggering
+     * a second network round-trip.
      */
     private syncVtxos;
+    private doSyncVtxos;
     /**
      * Clear all VTXO sync cursors, forcing a full re-bootstrap on next sync.
      * Useful for recovery after indexer reprocessing or debugging.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.4.11",
+  "version": "0.4.13",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -80,12 +80,11 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@kukks/bitcoin-descriptors": "3.2.3",
+    "@bitcoinerlab/descriptors-scure": "3.1.4",
     "@marcbachmann/cel-js": "7.3.1",
-    "@noble/curves": "2.0.0",
+    "@noble/curves": "2.0.1",
     "@noble/secp256k1": "3.0.0",
     "@scure/base": "2.0.0",
-    "@scure/bip32": "2.0.0",
     "@scure/bip39": "2.0.1",
     "@scure/btc-signer": "2.0.1",
     "bip68": "1.0.4"