@arkade-os/sdk 0.4.21 → 0.4.23

package/dist/cjs/wallet/wallet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Wallet = exports.ReadonlyWallet = void 0;
+exports.Wallet = exports.ReadonlyWallet = exports.getArkadeServerUrl = void 0;
 exports.selectVirtualCoins = selectVirtualCoins;
 exports.waitForIncomingFunds = waitForIncomingFunds;
 const base_1 = require("@scure/base");
@@ -39,6 +39,8 @@ const contractManager_1 = require("../contracts/contractManager");
 const handlers_1 = require("../contracts/handlers");
 const helpers_1 = require("../contracts/handlers/helpers");
 const syncCursors_1 = require("../utils/syncCursors");
+const getArkadeServerUrl = ({ arkServerUrl, }) => arkServerUrl || _1.DEFAULT_ARKADE_SERVER_URL;
+exports.getArkadeServerUrl = getArkadeServerUrl;
 // Historical unilateral exit delay for mainnet (~7 days in seconds).
 // Kept so existing wallets can still discover and spend VTXOs sent to the
 // legacy address after arkd starts advertising a different delay.
@@ -125,10 +127,7 @@ class ReadonlyWallet {
         // Use provided arkProvider instance or create a new one from arkServerUrl
         const arkProvider = config.arkProvider ||
             (() => {
-                if (!config.arkServerUrl) {
-                    throw new Error("Either arkProvider or arkServerUrl must be provided");
-                }
-                return new ark_1.RestArkProvider(config.arkServerUrl);
+                return new ark_1.RestArkProvider((0, exports.getArkadeServerUrl)(config));
             })();
         // Extract arkServerUrl from provider if not explicitly provided
         const arkServerUrl = config.arkServerUrl || arkProvider.serverUrl;
@@ -307,7 +306,7 @@ class ReadonlyWallet {
                 continue;
             if (vtxo.assets) {
                 for (const a of vtxo.assets) {
-                    const current = assetBalances.get(a.assetId) ?? 0;
+                    const current = assetBalances.get(a.assetId) ?? 0n;
                     assetBalances.set(a.assetId, current + a.amount);
                 }
             }
@@ -1129,12 +1128,12 @@ class Wallet extends ReadonlyWallet {
             for (const [, assets] of assetInputs) {
                 for (const asset of assets) {
                     const existing = allAssets.get(asset.assetId) ?? 0n;
-                    allAssets.set(asset.assetId, existing + BigInt(asset.amount));
+                    allAssets.set(asset.assetId, existing + asset.amount);
                 }
             }
             outputAssets = [];
             for (const [assetId, amount] of allAssets) {
-                outputAssets.push({ assetId, amount: Number(amount) });
+                outputAssets.push({ assetId, amount });
             }
         }
         const recipients = params.outputs.map((output, i) => ({
@@ -1569,7 +1568,7 @@ class Wallet extends ReadonlyWallet {
      * const txid = await wallet.send({
      *     address: 'ark1q...',
      *     amount: 1000, // (optional, default to dust) btc amount to send to the output
-     *     assets: [{ assetId: 'abc123...', amount: 50 }] // (optional) list of assets to send
+     *     assets: [{ assetId: 'abc123...', amount: 50n }] // (optional) list of assets to send
      * });
      * ```
      */
@@ -1600,7 +1599,7 @@ class Wallet extends ReadonlyWallet {
                 continue;
             }
             for (const receiverAsset of recipient.assets) {
-                let amountToSelect = BigInt(receiverAsset.amount);
+                let amountToSelect = receiverAsset.amount;
                 // check if existing change covers the needed amount
                 const existingChange = assetChanges.get(receiverAsset.assetId) ?? 0n;
                 if (existingChange >= amountToSelect) {
@@ -1627,7 +1626,7 @@ class Wallet extends ReadonlyWallet {
                                 continue;
                             }
                             const existing = assetChanges.get(a.assetId) ?? 0n;
-                            assetChanges.set(a.assetId, existing + BigInt(a.amount));
+                            assetChanges.set(a.assetId, existing + a.amount);
                         }
                     }
                 }
@@ -1647,7 +1646,7 @@ class Wallet extends ReadonlyWallet {
                 if (coin.assets) {
                     for (const asset of coin.assets) {
                         const existing = assetChanges.get(asset.assetId) ?? 0n;
-                        assetChanges.set(asset.assetId, existing + BigInt(asset.amount));
+                        assetChanges.set(asset.assetId, existing + asset.amount);
                     }
                 }
             }
@@ -1669,7 +1668,7 @@ class Wallet extends ReadonlyWallet {
                 if (coin.assets) {
                     for (const asset of coin.assets) {
                         const existing = assetChanges.get(asset.assetId) ?? 0n;
-                        assetChanges.set(asset.assetId, existing + BigInt(asset.amount));
+                        assetChanges.set(asset.assetId, existing + asset.amount);
                     }
                 }
             }
@@ -1684,7 +1683,7 @@ class Wallet extends ReadonlyWallet {
             const changeAssets = [];
             for (const [assetId, amount] of assetChanges) {
                 if (amount > 0n) {
-                    changeAssets.push({ assetId, amount: Number(amount) });
+                    changeAssets.push({ assetId, amount });
                 }
             }
             changeIndex = outputs.length;

package/dist/esm/contracts/arkcontract.js

@@ -1,5 +1,6 @@
 import { hex } from "@scure/base";
 import { contractHandlers } from './handlers/index.js';
+import { DEFAULT_ARKADE_HRP } from '../wallet/index.js';
 /**
  * Prefix for arkcontract strings.
  */
@@ -115,7 +116,7 @@ export function contractFromArkContract(encoded, options = {}) {
  * @param options - Additional options
  * @returns A complete Contract object
  */
-export function contractFromArkContractWithAddress(encoded, serverPubKey, addressPrefix, options = {}) {
+export function contractFromArkContractWithAddress(encoded, serverPubKey, addressPrefix = DEFAULT_ARKADE_HRP, options = {}) {
     const parsed = decodeArkContract(encoded);
     const handler = contractHandlers.getOrThrow(parsed.type);
     const params = parsed.data;

package/dist/esm/contracts/contractWatcher.js

@@ -1,3 +1,4 @@
+import { extendVirtualCoinForContract } from '../wallet/utils.js';
 import { isEventSourceError } from '../providers/utils.js';
 /**
  * Watches multiple contracts for virtual output state changes with resilient connection handling.
@@ -550,18 +551,22 @@ export class ContractWatcher {
         const state = this.contracts.get(contractScript);
         if (!state)
             return;
+        const extended = [];
+        for (const v of vtxos) {
+            try {
+                const extendedVtxo = extendVirtualCoinForContract(v, state.contract);
+                extended.push({ ...extendedVtxo, contractScript });
+            }
+            catch {
+                console.warn("failed to extend vtxo: ", v);
+                extended.push({ ...v, contractScript });
+            }
+        }
         switch (eventType) {
             case "vtxo_received":
                 this.eventCallback({
                     type: "vtxo_received",
-                    vtxos: vtxos.map((v) => ({
-                        ...v,
-                        contractScript,
-                        // These fields may not be available from basic VirtualCoin
-                        forfeitTapLeafScript: undefined,
-                        intentTapLeafScript: undefined,
-                        tapTree: undefined,
-                    })),
+                    vtxos: extended,
                     contractScript,
                     contract: state.contract,
                     timestamp,
@@ -570,14 +575,7 @@ export class ContractWatcher {
             case "vtxo_spent":
                 this.eventCallback({
                     type: "vtxo_spent",
-                    vtxos: vtxos.map((v) => ({
-                        ...v,
-                        contractScript,
-                        // These fields may not be available from basic VirtualCoin
-                        forfeitTapLeafScript: undefined,
-                        intentTapLeafScript: undefined,
-                        tapTree: undefined,
-                    })),
+                    vtxos: extended,
                     contractScript,
                     contract: state.contract,
                     timestamp,

package/dist/esm/identity/descriptor.js

@@ -1,7 +1,72 @@
-import { expand, networks, } from "@bitcoinerlab/descriptors-scure";
+import { expand, networks } from "@bitcoinerlab/descriptors-scure";
 import { hex } from "@scure/base";
-function inferNetwork(descriptor) {
-    return descriptor.includes("tpub") ? networks.testnet : networks.bitcoin;
+/**
+ * True iff `descriptor` is a Bitcoin mainnet descriptor (xpub-prefixed
+ * BIP32 key).
+ *
+ * Note: testnet, signet, regtest, mutinynet, and other non-mainnet
+ * networks all share the same `tpub` BIP32 version bytes — they cannot
+ * be distinguished from one another at the descriptor level. Callers
+ * that need a `Network` constants object for `expand()` pick
+ * `networks.bitcoin` vs `networks.testnet` themselves; callers that
+ * need the *actual* network the wallet is on must track that
+ * out-of-band.
+ */
+export function isMainnetDescriptor(descriptor) {
+    return !descriptor.includes("tpub");
+}
+/**
+ * Shared "does `candidate` belong to the identity backed by
+ * `ourDescriptor`?" predicate.
+ *
+ * - HD descriptors (expanding to a `bip32` key) match by account xpub
+ *   on both sides — index-agnostic, so a wildcard template and any
+ *   concrete index under it all collapse to the same xpub.
+ * - Bare `tr(pubkey)` candidates fall back to comparing the candidate
+ *   pubkey against `ourXOnlyPubkey` (the cached pubkey on the identity
+ *   side, since pulling it from `ourDescriptor` would require an index
+ *   substitution the caller already performed).
+ */
+export function descriptorIsOurs(candidate, ourDescriptor, ourXOnlyPubkey) {
+    if (!isDescriptor(candidate))
+        return false;
+    try {
+        const candidateInfo = expand({
+            descriptor: candidate,
+            network: isMainnetDescriptor(candidate)
+                ? networks.bitcoin
+                : networks.testnet,
+        }).expansionMap?.["@0"];
+        if (!candidateInfo)
+            return false;
+        if (candidateInfo.bip32) {
+            const ourBip32 = expand({
+                descriptor: ourDescriptor,
+                network: isMainnetDescriptor(ourDescriptor)
+                    ? networks.bitcoin
+                    : networks.testnet,
+            }).expansionMap?.["@0"]?.bip32;
+            if (!ourBip32)
+                return false;
+            return ourBip32.toBase58() === candidateInfo.bip32.toBase58();
+        }
+        if (candidateInfo.pubkey) {
+            // For tr() the library hands back a 32-byte x-only key, but
+            // strip a leading parity byte defensively so a 33-byte
+            // compressed key (mismatched length) doesn't silently
+            // false-negative against our 32-byte x-only side.
+            const candidatePub = candidateInfo.pubkey.length === 33
+                ? candidateInfo.pubkey.subarray(1)
+                : candidateInfo.pubkey;
+            if (candidatePub.length !== ourXOnlyPubkey.length)
+                return false;
+            return hex.encode(candidatePub) === hex.encode(ourXOnlyPubkey);
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
 }
 /**
  * Check if a string is a descriptor of the shape `tr(...)`.
@@ -43,7 +108,9 @@ export function extractPubKey(descriptor) {
     if (!isDescriptor(descriptor)) {
         return descriptor;
     }
-    const network = inferNetwork(descriptor);
+    const network = isMainnetDescriptor(descriptor)
+        ? networks.bitcoin
+        : networks.testnet;
     const expansion = expand({ descriptor, network });
     if (!expansion.expansionMap) {
         throw new Error("Cannot extract pubkey from descriptor: expansion failed.");
@@ -70,7 +137,9 @@ export function parseHDDescriptor(descriptor) {
     }
     let expansion;
     try {
-        const network = inferNetwork(descriptor);
+        const network = isMainnetDescriptor(descriptor)
+            ? networks.bitcoin
+            : networks.testnet;
         expansion = expand({ descriptor, network });
     }
     catch {

package/dist/esm/identity/hdCapableIdentity.js

@@ -0,0 +1 @@
+export {};