@anywalletkit/wallet-btc 0.2.2 → 0.2.4

package/dist/index.cjs

@@ -588,6 +588,7 @@ var DUST_LIMIT_P2TR = dustLimit("tr");
 var kindOfType = (type) => type === "p2tr" ? "tr" : "wpkh";
 
 // src/describe.ts
+var import_core7 = require("@anywalletkit/core");
 var DEFAULT_MAX_FEE_RATE = 500;
 var RBF_SEQUENCE = 4294967293;
 var FINAL_SEQUENCE = 4294967294;
@@ -622,7 +623,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((0, import_core7.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");
@@ -668,7 +669,7 @@ var coinType = (network) => network === "bitcoin" ? 0 : 1;
 var purposeFor = (type) => type === "p2tr" ? 86 : 84;
 
 // src/read-only-account.ts
-var import_core7 = require("@anywalletkit/core");
+var import_core8 = require("@anywalletkit/core");
 var toBig = (v) => typeof v === "bigint" ? v : BigInt(Math.round(Number(v)));
 var WalletAccountReadOnlyBtc = class {
   /** The address. */
@@ -700,7 +701,7 @@ var WalletAccountReadOnlyBtc = class {
     this._client = createClient(config);
   }
   requireClient(what) {
-    if (!this._client) throw new import_core7.NetworkError(`The wallet must be connected to a client to ${what}.`);
+    if (!this._client) throw new import_core8.NetworkError(`The wallet must be connected to a client to ${what}.`);
     return this._client;
   }
   /** Fee-rate ceiling in sat/vB: `BtcConfig.maxFeeRate` or {@link DEFAULT_MAX_FEE_RATE}. */
@@ -742,7 +743,7 @@ var WalletAccountReadOnlyBtc = class {
     const inputWeight = this.inputWeight();
     const feeRate = await this.resolveFeeRate(spend);
     const utxos = await this.requireClient("plan a spend").listUnspent(this.address);
-    if (utxos.length === 0) throw new import_core7.InsufficientFundsError(amount, 0n, "BTC");
+    if (utxos.length === 0) throw new import_core8.InsufficientFundsError(amount, 0n, "BTC");
     const own = kindOfType(this.addressType);
     const selection = selectCoins({
       utxos,
@@ -817,7 +818,7 @@ var WalletAccountReadOnlyBtc = class {
 };
 
 // src/account.ts
-var import_core8 = require("@anywalletkit/core");
+var import_core9 = require("@anywalletkit/core");
 var import_btc_signer4 = require("@scure/btc-signer");
 var import_secp256k12 = require("@noble/curves/secp256k1.js");
 var import_base3 = require("@scure/base");
@@ -841,15 +842,15 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
     const type = config.addressType ?? "p2wpkh";
     super(addressFromPublicKey(publicKey, networkParams(config.network ?? "bitcoin"), type), config);
     this.addressType = type;
-    this.signer = (0, import_core8.requireCurve)(signer, "secp256k1");
+    this.signer = (0, import_core9.requireCurve)(signer, "secp256k1");
     const needed = type === "p2tr" ? "schnorr" : "ecdsa";
-    if (!this.signer.schemes.includes(needed)) throw new import_core8.SignerError(`A ${type} account needs a signer with the '${needed}' scheme (has: ${this.signer.schemes.join(", ")}).`);
+    if (!this.signer.schemes.includes(needed)) throw new import_core9.SignerError(`A ${type} account needs a signer with the '${needed}' scheme (has: ${this.signer.schemes.join(", ")}).`);
     this.publicKey = publicKey;
     this.path = path;
   }
   /** Back-compat: wrap a raw derived key in a {@link LocalSigner} (the account takes ownership; it cannot derive). */
   static fromPrivateKey(privateKey, publicKey, path, config = {}) {
-    return new _WalletAccountBtc(import_core8.LocalSigner.fromPrivateKey("secp256k1", privateKey, publicKey, path), publicKey, path, config);
+    return new _WalletAccountBtc(import_core9.LocalSigner.fromPrivateKey("secp256k1", privateKey, publicKey, path), publicKey, path, config);
   }
   /** Account index for the standard m/{84|86}'/{0|1}'/0'/0/i path. */
   get index() {
@@ -857,7 +858,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
     return m ? Number(m[1]) : void 0;
   }
   live() {
-    if (this._disposed) throw new import_core8.SignerError("This account has been disposed.");
+    if (this._disposed) throw new import_core9.SignerError("This account has been disposed.");
   }
   /** BIP-137 p2wpkh signature, base64 (Electrum / Bitcoin Core encoding). Not available for taproot accounts. */
   async sign(message) {
@@ -932,7 +933,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
       const delta = required - fee;
       if (change === 0n) {
         const have = plan.utxos.reduce((s, u) => s + u.value, 0n);
-        throw new import_core8.InsufficientFundsError(plan.amount + required, have, "BTC");
+        throw new import_core9.InsufficientFundsError(plan.amount + required, have, "BTC");
       }
       change = change - delta;
       if (change < this.dustLimit) {
@@ -1012,19 +1013,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, (0, import_core9.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, (0, import_core9.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;
@@ -1039,17 +1044,17 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
       hash = built.tx.id;
       fee = built.fee;
     }
-    this.checkMax(fee, this._config.transactionMaxFee, "transaction");
+    this.checkMax(fee, (0, import_core9.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, (0, import_core9.feeLimit)(this._config.transferMaxFee, writeOptions), "transfer");
     const txid = await client.broadcast(built.tx.hex);
     return { hash: txid || built.tx.id, fee: built.fee };
   }
@@ -1065,8 +1070,8 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
 };
 
 // src/manager.ts
-var import_core9 = require("@anywalletkit/core");
-var WalletManagerBtc = class extends import_core9.WalletManager {
+var import_core10 = require("@anywalletkit/core");
+var WalletManagerBtc = class extends import_core10.WalletManager {
   constructor(seedOrSigner, config = {}) {
     super(seedOrSigner, config);
   }
@@ -1086,30 +1091,26 @@ var WalletManagerBtc = class extends import_core9.WalletManager {
     if (cached) return cached;
     const external = this.externalSigner();
     if (external) return this.fromSigner(external, full);
-    const signer = import_core9.LocalSigner.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 = import_core10.LocalSigner.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 ((0, import_core9.isSeedSigner)(signer)) {
+    if ((0, import_core10.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 import_core9.SignerError(`The injected signer sits at ${signer.path}; it cannot provide ${path}.`);
+      } else throw new import_core10.SignerError(`The injected signer sits at ${signer.path}; it cannot provide ${path}.`);
     } else if (path !== `${this.basePath}/0'/0/0` && path !== "external") {
-      throw new import_core9.SignerError(`An external signer has one account; ${path} is not derivable from it.`);
+      throw new import_core10.SignerError(`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) {
@@ -1251,7 +1252,7 @@ function createBtcHistory(options = {}) {
       const pageNo = cursor?.p ?? 1;
       const data = await failover((c) => c.getAddressPage(address, pageNo, pageSize));
       let items = (data.transactions ?? []).map((tx) => mapBlockbookTx(chain, address, tx));
-      items.sort((a, b) => (b.block === void 0 ? 1 : a.block === void 0 ? -1 : Number(b.block - a.block)) || b.time - a.time);
+      items.sort((a, b) => (b.block === void 0 ? 1 : a.block === void 0 ? -1 : b.block > a.block ? 1 : b.block < a.block ? -1 : 0) || b.time - a.time);
       const totalPages = data.totalPages ?? 1;
       let more = pageNo < totalPages;
       if (query.since !== void 0) {