@1sat/wallet-toolbox 0.0.74 → 0.0.75

package/dist/api/balance/index.js

@@ -107,8 +107,4 @@ export const getExchangeRate = {
 // Module exports
 // ============================================================================
 /** All balance skills for registry */
-export const balanceSkills = [
-    getBalance,
-    getPaymentUtxos,
-    getExchangeRate,
-];
+export const balanceSkills = [getBalance, getPaymentUtxos, getExchangeRate];

package/dist/api/locks/index.js

@@ -228,6 +228,9 @@ export const unlockBsv = {
             for (let i = 0; i < maturedLocks.length; i++) {
                 const lock = maturedLocks[i];
                 const input = tx.inputs[i];
+                if (!lock.output.lockingScript || !input.sourceTXID) {
+                    return { error: "missing-lock-data" };
+                }
                 const lockingScript = Script.fromHex(lock.output.lockingScript);
                 const preimage = TransactionSignature.format({
                     sourceTXID: input.sourceTXID,

package/dist/api/ordinals/index.js

@@ -175,9 +175,12 @@ export async function buildTransferOrdinals(ctx, request) {
             });
             recipientAddress = PublicKey.fromString(publicKey).toAddress();
         }
-        else {
+        else if (address) {
             recipientAddress = address;
         }
+        else {
+            return { error: "must-provide-counterparty-or-address" };
+        }
         // Preserve important tags from source output
         const tags = [];
         for (const tag of ordinal.tags ?? []) {
@@ -188,7 +191,7 @@ export async function buildTransferOrdinals(ctx, request) {
             }
         }
         const sourceName = extractName(ordinal.customInstructions);
-        inputs.push({
+        inputs?.push({
             outpoint,
             inputDescription: "Ordinal to transfer",
             unlockingScriptLength: 108,
@@ -196,7 +199,7 @@ export async function buildTransferOrdinals(ctx, request) {
         // Only track output in wallet when transferring to a counterparty (wallet can derive keys to spend it)
         // External address transfers are NOT tracked since the wallet cannot spend them
         if (counterparty) {
-            outputs.push({
+            outputs?.push({
                 lockingScript: new P2PKH().lock(recipientAddress).toHex(),
                 satoshis: 1,
                 outputDescription: "Ordinal transfer",
@@ -211,7 +214,7 @@ export async function buildTransferOrdinals(ctx, request) {
         }
         else {
             // External address - output is not tracked in wallet
-            outputs.push({
+            outputs?.push({
                 lockingScript: new P2PKH().lock(recipientAddress).toHex(),
                 satoshis: 1,
                 outputDescription: "Ordinal transfer to external address",
@@ -396,7 +399,7 @@ export const transferOrdinals = {
                 inputs: params.inputs,
                 outputs: params.outputs?.map((o) => ({
                     ...o,
-                    lockingScript: o.lockingScript?.slice(0, 20) + "...",
+                    lockingScript: `${o.lockingScript?.slice(0, 20)}...`,
                 })),
             }, null, 2));
             // Debug: Check if BEEF contains the source transactions

package/dist/api/sweep/index.js

@@ -5,8 +5,7 @@
  */
 import { BSV21 } from "@bopen-io/templates";
 import { P2PKH, PrivateKey, PublicKey, Transaction, Utils, } from "@bsv/sdk";
-import { deriveFundAddress } from "../../indexers";
-import { BSV21_BASKET, BSV21_FEE_SATS, BSV21_PROTOCOL, ONESAT_PROTOCOL, } from "../constants";
+import { BSV21_BASKET, BSV21_PROTOCOL, ONESAT_PROTOCOL } from "../constants";
 export * from "./types";
 /**
  * Prepare sweep inputs from IndexedOutput objects by fetching locking scripts.
@@ -359,19 +358,19 @@ export const sweepOrdinals = {
                 outputs,
                 options: { signAndProcess: false, randomizeOutputs: false },
             };
-            console.log(`[sweepOrdinals] === CREATE ACTION ARGS ===`);
+            console.log("[sweepOrdinals] === CREATE ACTION ARGS ===");
             console.log(`[sweepOrdinals] description: ${createActionArgs.description}`);
             console.log(`[sweepOrdinals] inputBEEF length: ${beefData.length} bytes`);
             console.log(`[sweepOrdinals] inputs count: ${inputDescriptors.length}`);
             console.log(`[sweepOrdinals] outputs count: ${outputs.length}`);
-            console.log(`[sweepOrdinals] inputs:`, JSON.stringify(inputDescriptors, null, 2));
-            console.log(`[sweepOrdinals] outputs:`, JSON.stringify(outputs, null, 2));
-            console.log(`[sweepOrdinals] options:`, JSON.stringify(createActionArgs.options));
-            console.log(`[sweepOrdinals] Calling createAction...`);
+            console.log("[sweepOrdinals] inputs:", JSON.stringify(inputDescriptors, null, 2));
+            console.log("[sweepOrdinals] outputs:", JSON.stringify(outputs, null, 2));
+            console.log("[sweepOrdinals] options:", JSON.stringify(createActionArgs.options));
+            console.log("[sweepOrdinals] Calling createAction...");
             let createResult;
             try {
                 createResult = await ctx.wallet.createAction(createActionArgs);
-                console.log(`[sweepOrdinals] createAction returned:`, JSON.stringify(createResult, (key, value) => {
+                console.log("[sweepOrdinals] createAction returned:", JSON.stringify(createResult, (key, value) => {
                     // Don't stringify large binary data
                     if (key === "tx" && value instanceof Uint8Array)
                         return `<Uint8Array ${value.length} bytes>`;
@@ -381,12 +380,12 @@ export const sweepOrdinals = {
                 }, 2));
             }
             catch (createError) {
-                console.error(`[sweepOrdinals] createAction threw:`, createError);
+                console.error("[sweepOrdinals] createAction threw:", createError);
                 const errorMsg = createError instanceof Error
                     ? createError.message
                     : String(createError);
                 const errorStack = createError instanceof Error ? createError.stack : undefined;
-                console.error(`[sweepOrdinals] Stack:`, errorStack);
+                console.error("[sweepOrdinals] Stack:", errorStack);
                 return { error: `createAction failed: ${errorMsg}` };
             }
             if ("error" in createResult && createResult.error) {
@@ -398,7 +397,7 @@ export const sweepOrdinals = {
             // Sign each input with our external key
             const tx = Transaction.fromBEEF(createResult.signableTransaction.tx);
             // Log transaction structure for debugging
-            console.log(`[sweepOrdinals] === Transaction Structure ===`);
+            console.log("[sweepOrdinals] === Transaction Structure ===");
             console.log(`[sweepOrdinals] Inputs (${tx.inputs.length}):`);
             let totalInputSats = 0;
             for (let i = 0; i < tx.inputs.length; i++) {
@@ -417,7 +416,7 @@ export const sweepOrdinals = {
             }
             console.log(`[sweepOrdinals] Total in: ${totalInputSats}, Total out: ${totalOutputSats}, Fee: ${totalInputSats - totalOutputSats}`);
             console.log(`[sweepOrdinals] Signable tx hex: ${Utils.toHex(createResult.signableTransaction.tx)}`);
-            console.log(`[sweepOrdinals] ==============================`);
+            console.log("[sweepOrdinals] ==============================");
             // Build a set of outpoints we control
             const ourOutpoints = new Set(inputs.map((input) => {
                 const [txid, vout] = input.outpoint.split("_");
@@ -435,12 +434,12 @@ export const sweepOrdinals = {
             await tx.sign();
             // Log signed transaction details for debugging
             const localTxid = tx.id("hex");
-            console.log(`[sweepOrdinals] === LOCAL SIGNED TX ===`);
+            console.log("[sweepOrdinals] === LOCAL SIGNED TX ===");
             console.log(`[sweepOrdinals] Local txid: ${localTxid}`);
             console.log(`[sweepOrdinals] Signed tx hex: ${tx.toHex()}`);
             // Extract unlocking scripts for signAction
             const spends = {};
-            console.log(`[sweepOrdinals] === UNLOCKING SCRIPTS FOR SIGNACTION ===`);
+            console.log("[sweepOrdinals] === UNLOCKING SCRIPTS FOR SIGNACTION ===");
             for (let i = 0; i < tx.inputs.length; i++) {
                 const txInput = tx.inputs[i];
                 const inputOutpoint = `${txInput.sourceTXID}.${txInput.sourceOutputIndex}`;
@@ -463,18 +462,18 @@ export const sweepOrdinals = {
                 return { error: String(signResult.error) };
             }
             // Debug: compare local vs signAction result
-            console.log(`[sweepOrdinals] === SIGN ACTION RESULT ===`);
+            console.log("[sweepOrdinals] === SIGN ACTION RESULT ===");
             console.log(`[sweepOrdinals] signAction txid: ${signResult.txid}`);
             // Log broadcast results if available
             if ("sendWithResults" in signResult) {
-                console.log(`[sweepOrdinals] sendWithResults:`, JSON.stringify(signResult.sendWithResults));
+                console.log("[sweepOrdinals] sendWithResults:", JSON.stringify(signResult.sendWithResults));
             }
             console.log(`[sweepOrdinals] Local txid (partial): ${localTxid}`);
-            console.log(`[sweepOrdinals] Note: TXIDs differ because local is partial (wallet input unsigned)`);
+            console.log("[sweepOrdinals] Note: TXIDs differ because local is partial (wallet input unsigned)");
             if (signResult.tx) {
                 // Parse returned BEEF to show final transaction structure
                 const returnedTx = Transaction.fromBEEF(signResult.tx);
-                console.log(`[sweepOrdinals] === FINAL TX STRUCTURE (broadcast) ===`);
+                console.log("[sweepOrdinals] === FINAL TX STRUCTURE (broadcast) ===");
                 console.log(`[sweepOrdinals] Final inputs (${returnedTx.inputs.length}):`);
                 let returnedInputSats = 0;
                 for (let i = 0; i < returnedTx.inputs.length; i++) {
@@ -501,7 +500,7 @@ export const sweepOrdinals = {
                 const satPerByte = finalFee / txSize;
                 console.log(`[sweepOrdinals] Tx size: ${txSize} bytes, Fee rate: ${satPerByte.toFixed(2)} sat/byte`);
                 if (satPerByte < 0.5) {
-                    console.warn(`[sweepOrdinals] WARNING: Fee rate seems very low!`);
+                    console.warn("[sweepOrdinals] WARNING: Fee rate seems very low!");
                 }
             }
             return {
@@ -583,6 +582,12 @@ export const sweepBsv21 = {
             if (!inputs.every((i) => i.tokenId === tokenId)) {
                 return { error: "mixed-token-ids" };
             }
+            // Lookup token details to verify it's active and get fee info
+            const tokenDetails = await ctx.services.bsv21.getTokenDetails(tokenId);
+            if (!tokenDetails.status.is_active) {
+                return { error: "token-not-active" };
+            }
+            const { fee_address, fee_per_output } = tokenDetails.status;
             // Parse WIF
             const privateKey = PrivateKey.fromWif(wif);
             // Sum all input amounts
@@ -636,11 +641,10 @@ export const sweepBsv21 = {
                     keyID,
                 }),
             });
-            // 2. Fee output (1000 sats) to overlay fund address
-            const fundAddress = deriveFundAddress(tokenId);
+            // 2. Fee output to overlay fund address
             outputs.push({
-                lockingScript: p2pkh.lock(fundAddress).toHex(),
-                satoshis: BSV21_FEE_SATS,
+                lockingScript: p2pkh.lock(fee_address).toHex(),
+                satoshis: fee_per_output,
                 outputDescription: "Overlay processing fee",
                 tags: [],
             });
@@ -698,13 +702,12 @@ export const sweepBsv21 = {
             // Submit to overlay service for indexing
             if (signResult.tx) {
                 try {
-                    const services = ctx.services;
-                    const overlayResult = await services.overlay.submitBsv21(signResult.tx, tokenId);
-                    console.log(`[sweepBsv21] Overlay submission result:`, overlayResult);
+                    const overlayResult = await ctx.services.overlay.submitBsv21(signResult.tx, tokenId);
+                    console.log("[sweepBsv21] Overlay submission result:", overlayResult);
                 }
                 catch (overlayError) {
                     // Log but don't fail the sweep - tx is already broadcast
-                    console.warn(`[sweepBsv21] Overlay submission failed:`, overlayError);
+                    console.warn("[sweepBsv21] Overlay submission failed:", overlayError);
                 }
             }
             return {

package/dist/api/tokens/index.js

@@ -252,9 +252,12 @@ export const sendBsv21 = {
             else if (paymail) {
                 return { error: "paymail-not-yet-implemented" };
             }
-            else {
+            else if (address) {
                 recipientAddress = address;
             }
+            else {
+                return { error: "must-provide-counterparty-or-address" };
+            }
             const outputs = [];
             const p2pkh = new P2PKH();
             const destinationLockingScript = p2pkh.lock(recipientAddress);
@@ -324,12 +327,11 @@ export const sendBsv21 = {
             // Submit to overlay service for indexing
             if (signResult.tx && ctx.services) {
                 try {
-                    const services = ctx.services;
-                    const overlayResult = await services.overlay.submitBsv21(signResult.tx, tokenId);
-                    console.log(`[sendBsv21] Overlay submission result:`, overlayResult);
+                    const overlayResult = await ctx.services.overlay.submitBsv21(signResult.tx, tokenId);
+                    console.log("[sendBsv21] Overlay submission result:", overlayResult);
                 }
                 catch (overlayError) {
-                    console.warn(`[sendBsv21] Overlay submission failed:`, overlayError);
+                    console.warn("[sendBsv21] Overlay submission failed:", overlayError);
                 }
             }
             return {
@@ -488,12 +490,11 @@ export const purchaseBsv21 = {
             // Submit to overlay service for indexing
             if (signResult.tx && ctx.services) {
                 try {
-                    const services = ctx.services;
-                    const overlayResult = await services.overlay.submitBsv21(signResult.tx, tokenId);
-                    console.log(`[purchaseBsv21] Overlay submission result:`, overlayResult);
+                    const overlayResult = await ctx.services.overlay.submitBsv21(signResult.tx, tokenId);
+                    console.log("[purchaseBsv21] Overlay submission result:", overlayResult);
                 }
                 catch (overlayError) {
-                    console.warn(`[purchaseBsv21] Overlay submission failed:`, overlayError);
+                    console.warn("[purchaseBsv21] Overlay submission failed:", overlayError);
                 }
             }
             return {

package/dist/services/OneSatServices.js

@@ -139,7 +139,7 @@ export class OneSatServices {
     }
     async postBeef(beef, txids) {
         console.log("[OneSatServices] postBeef called with txids:", txids);
-        console.log("[OneSatServices] BEEF structure:\n" + beef.toLogString());
+        console.log(`[OneSatServices] BEEF structure:\n${beef.toLogString()}`);
         const results = [];
         for (const txid of txids) {
             try {
@@ -149,7 +149,7 @@ export class OneSatServices {
                 console.log("[OneSatServices] AtomicBEEF length:", atomicBeef.length, "bytes");
                 // Parse back to verify structure
                 const verifyBeef = Beef.fromBinary(atomicBeef);
-                console.log("[OneSatServices] AtomicBEEF parsed back:\n" + verifyBeef.toLogString());
+                console.log(`[OneSatServices] AtomicBEEF parsed back:\n${verifyBeef.toLogString()}`);
                 // TODO: Remove hardcoded callback headers after server testing
                 const status = await this.arcade.submitTransaction(atomicBeef, {
                     callbackUrl: `${this.baseUrl}/1sat/arc/callback`,
@@ -292,10 +292,8 @@ export class OneSatServices {
                 const depth = currentHeight - tx.merklePath.blockHeight + 1;
                 return { txid, status: "mined", depth };
             }
-            else {
-                // No merkle path = known but not yet mined
-                return { txid, status: "known", depth: 0 };
-            }
+            // No merkle path = known but not yet mined
+            return { txid, status: "known", depth: 0 };
         }
         catch {
             // 404 or error from Beef = unknown

package/dist/sync/SyncManager.d.ts

@@ -81,13 +81,13 @@ export interface SyncProcessorOptions {
     indexers?: Indexer[];
 }
 export interface SyncProcessorEvents {
-    "process:start": {};
+    "process:start": Record<string, never>;
     "process:progress": {
         pending: number;
         done: number;
         failed: number;
     };
-    "process:complete": {};
+    "process:complete": Record<string, never>;
     "process:error": {
         message: string;
     };
@@ -161,7 +161,7 @@ export interface SyncEvents {
         done: number;
         failed: number;
     };
-    "sync:complete": {};
+    "sync:complete": Record<string, never>;
     "sync:error": {
         message: string;
     };

package/dist/sync/SyncManager.js

@@ -44,7 +44,7 @@ export class SyncFetcher {
         }
         this.listeners
             .get(event)
-            .add(listener);
+            ?.add(listener);
     }
     off(event, listener) {
         this.listeners
@@ -52,7 +52,9 @@ export class SyncFetcher {
             ?.delete(listener);
     }
     emit(event, data) {
-        this.listeners.get(event)?.forEach((listener) => listener(data));
+        for (const listener of this.listeners.get(event) ?? []) {
+            listener(data);
+        }
     }
     /**
      * Fetch new outputs via SSE and enqueue them.
@@ -161,7 +163,7 @@ export class SyncProcessor {
         }
         this.listeners
             .get(event)
-            .add(listener);
+            ?.add(listener);
     }
     off(event, listener) {
         this.listeners
@@ -169,7 +171,9 @@ export class SyncProcessor {
             ?.delete(listener);
     }
     emit(event, data) {
-        this.listeners.get(event)?.forEach((listener) => listener(data));
+        for (const listener of this.listeners.get(event) ?? []) {
+            listener(data);
+        }
     }
     /**
      * Start processing the queue.
@@ -379,18 +383,16 @@ export class SyncProcessor {
                 },
             };
         }
-        else {
-            // P2PKH-based output - use wallet payment for auto-signing
-            return {
-                outputIndex: vout,
-                protocol: "wallet payment",
-                paymentRemittance: {
-                    derivationPrefix: derivation.derivationPrefix,
-                    derivationSuffix: derivation.derivationSuffix,
-                    senderIdentityKey: derivation.senderIdentityKey,
-                },
-            };
-        }
+        // P2PKH-based output - use wallet payment for auto-signing
+        return {
+            outputIndex: vout,
+            protocol: "wallet payment",
+            paymentRemittance: {
+                derivationPrefix: derivation.derivationPrefix,
+                derivationSuffix: derivation.derivationSuffix,
+                senderIdentityKey: derivation.senderIdentityKey,
+            },
+        };
     }
     collectTags(txo) {
         const tags = [];
@@ -467,7 +469,7 @@ export class SyncManager {
         }
         this.listeners
             .get(event)
-            .add(listener);
+            ?.add(listener);
     }
     off(event, listener) {
         this.listeners
@@ -475,7 +477,9 @@ export class SyncManager {
             ?.delete(listener);
     }
     emit(event, data) {
-        this.listeners.get(event)?.forEach((listener) => listener(data));
+        for (const listener of this.listeners.get(event) ?? []) {
+            listener(data);
+        }
     }
     // ===== Sync Control =====
     /**

package/dist/wallet/factory.js

@@ -73,7 +73,7 @@ export async function createWebWallet(config) {
     const localStorage = new StorageIdb(storageOptions);
     await localStorage.migrate(DEFAULT_DATABASE_NAME, config.storageIdentityKey);
     // 4. Create storage manager with local-only storage initially (empty backups)
-    let storage = new WalletStorageManager(identityPubKey, localStorage, []);
+    const storage = new WalletStorageManager(identityPubKey, localStorage, []);
     await storage.makeAvailable();
     // 5. Create the underlying Wallet FIRST (needed for StorageClient signing)
     const underlyingWallet = new Wallet({
@@ -175,7 +175,7 @@ export async function createWebWallet(config) {
         unprovenAttemptsLimitMain: 144,
     });
     monitor.addDefaultTasks();
-    console.log("[createWebWallet] Monitor created with tasks:", monitor["_tasks"].map((t) => t.name));
+    console.log("[createWebWallet] Monitor created with tasks:", monitor._tasks.map((t) => t.name));
     // 11. Wire up monitor callbacks - sync to remote first, then call user callbacks
     // Note: For delayed broadcasts, the monitor triggers these. For immediate broadcasts,
     // the interception in step 8 handles the sync, but these still fire for the user callback.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/wallet-toolbox",
-  "version": "0.0.74",
+  "version": "0.0.75",
   "description": "BSV wallet library extending @bsv/wallet-toolbox with 1Sat Ordinals protocol support",
   "author": "1Sat Team",
   "license": "MIT",