@anywalletkit/wallet-btc 0.2.2 → 0.2.4

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { B as BtcClient, U as Utxo, a as BlockbookTx, b as BtcConfig, c as BtcTxDescription, d as BtcAddressType, e as BtcNetwork, f as BtcSpend, g as BtcTransferOptions, h as BtcMaxSpendableResult, i as BtcReceipt, j as BtcTransaction } from './history-B5fmsCjZ.cjs';
 export { k as BlockbookAddressPage, l as BlockbookClient, m as BlockbookTxDetails, n as BlockbookVin, o as BlockbookVout, p as BtcChainTx, q as BtcClientConfig, r as BtcHistoryCursor, s as BtcHistoryOptions, t as BtcHistoryPage, u as BtcHistoryRaw, v as BtcHistorySource, w as BtcTxInputDescription, x as BtcTxOutputDescription, y as BtcWarning, C as CAIP2_GENESIS, H as HistoryUnavailableError, z as btcExplorerTxUrl, A as createBtcHistory, D as decodeHistoryCursor, E as encodeHistoryCursor, F as mapBlockbookTx, G as unconfirmedOutgoing } from './history-B5fmsCjZ.cjs';
-import { Signer, IWalletAccountReadOnly, IWalletAccount, TransferResult, WalletManager, FeeRates } from '@anywalletkit/core';
+import { Signer, IWalletAccountReadOnly, IWalletAccount, WriteOptions, TransferResult, WalletManager, FeeRates } from '@anywalletkit/core';
 import { Transaction } from '@scure/btc-signer';
 import { BTC_NETWORK } from '@scure/btc-signer/utils.js';
 
@@ -359,14 +359,14 @@ declare class WalletAccountBtc extends WalletAccountReadOnlyBtc implements IWall
     private describeRaw;
     /** "What you sign": the fully resolved spend (signed, NOT broadcast) or a caller's raw hex. */
     describeTransaction(tx: BtcTransaction): Promise<BtcTxDescription>;
-    /** Sign without broadcasting. Returns the raw transaction hex. Raw hex input is returned unchanged. */
-    signTransaction(tx: BtcTransaction): Promise<string>;
+    /** Sign without broadcasting. Returns the raw transaction hex. Raw hex input gets the checks `sendTransaction` runs (prevouts through the client) and is returned unchanged, never re-signed. */
+    signTransaction(tx: BtcTransaction, options?: WriteOptions): Promise<string>;
     quoteSendTransaction(tx: BtcTransaction): Promise<{
         fee: bigint;
     }>;
-    sendTransaction(tx: BtcTransaction): Promise<TransferResult>;
+    sendTransaction(tx: BtcTransaction, options?: WriteOptions): Promise<TransferResult>;
     /** Native BTC only (`token` is rejected). Subject to `transferMaxFee`. */
-    transfer(o: BtcTransferOptions): Promise<TransferResult>;
+    transfer(o: BtcTransferOptions, writeOptions?: WriteOptions): Promise<TransferResult>;
     /** The same address as a {@link WalletAccountReadOnlyBtc}. */
     toReadOnlyAccount(): IWalletAccountReadOnly;
     dispose(): void;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { B as BtcClient, U as Utxo, a as BlockbookTx, b as BtcConfig, c as BtcTxDescription, d as BtcAddressType, e as BtcNetwork, f as BtcSpend, g as BtcTransferOptions, h as BtcMaxSpendableResult, i as BtcReceipt, j as BtcTransaction } from './history-B5fmsCjZ.js';
 export { k as BlockbookAddressPage, l as BlockbookClient, m as BlockbookTxDetails, n as BlockbookVin, o as BlockbookVout, p as BtcChainTx, q as BtcClientConfig, r as BtcHistoryCursor, s as BtcHistoryOptions, t as BtcHistoryPage, u as BtcHistoryRaw, v as BtcHistorySource, w as BtcTxInputDescription, x as BtcTxOutputDescription, y as BtcWarning, C as CAIP2_GENESIS, H as HistoryUnavailableError, z as btcExplorerTxUrl, A as createBtcHistory, D as decodeHistoryCursor, E as encodeHistoryCursor, F as mapBlockbookTx, G as unconfirmedOutgoing } from './history-B5fmsCjZ.js';
-import { Signer, IWalletAccountReadOnly, IWalletAccount, TransferResult, WalletManager, FeeRates } from '@anywalletkit/core';
+import { Signer, IWalletAccountReadOnly, IWalletAccount, WriteOptions, TransferResult, WalletManager, FeeRates } from '@anywalletkit/core';
 import { Transaction } from '@scure/btc-signer';
 import { BTC_NETWORK } from '@scure/btc-signer/utils.js';
 
@@ -359,14 +359,14 @@ declare class WalletAccountBtc extends WalletAccountReadOnlyBtc implements IWall
     private describeRaw;
     /** "What you sign": the fully resolved spend (signed, NOT broadcast) or a caller's raw hex. */
     describeTransaction(tx: BtcTransaction): Promise<BtcTxDescription>;
-    /** Sign without broadcasting. Returns the raw transaction hex. Raw hex input is returned unchanged. */
-    signTransaction(tx: BtcTransaction): Promise<string>;
+    /** Sign without broadcasting. Returns the raw transaction hex. Raw hex input gets the checks `sendTransaction` runs (prevouts through the client) and is returned unchanged, never re-signed. */
+    signTransaction(tx: BtcTransaction, options?: WriteOptions): Promise<string>;
     quoteSendTransaction(tx: BtcTransaction): Promise<{
         fee: bigint;
     }>;
-    sendTransaction(tx: BtcTransaction): Promise<TransferResult>;
+    sendTransaction(tx: BtcTransaction, options?: WriteOptions): Promise<TransferResult>;
     /** Native BTC only (`token` is rejected). Subject to `transferMaxFee`. */
-    transfer(o: BtcTransferOptions): Promise<TransferResult>;
+    transfer(o: BtcTransferOptions, writeOptions?: WriteOptions): Promise<TransferResult>;
     /** The same address as a {@link WalletAccountReadOnlyBtc}. */
     toReadOnlyAccount(): IWalletAccountReadOnly;
     dispose(): void;

package/dist/index.js

@@ -12,7 +12,7 @@ import {
   isRecord,
   mapBlockbookTx,
   unconfirmedOutgoing
-} from "./chunk-KAAQYL5X.js";
+} from "./chunk-4WUAN3DC.js";
 
 // src/errors.ts
 import { InsufficientFundsError, NetworkError, SignerError } from "@anywalletkit/core";
@@ -374,6 +374,7 @@ var DUST_LIMIT_P2TR = dustLimit("tr");
 var kindOfType = (type) => type === "p2tr" ? "tr" : "wpkh";
 
 // src/describe.ts
+import { bigintToNumber } from "@anywalletkit/core";
 var DEFAULT_MAX_FEE_RATE = 500;
 var RBF_SEQUENCE = 4294967293;
 var FINAL_SEQUENCE = 4294967294;
@@ -408,7 +409,7 @@ function describeTransaction(tx, inputValues, ctx) {
   const fee = inputSum - outputSum;
   const amount = outputs.filter((o) => o.role !== "change").reduce((s, o) => s + o.value, 0n);
   const vsize = vsizeOf(tx);
-  const feeRate = vsize > 0 ? Math.round(Number(fee) / vsize * 100) / 100 : 0;
+  const feeRate = vsize > 0 ? Math.round(bigintToNumber(fee) / vsize * 100) / 100 : 0;
   if (feeRate > (ctx.maxFeeRate ?? DEFAULT_MAX_FEE_RATE)) warnings.add("high-fee-rate");
   if (amount > 0n && fee * 10n > amount) warnings.add("fee-over-10pct-of-amount");
   if (!outputs.some((o) => o.role === "change")) warnings.add("no-change");
@@ -603,7 +604,7 @@ var WalletAccountReadOnlyBtc = class {
 };
 
 // src/account.ts
-import { InsufficientFundsError as InsufficientFundsError4, LocalSigner, SignerError as SignerError2, requireCurve } from "@anywalletkit/core";
+import { InsufficientFundsError as InsufficientFundsError4, LocalSigner, SignerError as SignerError2, feeLimit, requireCurve } from "@anywalletkit/core";
 import { SigHash, Transaction as Transaction2, p2pkh } from "@scure/btc-signer";
 import { schnorr, secp256k1 as secp256k12 } from "@noble/curves/secp256k1.js";
 import { hex as hex2 } from "@scure/base";
@@ -798,19 +799,23 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
     if (typeof tx === "string") return (await this.describeRaw(tx)).desc;
     return (await this.buildSignedTransaction(tx)).desc;
   }
-  /** Sign without broadcasting. Returns the raw transaction hex. Raw hex input is returned unchanged. */
-  async signTransaction(tx) {
+  /** Sign without broadcasting. Returns the raw transaction hex. Raw hex input gets the checks `sendTransaction` runs (prevouts through the client) and is returned unchanged, never re-signed. */
+  async signTransaction(tx, options = {}) {
     this.live();
-    if (typeof tx === "string") return tx;
+    if (typeof tx === "string") {
+      const { desc } = await this.describeRaw(tx);
+      this.checkMax(desc.fee, feeLimit(this._config.transactionMaxFee, options), "transaction");
+      return tx;
+    }
     const { tx: built, fee } = await this.buildSignedTransaction(tx);
-    this.checkMax(fee, this._config.transactionMaxFee, "transaction");
+    this.checkMax(fee, feeLimit(this._config.transactionMaxFee, options), "transaction");
     return built.hex;
   }
   async quoteSendTransaction(tx) {
     if (typeof tx === "string") return { fee: (await this.describeRaw(tx)).desc.fee };
     return super.quoteSendTransaction(tx);
   }
-  async sendTransaction(tx) {
+  async sendTransaction(tx, options = {}) {
     this.live();
     const client = this.requireClient("send transactions");
     let rawHex, hash, fee;
@@ -825,17 +830,17 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
       hash = built.tx.id;
       fee = built.fee;
     }
-    this.checkMax(fee, this._config.transactionMaxFee, "transaction");
+    this.checkMax(fee, feeLimit(this._config.transactionMaxFee, options), "transaction");
     const txid = await client.broadcast(rawHex);
     return { hash: txid || hash, fee };
   }
   /** Native BTC only (`token` is rejected). Subject to `transferMaxFee`. */
-  async transfer(o) {
+  async transfer(o, writeOptions = {}) {
     if (o.token) throw new Error("Tokens are not supported on the bitcoin blockchain.");
     this.live();
     const client = this.requireClient("transfer");
     const built = await this.buildSignedTransaction({ to: o.recipient, value: o.amount });
-    this.checkMax(built.fee, this._config.transferMaxFee, "transfer");
+    this.checkMax(built.fee, feeLimit(this._config.transferMaxFee, writeOptions), "transfer");
     const txid = await client.broadcast(built.tx.hex);
     return { hash: txid || built.tx.id, fee: built.fee };
   }
@@ -872,30 +877,26 @@ var WalletManagerBtc = class extends WalletManager {
     if (cached) return cached;
     const external = this.externalSigner();
     if (external) return this.fromSigner(external, full);
-    const signer = LocalSigner2.leafFromSeed(this.seedBytes(), "secp256k1", full);
-    const account = new WalletAccountBtc(signer, signer.publicKey, full, this._config);
-    this._accounts.set(full, account);
-    return account;
+    return this.cachedAccount(full, () => {
+      const signer = LocalSigner2.leafFromSeed(this.seedBytes(), "secp256k1", full);
+      return new WalletAccountBtc(signer, signer.publicKey, full, this._config);
+    });
   }
   /** Resolve `path` against an injected signer: the signer itself, or a child when it can derive there. */
   async fromSigner(signer, path) {
     this.requireSigner("secp256k1");
-    let leaf = signer;
+    let rel;
     let key = "external";
     if (isSeedSigner(signer)) {
       if (path === signer.path) key = path;
       else if (path.startsWith(`${signer.path}/`)) {
-        leaf = await (signer.deriveLeaf ?? signer.derive).call(signer, path.slice(signer.path.length + 1));
+        rel = path.slice(signer.path.length + 1);
         key = path;
       } else throw new SignerError3(`The injected signer sits at ${signer.path}; it cannot provide ${path}.`);
     } else if (path !== `${this.basePath}/0'/0/0` && path !== "external") {
       throw new SignerError3(`An external signer has one account; ${path} is not derivable from it.`);
     }
-    const cached = this._accounts.get(key);
-    if (cached) return cached;
-    const account = new WalletAccountBtc(leaf, await leaf.getPublicKey(), key, this._config);
-    this._accounts.set(key, account);
-    return account;
+    return this.signerAccount(key, signer, rel, (leaf, publicKey) => new WalletAccountBtc(leaf, publicKey, key, this._config));
   }
   /** A read-only account for any address, with this manager's config. */
   getReadOnlyAccount(address) {