@anywalletkit/wallet-btc 0.3.1 → 0.4.0

package/dist/index.d.cts

@@ -324,6 +324,7 @@ interface Built {
  * ownership) before signing AND before broadcast — also for caller-supplied raw hex.
  */
 declare class WalletAccountBtc extends WalletAccountReadOnlyBtc implements IWalletAccount {
+    #private;
     /** UTXOs, fee rate and tip height come from the network before signing. */
     readonly needsNetwork = true;
     /** Derivation path, or `external` for an external signer. */
@@ -331,8 +332,8 @@ declare class WalletAccountBtc extends WalletAccountReadOnlyBtc implements IWall
     /** Compressed secp256k1 public key. */
     readonly publicKey: Uint8Array;
     readonly addressType: BtcAddressType;
-    /** The signer that holds the key. */
-    readonly signer: Signer;
+    /** What holds the key: `seed`, `key` (one imported key) or `external`. */
+    readonly signerKind: Signer['kind'];
     private _disposed;
     private _readOnly;
     /** `publicKey` is the signer's compressed secp256k1 key (33 bytes); it is needed synchronously for the address. */
@@ -346,20 +347,7 @@ declare class WalletAccountBtc extends WalletAccountReadOnlyBtc implements IWall
     sign(message: string | Uint8Array): Promise<string>;
     /** The x-only internal key and its BIP-86 tweak (no script tree) for taproot key-path spends. */
     private taprootKeys;
-    /**
-     * Sign every input through the signer and attach the witness-ready signature:
-     * p2wpkh → `partialSig` (DER + SIGHASH_ALL), p2tr → `tapKeySig` (64 bytes, DEFAULT).
-     * btc-signer only computes the sighash and assembles the witness; it never sees a key.
-     */
-    private signInputs;
     private ctx;
-    private signPlan;
-    /**
-     * Plan → sign → measure. The plan's fee assumes 72-byte DER signatures; if the
-     * signed vsize somehow needs more, the difference comes out of change (never the
-     * recipient) and the tx is re-signed once.
-     */
-    protected signSpend(spend: BtcSpend): Promise<Built>;
     private checkMax;
     /**
      * BIP-143 (p2wpkh) commits each input's signature to that input's CLAIMED amount

package/dist/index.d.ts

@@ -324,6 +324,7 @@ interface Built {
  * ownership) before signing AND before broadcast — also for caller-supplied raw hex.
  */
 declare class WalletAccountBtc extends WalletAccountReadOnlyBtc implements IWalletAccount {
+    #private;
     /** UTXOs, fee rate and tip height come from the network before signing. */
     readonly needsNetwork = true;
     /** Derivation path, or `external` for an external signer. */
@@ -331,8 +332,8 @@ declare class WalletAccountBtc extends WalletAccountReadOnlyBtc implements IWall
     /** Compressed secp256k1 public key. */
     readonly publicKey: Uint8Array;
     readonly addressType: BtcAddressType;
-    /** The signer that holds the key. */
-    readonly signer: Signer;
+    /** What holds the key: `seed`, `key` (one imported key) or `external`. */
+    readonly signerKind: Signer['kind'];
     private _disposed;
     private _readOnly;
     /** `publicKey` is the signer's compressed secp256k1 key (33 bytes); it is needed synchronously for the address. */
@@ -346,20 +347,7 @@ declare class WalletAccountBtc extends WalletAccountReadOnlyBtc implements IWall
     sign(message: string | Uint8Array): Promise<string>;
     /** The x-only internal key and its BIP-86 tweak (no script tree) for taproot key-path spends. */
     private taprootKeys;
-    /**
-     * Sign every input through the signer and attach the witness-ready signature:
-     * p2wpkh → `partialSig` (DER + SIGHASH_ALL), p2tr → `tapKeySig` (64 bytes, DEFAULT).
-     * btc-signer only computes the sighash and assembles the witness; it never sees a key.
-     */
-    private signInputs;
     private ctx;
-    private signPlan;
-    /**
-     * Plan → sign → measure. The plan's fee assumes 72-byte DER signatures; if the
-     * signed vsize somehow needs more, the difference comes out of change (never the
-     * recipient) and the tx is re-signed once.
-     */
-    protected signSpend(spend: BtcSpend): Promise<Built>;
     private checkMax;
     /**
      * BIP-143 (p2wpkh) commits each input's signature to that input's CLAIMED amount

package/dist/index.js

@@ -658,8 +658,14 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
   /** Compressed secp256k1 public key. */
   publicKey;
   addressType;
-  /** The signer that holds the key. */
-  signer;
+  /**
+   * The signer that holds the key, in a private field: not a property of the account, so no code
+   * the account is handed to (a protocol module, a logger) can reach it and sign around the
+   * account's checks (audit 2026-10-29 A1).
+   */
+  #signer;
+  /** What holds the key: `seed`, `key` (one imported key) or `external`. */
+  signerKind;
   _disposed = false;
   _readOnly;
   /** `publicKey` is the signer's compressed secp256k1 key (33 bytes); it is needed synchronously for the address. */
@@ -667,9 +673,10 @@ 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 = requireCurve(signer, "secp256k1");
+    this.#signer = requireCurve(signer, "secp256k1");
+    this.signerKind = this.#signer.kind;
     const needed = type === "p2tr" ? "schnorr" : "ecdsa";
-    if (!this.signer.schemes.includes(needed)) throw new SignerError2(`A ${type} account needs a signer with the '${needed}' scheme (has: ${this.signer.schemes.join(", ")}).`);
+    if (!this.#signer.schemes.includes(needed)) throw new SignerError2(`A ${type} account needs a signer with the '${needed}' scheme (has: ${this.#signer.schemes.join(", ")}).`);
     this.publicKey = publicKey;
     this.path = path;
   }
@@ -689,7 +696,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
   async sign(message) {
     this.live();
     if (this.addressType === "p2tr") throw new UnsupportedAddressTypeError("BIP-137 message signatures do not exist for taproot accounts (BIP-322 is not implemented).");
-    return signMessageWith(message, this.signer, "p2wpkh");
+    return signMessageWith(message, this.#signer, "p2wpkh");
   }
   /** The x-only internal key and its BIP-86 tweak (no script tree) for taproot key-path spends. */
   taprootKeys() {
@@ -701,13 +708,13 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
    * p2wpkh → `partialSig` (DER + SIGHASH_ALL), p2tr → `tapKeySig` (64 bytes, DEFAULT).
    * btc-signer only computes the sighash and assembles the witness; it never sees a key.
    */
-  async signInputs(tx, values) {
+  async #signInputs(tx, values) {
     if (this.addressType === "p2tr") {
       const { tweak } = this.taprootKeys();
       const scripts = Array.from({ length: tx.inputsLength }, () => this.scriptPubKey);
       for (let i = 0; i < tx.inputsLength; i++) {
         const sighash = tx.preimageWitnessV1(i, scripts, SigHash.DEFAULT, values);
-        const sig = await this.signer.sign(sighash, { scheme: "schnorr", context: "btc-taproot-keypath", tweak });
+        const sig = await this.#signer.sign(sighash, { scheme: "schnorr", context: "btc-taproot-keypath", tweak });
         tx.updateInput(i, { tapKeySig: sig }, true);
       }
       return;
@@ -715,7 +722,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
     const scriptCode = p2pkh(this.publicKey).script;
     for (let i = 0; i < tx.inputsLength; i++) {
       const sighash = tx.preimageWitnessV0(i, scriptCode, SigHash.ALL, values[i]);
-      const rs = await this.signer.sign(sighash, { scheme: "ecdsa", context: "btc-sighash" });
+      const rs = await this.#signer.sign(sighash, { scheme: "ecdsa", context: "btc-sighash" });
       const der = secp256k12.Signature.fromBytes(rs, "compact").toBytes("der");
       const sig = new Uint8Array(der.length + 1);
       sig.set(der, 0);
@@ -726,7 +733,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
   ctx(intended) {
     return { network: this._network, ownAddress: this.address, intended, maxFeeRate: this.maxFeeRate };
   }
-  async signPlan(plan, to, recipientValue, change, lockTime, rbf) {
+  async #signPlan(plan, to, recipientValue, change, lockTime, rbf) {
     const spend = spendInfo(this.publicKey, this._network, this.addressType);
     const tx = new Transaction2({ lockTime });
     const sequence = rbf ? RBF_SEQUENCE : FINAL_SEQUENCE;
@@ -735,7 +742,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
     }
     tx.addOutputAddress(to, recipientValue, this._network);
     if (change > 0n) tx.addOutputAddress(this.address, change, this._network);
-    await this.signInputs(tx, plan.utxos.map((u) => u.value));
+    await this.#signInputs(tx, plan.utxos.map((u) => u.value));
     tx.finalize();
     return tx;
   }
@@ -744,7 +751,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
    * signed vsize somehow needs more, the difference comes out of change (never the
    * recipient) and the tx is re-signed once.
    */
-  async signSpend(spend) {
+  async #signSpend(spend) {
     this.live();
     const plan = await this.planSpend(spend);
     await this.verifyPrevouts(plan.utxos);
@@ -752,7 +759,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
     const rbf = spend.rbf ?? this._config.rbf ?? true;
     let change = plan.change;
     let fee = plan.fee;
-    let tx = await this.signPlan(plan, spend.to, plan.amount, change, lockTime, rbf);
+    let tx = await this.#signPlan(plan, spend.to, plan.amount, change, lockTime, rbf);
     const required = BigInt(tx.vsize) * plan.feeRate;
     if (required > fee) {
       const delta = required - fee;
@@ -765,7 +772,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
         fee = plan.fee + plan.change;
         change = 0n;
       } else fee = required;
-      tx = await this.signPlan(plan, spend.to, plan.amount, change, lockTime, rbf);
+      tx = await this.#signPlan(plan, spend.to, plan.amount, change, lockTime, rbf);
       if (BigInt(tx.vsize) * plan.feeRate > fee) throw new Error("Fee shortfall after output rebalance.");
     }
     const ctx = this.ctx({ to: spend.to, value: plan.amount });
@@ -836,7 +843,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
   /** "What you sign": the fully resolved spend (signed, NOT broadcast) or a caller's raw hex. */
   async describeTransaction(tx) {
     if (typeof tx === "string") return (await this.describeRaw(tx)).desc;
-    return (await this.signSpend(tx)).desc;
+    return (await this.#signSpend(tx)).desc;
   }
   /** 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 = {}) {
@@ -846,7 +853,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
       this.checkMax(desc.fee, feeLimit(this._config.transactionMaxFee, options), "transaction");
       return tx;
     }
-    const { tx: built, fee } = await this.signSpend(tx);
+    const { tx: built, fee } = await this.#signSpend(tx);
     this.checkMax(fee, feeLimit(this._config.transactionMaxFee, options), "transaction");
     return built.hex;
   }
@@ -864,7 +871,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
       hash = parsed.id;
       fee = desc.fee;
     } else {
-      const built = await this.signSpend(tx);
+      const built = await this.#signSpend(tx);
       rawHex = built.tx.hex;
       hash = built.tx.id;
       fee = built.fee;
@@ -877,7 +884,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
     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.signSpend({ to: o.recipient, value: o.amount });
+    const built = await this.#signSpend({ to: o.recipient, value: o.amount });
     this.checkMax(built.fee, feeLimit(this._config.transferMaxFee, writeOptions), "transfer");
     return { hash: await this.broadcast(client, built.tx.hex, built.tx.id), fee: built.fee };
   }
@@ -902,7 +909,7 @@ var WalletAccountBtc = class _WalletAccountBtc extends WalletAccountReadOnlyBtc
   }
   dispose() {
     this._disposed = true;
-    this.signer.dispose();
+    this.#signer.dispose();
   }
 };