bitmask-core 1.0.7-beta.16 → 1.0.7-beta.18

package/bitcoin.d.ts

@@ -4,13 +4,13 @@ export declare const upgradeWallet: (hash: string, encryptedDescriptors: string,
 export declare const syncWallets: () => Promise<void>;
 export declare const newWallet: (hash: string, seedPassword: string) => Promise<string>;
 export declare const encryptWallet: (mnemonic: string, hash: string, seedPassword: string) => Promise<string>;
-export declare const getWalletData: (descriptor: string, changeDescriptor?: string) => Promise<WalletData>;
-export declare const getNewAddress: (descriptor: string, changeDescriptor?: string) => Promise<string>;
+export declare const getWalletData: (descriptor: string, changeDescriptor?: string | undefined) => Promise<WalletData>;
+export declare const getNewAddress: (descriptor: string, changeDescriptor?: string | undefined) => Promise<string>;
 export declare const sendSats: (descriptor: string, changeDescriptor: string, address: string, amount: bigint, broadcast: boolean, feeRate: number) => Promise<TransactionData>;
-export declare const fundVault: (descriptor: string, changeDescriptor: string, rgbAddress: string, broadcast: boolean, feeRate?: number) => Promise<FundVaultDetails>;
+export declare const fundVault: (descriptor: string, changeDescriptor: string, rgbAddress: string, broadcast: boolean, feeRate?: number | undefined) => Promise<FundVaultDetails>;
 export declare const getAssetsVault: (rgbDescriptorXpub: string) => Promise<FundVaultDetails>;
-export declare const drainWallet: (destination: string, descriptor: string, changeDescriptor?: string, feeRate?: number) => Promise<TransactionData>;
-export declare const bumpFee: (txid: string, feeRate: number, broadcast: boolean, descriptor: string, changeDescriptor?: string) => Promise<TransactionData>;
+export declare const drainWallet: (destination: string, descriptor: string, changeDescriptor?: string | undefined, feeRate?: number | undefined) => Promise<TransactionData>;
+export declare const bumpFee: (txid: string, feeRate: number, broadcast: boolean, descriptor: string, changeDescriptor?: string | undefined) => Promise<TransactionData>;
 export interface PrivateWalletData {
     xprvkh: string;
     btcDescriptorXprv: string;
@@ -115,7 +115,7 @@ export interface FundVaultDetails {
     fundTxid?: string;
     fundFee?: number;
 }
-export type FeeEstimates = Record<string, number>;
+export declare type FeeEstimates = Record<string, number>;
 export declare function fetchFeeEstimates(): Promise<FeeEstimates>;
 export declare function feeFromRate(vbytes: number, satPerVb: number): number;
 /**

package/bitcoin.js

@@ -3,11 +3,7 @@
 // https://github.com/diba-io/bitmask-core/blob/development/src/web.rs
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -17,38 +13,15 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bumpFee = exports.drainWallet = exports.getAssetsVault = exports.fundVault = exports.sendSats = exports.getNewAddress = exports.getWalletData = exports.encryptWallet = exports.newWallet = exports.syncWallets = exports.upgradeWallet = exports.decryptWallet = exports.hashPassword = void 0;
-exports.fetchFeeEstimates = fetchFeeEstimates;
-exports.feeFromRate = feeFromRate;
-exports.guessSwapVbytes = guessSwapVbytes;
-exports.quoteSwapFeeSats = quoteSwapFeeSats;
+exports.quoteSwapFeeSats = exports.guessSwapVbytes = exports.feeFromRate = exports.fetchFeeEstimates = exports.bumpFee = exports.drainWallet = exports.getAssetsVault = exports.fundVault = exports.sendSats = exports.getNewAddress = exports.getWalletData = exports.encryptWallet = exports.newWallet = exports.syncWallets = exports.upgradeWallet = exports.decryptWallet = exports.hashPassword = void 0;
 const BMC = __importStar(require("./bitmask_core"));
 const constants_1 = require("./constants");
 const hashPassword = (password) => {
@@ -58,81 +31,69 @@ const hashPassword = (password) => {
     return BMC.hash_password(password);
 };
 exports.hashPassword = hashPassword;
-const decryptWallet = (hash_1, encryptedDescriptors_1, ...args_1) => __awaiter(void 0, [hash_1, encryptedDescriptors_1, ...args_1], void 0, function* (hash, encryptedDescriptors, seedPassword = "") {
-    return JSON.parse(yield BMC.decrypt_wallet(hash, encryptedDescriptors, seedPassword));
-});
+const decryptWallet = async (hash, encryptedDescriptors, seedPassword = "") => JSON.parse(await BMC.decrypt_wallet(hash, encryptedDescriptors, seedPassword));
 exports.decryptWallet = decryptWallet;
-const upgradeWallet = (hash_1, encryptedDescriptors_1, ...args_1) => __awaiter(void 0, [hash_1, encryptedDescriptors_1, ...args_1], void 0, function* (hash, encryptedDescriptors, seedPassword = "") {
-    return JSON.parse(yield BMC.upgrade_wallet(hash, encryptedDescriptors, seedPassword));
-});
+const upgradeWallet = async (hash, encryptedDescriptors, seedPassword = "") => JSON.parse(await BMC.upgrade_wallet(hash, encryptedDescriptors, seedPassword));
 exports.upgradeWallet = upgradeWallet;
-const syncWallets = () => __awaiter(void 0, void 0, void 0, function* () { return BMC.sync_wallets(); });
+const syncWallets = async () => BMC.sync_wallets();
 exports.syncWallets = syncWallets;
-const newWallet = (hash, seedPassword) => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield BMC.new_wallet(hash, seedPassword)); });
+const newWallet = async (hash, seedPassword) => JSON.parse(await BMC.new_wallet(hash, seedPassword));
 exports.newWallet = newWallet;
-const encryptWallet = (mnemonic, hash, seedPassword) => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield BMC.encrypt_wallet(mnemonic, hash, seedPassword)); });
+const encryptWallet = async (mnemonic, hash, seedPassword) => JSON.parse(await BMC.encrypt_wallet(mnemonic, hash, seedPassword));
 exports.encryptWallet = encryptWallet;
-const getWalletData = (descriptor, changeDescriptor) => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield BMC.get_wallet_data(descriptor, changeDescriptor)); });
+const getWalletData = async (descriptor, changeDescriptor) => JSON.parse(await BMC.get_wallet_data(descriptor, changeDescriptor));
 exports.getWalletData = getWalletData;
-const getNewAddress = (descriptor, changeDescriptor) => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield BMC.get_new_address(descriptor, changeDescriptor)); });
+const getNewAddress = async (descriptor, changeDescriptor) => JSON.parse(await BMC.get_new_address(descriptor, changeDescriptor));
 exports.getNewAddress = getNewAddress;
-const sendSats = (descriptor, changeDescriptor, address, amount, broadcast, feeRate) => __awaiter(void 0, void 0, void 0, function* () {
-    return JSON.parse(yield BMC.send_sats(descriptor, changeDescriptor, address, amount, broadcast, feeRate));
-});
+const sendSats = async (descriptor, changeDescriptor, address, amount, broadcast, feeRate) => JSON.parse(await BMC.send_sats(descriptor, changeDescriptor, address, amount, broadcast, feeRate));
 exports.sendSats = sendSats;
-const fundVault = (descriptor, changeDescriptor, rgbAddress, broadcast, feeRate) => __awaiter(void 0, void 0, void 0, function* () {
-    return JSON.parse(yield BMC.fund_vault(descriptor, changeDescriptor, rgbAddress, broadcast, feeRate));
-});
+const fundVault = async (descriptor, changeDescriptor, rgbAddress, broadcast, feeRate) => JSON.parse(await BMC.fund_vault(descriptor, changeDescriptor, rgbAddress, broadcast, feeRate));
 exports.fundVault = fundVault;
-const getAssetsVault = (rgbDescriptorXpub) => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield BMC.get_assets_vault(rgbDescriptorXpub)); });
+const getAssetsVault = async (rgbDescriptorXpub) => JSON.parse(await BMC.get_assets_vault(rgbDescriptorXpub));
 exports.getAssetsVault = getAssetsVault;
-const drainWallet = (destination, descriptor, changeDescriptor, feeRate) => __awaiter(void 0, void 0, void 0, function* () {
-    return JSON.parse(yield BMC.drain_wallet(destination, descriptor, changeDescriptor, feeRate));
-});
+const drainWallet = async (destination, descriptor, changeDescriptor, feeRate) => JSON.parse(await BMC.drain_wallet(destination, descriptor, changeDescriptor, feeRate));
 exports.drainWallet = drainWallet;
-const bumpFee = (txid, feeRate, broadcast, descriptor, changeDescriptor) => __awaiter(void 0, void 0, void 0, function* () {
-    return JSON.parse(yield BMC.bump_fee(txid, feeRate, descriptor, changeDescriptor, broadcast));
-});
+const bumpFee = async (txid, feeRate, broadcast, descriptor, changeDescriptor) => JSON.parse(await BMC.bump_fee(txid, feeRate, descriptor, changeDescriptor, broadcast));
 exports.bumpFee = bumpFee;
-function fetchFeeEstimates() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const net = yield (0, constants_1.getNetwork)();
-        let envKey;
-        switch (net) {
-            case "bitcoin":
-                envKey = "BITCOIN_EXPLORER_API_MAINNET";
-                break;
-            case "testnet":
-                envKey = "BITCOIN_EXPLORER_API_TESTNET";
-                break;
-            case "signet":
-                envKey = "BITCOIN_EXPLORER_API_SIGNET";
-                break;
-            case "regtest":
-                envKey = "BITCOIN_EXPLORER_API_REGTEST";
-                break;
-            default:
-                // Fallback to signet if unknown string is returned
-                envKey = "BITCOIN_EXPLORER_API_SIGNET";
-                break;
-        }
-        const base = yield (0, constants_1.getEnv)(envKey);
-        if (!base) {
-            throw new Error(`fee-estimates: missing env ${envKey} for network ${net}`);
-        }
-        const baseUrl = (base || "").replace(/\/$/, "");
-        const url = `${baseUrl}/fee-estimates`;
-        const resp = yield fetch(url, { method: "GET" });
-        if (!resp.ok) {
-            const text = yield resp.text().catch(() => "");
-            throw new Error(`fee-estimates fetch failed ${resp.status}: ${text}`);
-        }
-        return (yield resp.json());
-    });
+async function fetchFeeEstimates() {
+    const net = await (0, constants_1.getNetwork)();
+    let envKey;
+    switch (net) {
+        case "bitcoin":
+            envKey = "BITCOIN_EXPLORER_API_MAINNET";
+            break;
+        case "testnet":
+            envKey = "BITCOIN_EXPLORER_API_TESTNET";
+            break;
+        case "signet":
+            envKey = "BITCOIN_EXPLORER_API_SIGNET";
+            break;
+        case "regtest":
+            envKey = "BITCOIN_EXPLORER_API_REGTEST";
+            break;
+        default:
+            // Fallback to signet if unknown string is returned
+            envKey = "BITCOIN_EXPLORER_API_SIGNET";
+            break;
+    }
+    const base = await (0, constants_1.getEnv)(envKey);
+    if (!base) {
+        throw new Error(`fee-estimates: missing env ${envKey} for network ${net}`);
+    }
+    const baseUrl = (base || "").replace(/\/$/, "");
+    const url = `${baseUrl}/fee-estimates`;
+    const resp = await fetch(url, { method: "GET" });
+    if (!resp.ok) {
+        const text = await resp.text().catch(() => "");
+        throw new Error(`fee-estimates fetch failed ${resp.status}: ${text}`);
+    }
+    return (await resp.json());
 }
+exports.fetchFeeEstimates = fetchFeeEstimates;
 function feeFromRate(vbytes, satPerVb) {
     return Math.ceil(vbytes * satPerVb);
 }
+exports.feeFromRate = feeFromRate;
 /**
  * Rough vbytes guesser for swap/bid PSBTs when you don't yet know exact inputs/outputs.
  * Prefer passing a conservative bound to avoid underpaying relays:
@@ -151,19 +112,18 @@ function guessSwapVbytes(inputs = 2, outputs = 3, taprootHeavy = true) {
     const est = inputs * perIn + outputs * perOut + overhead;
     return Math.max(est, 300);
 }
+exports.guessSwapVbytes = guessSwapVbytes;
 /**
  * Convenience: get a safe absolute fee quote for a swap given a target confirmation bucket.
  * - bucket can be "1","2","3","6","144", etc., matching Esplora keys.
  * - vbytesEstimate can be computed via guessSwapVbytes() or a tighter UI estimate.
  * - Adds a small 10% safety margin on the feerate to reduce min-relay rejections.
  */
-function quoteSwapFeeSats(bucket, vbytesEstimate) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const estimates = yield fetchFeeEstimates();
-        const satPerVb = (_b = (_a = estimates[bucket]) !== null && _a !== void 0 ? _a : estimates["6"]) !== null && _b !== void 0 ? _b : 1.0;
-        const paddedRate = Math.max(1.0, satPerVb * 1.1); // 10% headroom
-        const fee = feeFromRate(vbytesEstimate, paddedRate);
-        return { rate: paddedRate, fee };
-    });
+async function quoteSwapFeeSats(bucket, vbytesEstimate) {
+    const estimates = await fetchFeeEstimates();
+    const satPerVb = estimates[bucket] ?? estimates["6"] ?? 1.0;
+    const paddedRate = Math.max(1.0, satPerVb * 1.1); // 10% headroom
+    const fee = feeFromRate(vbytesEstimate, paddedRate);
+    return { rate: paddedRate, fee };
 }
+exports.quoteSwapFeeSats = quoteSwapFeeSats;

package/bitmask_core.d.ts

@@ -1,55 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-export function get_network(): Promise<any>;
-export function switch_network(network_str: string): Promise<any>;
-export function get_env(key: string): Promise<any>;
-export function set_env(key: string, value: string): Promise<any>;
-export function sleep(ms: number): Promise<any>;
-export function hash_password(password: string): string;
-export function new_mnemonic(password: string): Promise<any>;
-export function save_mnemonic(seed: string, password: string): Promise<any>;
-export function decrypt_wallet(hash: string, encrypted_descriptors: string, seed_password: string): Promise<any>;
-export function upgrade_wallet(hash: string, encrypted_descriptors: string, seed_password: string): Promise<any>;
-export function new_wallet(hash: string, seed_password: string): Promise<any>;
-export function encrypt_wallet(mnemonic: string, hash: string, seed_password: string): Promise<any>;
-export function get_wallet_data(descriptor: string, change_descriptor?: string | null): Promise<any>;
-export function sync_wallets(): Promise<any>;
-export function get_new_address(descriptor: string, change_descriptor?: string | null): Promise<any>;
-export function send_sats(descriptor: string, change_descriptor: string, destination: string, amount: bigint, broadcast: boolean, fee_rate?: number | null): Promise<any>;
-export function fund_vault(descriptor: string, change_descriptor: string, rgb_address: string, broadcast: boolean, fee_rate?: number | null): Promise<any>;
-export function get_assets_vault(rgb_descriptor_xpub: string): Promise<any>;
-export function drain_wallet(destination: string, descriptor: string, change_descriptor?: string | null, fee_rate?: number | null): Promise<any>;
-export function bump_fee(txid: string, fee_rate: number, descriptor: string, change_descriptor: string | null | undefined, broadcast: boolean): Promise<any>;
-export function psbt_sign_and_publish_file(request: any): Promise<any>;
-export function psbt_publish_file(request: any): Promise<any>;
-export function fund_rgb_vault(sk: string, fee_rate: number, secrets: any, broadcast: boolean, fund_value: bigint | null | undefined, coordinator_fee: boolean): Promise<any>;
-export function transfer_sats(sk: string, address: string, sats: bigint, fee_rate: number, secrets: any): Promise<any>;
-export function get_btc_wallet(sk: string): Promise<any>;
-export function backup_btc_data(nostr_hex_sk: string): Promise<any>;
-export function recover_funds_from_bad_wallets(seed: string, pass_phrase: string, recover_address: string): Promise<any>;
-export function restore_btc_data(nostr_hex_sk: string): Promise<any>;
-export function create_wallet(username: string, password: string): Promise<any>;
-export function auth(username: string, password: string): Promise<any>;
-export function ln_create_invoice(description: string, amount: number, token: string): Promise<any>;
-export function get_balance(token: string): Promise<any>;
-export function get_txs(token: string): Promise<any>;
-export function pay_invoice(payment_request: string, token: string): Promise<any>;
-export function check_payment(payment_hash: string): Promise<any>;
-export function swap_btc_ln(token: string, ln_address?: string | null): Promise<any>;
-export function swap_ln_btc(address: string, amount: bigint, token: string): Promise<any>;
-export function create_watcher(nostr_hex_sk: string, request: any): Promise<any>;
-export function recover_watcher(nostr_hex_sk: string, request: any): Promise<any>;
-export function destroy_watcher(nostr_hex_sk: string): Promise<any>;
-export function destroy_recover_watcher(nostr_hex_sk: string): Promise<any>;
-export function check_watcher(nostr_hex_sk: string): Promise<any>;
-export function watcher_next_address(nostr_hex_sk: string, request: string): Promise<any>;
-export function watcher_next_utxo(nostr_hex_sk: string, request: string): Promise<any>;
-export function watcher_unspent_utxos(nostr_hex_sk: string, request: string): Promise<any>;
-export function convert_contract_amount_raw(decimal: string, precision: number): string;
-export function convert_contract_amount_string(amount: bigint, precision: number): string;
-export function parse_contract_amount(amount: string): any;
-export function parse_contract_amount_precision(amount: string, precision: number): string;
-export function version(): any;
 export function get_rgb_version(): string;
 export function get_rgb_wallet(nostr_hex_sk: string): Promise<any>;
 export function get_btc_wallet_data(nostr_hex_sk: string): Promise<any>;
@@ -99,6 +49,56 @@ export function encode_hex(bytes: Uint8Array): string;
 export function encode_base64(bytes: Uint8Array): string;
 export function decode_hex(string: string): Uint8Array;
 export function decode_base64(string: string): Uint8Array;
+export function create_wallet(username: string, password: string): Promise<any>;
+export function auth(username: string, password: string): Promise<any>;
+export function ln_create_invoice(description: string, amount: number, token: string): Promise<any>;
+export function get_balance(token: string): Promise<any>;
+export function get_txs(token: string): Promise<any>;
+export function pay_invoice(payment_request: string, token: string): Promise<any>;
+export function check_payment(payment_hash: string): Promise<any>;
+export function swap_btc_ln(token: string, ln_address?: string | null): Promise<any>;
+export function swap_ln_btc(address: string, amount: bigint, token: string): Promise<any>;
+export function get_network(): Promise<any>;
+export function switch_network(network_str: string): Promise<any>;
+export function get_env(key: string): Promise<any>;
+export function set_env(key: string, value: string): Promise<any>;
+export function sleep(ms: number): Promise<any>;
+export function fund_rgb_vault(sk: string, fee_rate: number, secrets: any, broadcast: boolean, fund_value: bigint | null | undefined, coordinator_fee: boolean): Promise<any>;
+export function transfer_sats(sk: string, address: string, sats: bigint, fee_rate: number, secrets: any): Promise<any>;
+export function get_btc_wallet(sk: string): Promise<any>;
+export function backup_btc_data(nostr_hex_sk: string): Promise<any>;
+export function recover_funds_from_bad_wallets(seed: string, pass_phrase: string, recover_address: string): Promise<any>;
+export function restore_btc_data(nostr_hex_sk: string): Promise<any>;
+export function convert_contract_amount_raw(decimal: string, precision: number): string;
+export function convert_contract_amount_string(amount: bigint, precision: number): string;
+export function parse_contract_amount(amount: string): any;
+export function parse_contract_amount_precision(amount: string, precision: number): string;
+export function version(): any;
+export function hash_password(password: string): string;
+export function new_mnemonic(password: string): Promise<any>;
+export function save_mnemonic(seed: string, password: string): Promise<any>;
+export function decrypt_wallet(hash: string, encrypted_descriptors: string, seed_password: string): Promise<any>;
+export function upgrade_wallet(hash: string, encrypted_descriptors: string, seed_password: string): Promise<any>;
+export function new_wallet(hash: string, seed_password: string): Promise<any>;
+export function encrypt_wallet(mnemonic: string, hash: string, seed_password: string): Promise<any>;
+export function get_wallet_data(descriptor: string, change_descriptor?: string | null): Promise<any>;
+export function sync_wallets(): Promise<any>;
+export function get_new_address(descriptor: string, change_descriptor?: string | null): Promise<any>;
+export function send_sats(descriptor: string, change_descriptor: string, destination: string, amount: bigint, broadcast: boolean, fee_rate?: number | null): Promise<any>;
+export function fund_vault(descriptor: string, change_descriptor: string, rgb_address: string, broadcast: boolean, fee_rate?: number | null): Promise<any>;
+export function get_assets_vault(rgb_descriptor_xpub: string): Promise<any>;
+export function drain_wallet(destination: string, descriptor: string, change_descriptor?: string | null, fee_rate?: number | null): Promise<any>;
+export function bump_fee(txid: string, fee_rate: number, descriptor: string, change_descriptor: string | null | undefined, broadcast: boolean): Promise<any>;
+export function psbt_sign_and_publish_file(request: any): Promise<any>;
+export function psbt_publish_file(request: any): Promise<any>;
+export function create_watcher(nostr_hex_sk: string, request: any): Promise<any>;
+export function recover_watcher(nostr_hex_sk: string, request: any): Promise<any>;
+export function destroy_watcher(nostr_hex_sk: string): Promise<any>;
+export function destroy_recover_watcher(nostr_hex_sk: string): Promise<any>;
+export function check_watcher(nostr_hex_sk: string): Promise<any>;
+export function watcher_next_address(nostr_hex_sk: string, request: string): Promise<any>;
+export function watcher_next_utxo(nostr_hex_sk: string, request: string): Promise<any>;
+export function watcher_unspent_utxos(nostr_hex_sk: string, request: string): Promise<any>;
 export function new_nostr_pubkey(pubkey: string, token: string): Promise<any>;
 export function update_nostr_pubkey(pubkey: string, token: string): Promise<any>;
 
@@ -106,56 +106,6 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  readonly get_network: () => any;
-  readonly switch_network: (a: number, b: number) => any;
-  readonly get_env: (a: number, b: number) => any;
-  readonly set_env: (a: number, b: number, c: number, d: number) => any;
-  readonly sleep: (a: number) => any;
-  readonly hash_password: (a: number, b: number) => [number, number];
-  readonly new_mnemonic: (a: number, b: number) => any;
-  readonly save_mnemonic: (a: number, b: number, c: number, d: number) => any;
-  readonly decrypt_wallet: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
-  readonly upgrade_wallet: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
-  readonly new_wallet: (a: number, b: number, c: number, d: number) => any;
-  readonly encrypt_wallet: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
-  readonly get_wallet_data: (a: number, b: number, c: number, d: number) => any;
-  readonly sync_wallets: () => any;
-  readonly get_new_address: (a: number, b: number, c: number, d: number) => any;
-  readonly send_sats: (a: number, b: number, c: number, d: number, e: number, f: number, g: bigint, h: number, i: number) => any;
-  readonly fund_vault: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => any;
-  readonly get_assets_vault: (a: number, b: number) => any;
-  readonly drain_wallet: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => any;
-  readonly bump_fee: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => any;
-  readonly psbt_sign_and_publish_file: (a: any) => any;
-  readonly psbt_publish_file: (a: any) => any;
-  readonly fund_rgb_vault: (a: number, b: number, c: number, d: any, e: number, f: number, g: bigint, h: number) => any;
-  readonly transfer_sats: (a: number, b: number, c: number, d: number, e: bigint, f: number, g: any) => any;
-  readonly get_btc_wallet: (a: number, b: number) => any;
-  readonly backup_btc_data: (a: number, b: number) => any;
-  readonly recover_funds_from_bad_wallets: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
-  readonly restore_btc_data: (a: number, b: number) => any;
-  readonly create_wallet: (a: number, b: number, c: number, d: number) => any;
-  readonly auth: (a: number, b: number, c: number, d: number) => any;
-  readonly ln_create_invoice: (a: number, b: number, c: number, d: number, e: number) => any;
-  readonly get_balance: (a: number, b: number) => any;
-  readonly get_txs: (a: number, b: number) => any;
-  readonly pay_invoice: (a: number, b: number, c: number, d: number) => any;
-  readonly check_payment: (a: number, b: number) => any;
-  readonly swap_btc_ln: (a: number, b: number, c: number, d: number) => any;
-  readonly swap_ln_btc: (a: number, b: number, c: bigint, d: number, e: number) => any;
-  readonly create_watcher: (a: number, b: number, c: any) => any;
-  readonly recover_watcher: (a: number, b: number, c: any) => any;
-  readonly destroy_watcher: (a: number, b: number) => any;
-  readonly destroy_recover_watcher: (a: number, b: number) => any;
-  readonly check_watcher: (a: number, b: number) => any;
-  readonly watcher_next_address: (a: number, b: number, c: number, d: number) => any;
-  readonly watcher_next_utxo: (a: number, b: number, c: number, d: number) => any;
-  readonly watcher_unspent_utxos: (a: number, b: number, c: number, d: number) => any;
-  readonly convert_contract_amount_raw: (a: number, b: number, c: number) => [number, number];
-  readonly convert_contract_amount_string: (a: bigint, b: number) => [number, number];
-  readonly parse_contract_amount: (a: number, b: number) => any;
-  readonly parse_contract_amount_precision: (a: number, b: number, c: number) => [number, number];
-  readonly version: () => any;
   readonly get_rgb_version: () => [number, number];
   readonly get_rgb_wallet: (a: number, b: number) => any;
   readonly get_btc_wallet_data: (a: number, b: number) => any;
@@ -201,6 +151,56 @@ export interface InitOutput {
   readonly encode_base64: (a: number, b: number) => [number, number];
   readonly decode_hex: (a: number, b: number) => [number, number, number, number];
   readonly decode_base64: (a: number, b: number) => [number, number, number, number];
+  readonly create_wallet: (a: number, b: number, c: number, d: number) => any;
+  readonly auth: (a: number, b: number, c: number, d: number) => any;
+  readonly ln_create_invoice: (a: number, b: number, c: number, d: number, e: number) => any;
+  readonly get_balance: (a: number, b: number) => any;
+  readonly get_txs: (a: number, b: number) => any;
+  readonly pay_invoice: (a: number, b: number, c: number, d: number) => any;
+  readonly check_payment: (a: number, b: number) => any;
+  readonly swap_btc_ln: (a: number, b: number, c: number, d: number) => any;
+  readonly swap_ln_btc: (a: number, b: number, c: bigint, d: number, e: number) => any;
+  readonly get_network: () => any;
+  readonly switch_network: (a: number, b: number) => any;
+  readonly get_env: (a: number, b: number) => any;
+  readonly set_env: (a: number, b: number, c: number, d: number) => any;
+  readonly sleep: (a: number) => any;
+  readonly fund_rgb_vault: (a: number, b: number, c: number, d: any, e: number, f: number, g: bigint, h: number) => any;
+  readonly transfer_sats: (a: number, b: number, c: number, d: number, e: bigint, f: number, g: any) => any;
+  readonly get_btc_wallet: (a: number, b: number) => any;
+  readonly backup_btc_data: (a: number, b: number) => any;
+  readonly recover_funds_from_bad_wallets: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
+  readonly restore_btc_data: (a: number, b: number) => any;
+  readonly convert_contract_amount_raw: (a: number, b: number, c: number) => [number, number];
+  readonly convert_contract_amount_string: (a: bigint, b: number) => [number, number];
+  readonly parse_contract_amount: (a: number, b: number) => any;
+  readonly parse_contract_amount_precision: (a: number, b: number, c: number) => [number, number];
+  readonly version: () => any;
+  readonly hash_password: (a: number, b: number) => [number, number];
+  readonly new_mnemonic: (a: number, b: number) => any;
+  readonly save_mnemonic: (a: number, b: number, c: number, d: number) => any;
+  readonly decrypt_wallet: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
+  readonly upgrade_wallet: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
+  readonly new_wallet: (a: number, b: number, c: number, d: number) => any;
+  readonly encrypt_wallet: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
+  readonly get_wallet_data: (a: number, b: number, c: number, d: number) => any;
+  readonly sync_wallets: () => any;
+  readonly get_new_address: (a: number, b: number, c: number, d: number) => any;
+  readonly send_sats: (a: number, b: number, c: number, d: number, e: number, f: number, g: bigint, h: number, i: number) => any;
+  readonly fund_vault: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => any;
+  readonly get_assets_vault: (a: number, b: number) => any;
+  readonly drain_wallet: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => any;
+  readonly bump_fee: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => any;
+  readonly psbt_sign_and_publish_file: (a: any) => any;
+  readonly psbt_publish_file: (a: any) => any;
+  readonly create_watcher: (a: number, b: number, c: any) => any;
+  readonly recover_watcher: (a: number, b: number, c: any) => any;
+  readonly destroy_watcher: (a: number, b: number) => any;
+  readonly destroy_recover_watcher: (a: number, b: number) => any;
+  readonly check_watcher: (a: number, b: number) => any;
+  readonly watcher_next_address: (a: number, b: number, c: number, d: number) => any;
+  readonly watcher_next_utxo: (a: number, b: number, c: number, d: number) => any;
+  readonly watcher_unspent_utxos: (a: number, b: number, c: number, d: number) => any;
   readonly new_nostr_pubkey: (a: number, b: number, c: number, d: number) => any;
   readonly update_nostr_pubkey: (a: number, b: number, c: number, d: number) => any;
   readonly rustsecp256k1_v0_9_2_context_create: (a: number) => number;
@@ -228,12 +228,12 @@ export interface InitOutput {
   readonly __wbindgen_free: (a: number, b: number, c: number) => void;
   readonly __wbindgen_export_7: WebAssembly.Table;
   readonly __externref_table_dealloc: (a: number) => void;
-  readonly closure752_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure2732_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure2763_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure1291_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure2752_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure2783_externref_shim: (a: number, b: number, c: any) => void;
   readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h7ceba1bc0c075797: (a: number, b: number) => void;
-  readonly closure3938_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure4230_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure3963_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure4255_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;
 }