@scure/btc-signer 1.5.0 → 1.7.0

package/src/utils.ts

@@ -1,20 +1,24 @@
-import { utils as packedUtils, U32LE } from 'micro-packed';
+import { schnorr, secp256k1 as secp } from '@noble/curves/secp256k1';
 import { ripemd160 } from '@noble/hashes/ripemd160';
 import { sha256 } from '@noble/hashes/sha256';
-import { secp256k1 as secp, schnorr } from '@noble/curves/secp256k1';
+import { utils as packedUtils, U32LE } from 'micro-packed';
 
+export type Hex = string | Uint8Array;
 export type Bytes = Uint8Array;
 const Point = secp.ProjectivePoint;
 const CURVE_ORDER = secp.CURVE.n;
 
-const { isBytes, concatBytes, equalBytes } = packedUtils;
-export { sha256, isBytes, concatBytes, equalBytes };
+const isBytes: (a: unknown) => a is Uint8Array = packedUtils.isBytes;
+const concatBytes: (...arrays: Uint8Array[]) => Uint8Array = packedUtils.concatBytes;
+const equalBytes: (a: Uint8Array, b: Uint8Array) => boolean = packedUtils.equalBytes;
+export { concatBytes, equalBytes, isBytes, sha256 };
 
-export const hash160 = (msg: Bytes) => ripemd160(sha256(msg));
-export const sha256x2 = (...msgs: Bytes[]) => sha256(sha256(concatBytes(...msgs)));
-export const randomPrivateKeyBytes = schnorr.utils.randomPrivateKey;
+export const hash160 = (msg: Uint8Array): Uint8Array => ripemd160(sha256(msg));
+export const sha256x2 = (...msgs: Uint8Array[]): Uint8Array => sha256(sha256(concatBytes(...msgs)));
+export const randomPrivateKeyBytes: () => Uint8Array = schnorr.utils.randomPrivateKey;
 export const pubSchnorr = schnorr.getPublicKey as (priv: string | Uint8Array) => Uint8Array;
-export const pubECDSA = secp.getPublicKey;
+export const pubECDSA: (privateKey: string | Uint8Array, isCompressed?: boolean) => Uint8Array =
+  secp.getPublicKey;
 
 // low-r signature grinding. Used to reduce tx size by 1 byte.
 // noble/secp256k1 does not support the feature: it is not used outside of BTC.
@@ -35,8 +39,8 @@ export function signECDSA(hash: Bytes, privateKey: Bytes, lowR = false): Bytes {
   return sig.toDERRawBytes();
 }
 
-export const signSchnorr = schnorr.sign;
-export const tagSchnorr = schnorr.utils.taggedHash;
+export const signSchnorr: typeof schnorr.sign = schnorr.sign;
+export const tagSchnorr: typeof schnorr.utils.taggedHash = schnorr.utils.taggedHash;
 
 export enum PubT {
   ecdsa,
@@ -65,7 +69,7 @@ export function tapTweak(a: Bytes, b: Bytes): bigint {
   return tn;
 }
 
-export function taprootTweakPrivKey(privKey: Uint8Array, merkleRoot = new Uint8Array()) {
+export function taprootTweakPrivKey(privKey: Bytes, merkleRoot: Bytes = new Uint8Array()): Bytes {
   const u = schnorr.utils;
   const seckey0 = u.bytesToNumberBE(privKey); // seckey0 = int_from_bytes(seckey0)
   const P = Point.fromPrivateKey(seckey0); // P = point_mul(G, seckey0)
@@ -78,7 +82,7 @@ export function taprootTweakPrivKey(privKey: Uint8Array, merkleRoot = new Uint8A
   return u.numberToBytesBE(u.mod(seckey + t, CURVE_ORDER), 32);
 }
 
-export function taprootTweakPubkey(pubKey: Uint8Array, h: Uint8Array): [Uint8Array, number] {
+export function taprootTweakPubkey(pubKey: Bytes, h: Bytes): [Bytes, number] {
   const u = schnorr.utils;
   const t = tapTweak(pubKey, h); // t = int_from_bytes(tagged_hash("TapTweak", pubkey + h))
   const P = u.lift_x(u.bytesToNumberBE(pubKey)); // P = lift_x(int_from_bytes(pubkey))
@@ -93,16 +97,22 @@ export function taprootTweakPubkey(pubKey: Uint8Array, h: Uint8Array): [Uint8Arr
 // It is possible to switch SECP256K1_GENERATOR_POINT with some random point;
 // but it's too complex to prove.
 // Also used by bitcoin-core and bitcoinjs-lib
-export const TAPROOT_UNSPENDABLE_KEY = sha256(Point.BASE.toRawBytes(false));
+export const TAPROOT_UNSPENDABLE_KEY: Bytes = sha256(Point.BASE.toRawBytes(false));
 
-export const NETWORK = {
+export type BTC_NETWORK = {
+  bech32: string;
+  pubKeyHash: number;
+  scriptHash: number;
+  wif: number;
+};
+export const NETWORK: BTC_NETWORK = {
   bech32: 'bc',
   pubKeyHash: 0x00,
   scriptHash: 0x05,
   wif: 0x80,
 };
 
-export const TEST_NETWORK: typeof NETWORK = {
+export const TEST_NETWORK: BTC_NETWORK = {
   bech32: 'tb',
   pubKeyHash: 0x6f,
   scriptHash: 0xc4,
@@ -110,7 +120,7 @@ export const TEST_NETWORK: typeof NETWORK = {
 };
 
 // Exported for tests, internal method
-export function compareBytes(a: Bytes, b: Bytes) {
+export function compareBytes(a: Bytes, b: Bytes): number {
   if (!isBytes(a) || !isBytes(b)) throw new Error(`cmp: wrong type a=${typeof a} b=${typeof b}`);
   // -1 -> a<b, 0 -> a==b, 1 -> a>b
   const len = Math.min(a.length, b.length);

package/src/utxo.ts

@@ -1,25 +1,28 @@
 import { hex } from '@scure/base';
 import * as P from 'micro-packed';
-import { Address, CustomScript, OutScript, checkScript, tapLeafHash } from './payment.js';
+import { Address, type CustomScript, OutScript, checkScript, tapLeafHash } from './payment.js';
 import * as psbt from './psbt.js';
 import { CompactSizeLen, RawOutput, RawTx, RawWitness, Script, VarBytes } from './script.js';
 import {
   DEFAULT_SEQUENCE,
-  TxOpts,
-  inputBeforeSign,
   SignatureHash,
   Transaction,
+  type TxOpts,
+  inputBeforeSign,
 } from './transaction.js'; // circular
 import {
+  type Bytes,
   NETWORK,
-  Bytes,
+  PubT,
+  TAPROOT_UNSPENDABLE_KEY,
   compareBytes,
   equalBytes,
   isBytes,
-  TAPROOT_UNSPENDABLE_KEY,
   sha256,
+  validatePubkey,
 } from './utils.js';
-import { validatePubkey, PubT } from './utils.js';
+
+export type PSBTInputs = psbt.PSBTKeyMapKeys<typeof psbt.PSBTInput>;
 
 // Normalizes input
 export function getPrevOut(input: psbt.TransactionInput): P.UnwrapCoder<typeof RawOutput> {
@@ -34,7 +37,8 @@ export function normalizeInput(
   i: psbt.TransactionInputUpdate,
   cur?: psbt.TransactionInput,
   allowedFields?: (keyof psbt.TransactionInput)[],
-  disableScriptCheck = false
+  disableScriptCheck = false,
+  allowUnknown = false
 ): psbt.TransactionInput {
   let { nonWitnessUtxo, txid } = i;
   // String support for common fields. We usually prefer Uint8Array to avoid errors
@@ -48,11 +52,11 @@ export function normalizeInput(
   if (typeof txid === 'string') txid = hex.decode(txid);
   // TODO: if we have nonWitnessUtxo, we can extract txId from here
   if (txid === undefined) txid = cur?.txid;
-  let res: psbt.PSBTKeyMapKeys<typeof psbt.PSBTInput> = { ...cur, ...i, nonWitnessUtxo, txid };
+  let res: PSBTInputs = { ...cur, ...i, nonWitnessUtxo, txid };
   if (!('nonWitnessUtxo' in i) && res.nonWitnessUtxo === undefined) delete res.nonWitnessUtxo;
   if (res.sequence === undefined) res.sequence = DEFAULT_SEQUENCE;
   if (res.tapMerkleRoot === null) delete res.tapMerkleRoot;
-  res = psbt.mergeKeyMap(psbt.PSBTInput, res, cur, allowedFields);
+  res = psbt.mergeKeyMap(psbt.PSBTInput, res, cur, allowedFields, allowUnknown);
   psbt.PSBTInputCoder.encode(res); // Validates that everything is correct at this point
 
   let prevOut;
@@ -122,9 +126,17 @@ export function getInputType(input: psbt.TransactionInput, allowLegacyWitnessUtx
   }
 }
 
-export const toVsize = (weight: number) => Math.ceil(weight / 4);
+export const toVsize = (weight: number): number => Math.ceil(weight / 4);
 // UTXO Select
-type Output = { address: string; amount: bigint } | { script: Uint8Array; amount: bigint };
+export type Output = { address: string; amount: bigint } | { script: Uint8Array; amount: bigint };
+export type Accumulated =
+  | {
+      indices: number[];
+      fee: bigint | undefined;
+      weight: number;
+      total: bigint;
+    }
+  | undefined;
 type TapLeafScript = psbt.TransactionInput['tapLeafScript'];
 type TB = Parameters<typeof psbt.TaprootControlBlock.encode>[0];
 const encodeTapBlock = (item: TB) => psbt.TaprootControlBlock.encode(item);
@@ -252,7 +264,7 @@ function estimateInput(
 }
 
 // Exported for tests, internal method
-export const _cmpBig = (a: bigint, b: bigint) => {
+export const _cmpBig = (a: bigint, b: bigint): 0 | 1 | -1 => {
   const n = a - b;
   if (n < 0n) return -1;
   else if (n > 0n) return 1;
@@ -330,11 +342,11 @@ export class _Estimator {
   // - change address: can be smaller for segwit
   // - accumExact: ???
   private dust: bigint; // total dust limit (3||opts.dustRelayFeeRate * 182||opts.dust). Default: 546
-  constructor(
-    inputs: psbt.TransactionInputUpdate[],
-    private outputs: Output[],
-    private opts: EstimatorOpts
-  ) {
+  private outputs: Output[];
+  private opts: EstimatorOpts;
+  constructor(inputs: psbt.TransactionInputUpdate[], outputs: Output[], opts: EstimatorOpts) {
+    this.outputs = outputs;
+    this.opts = opts;
     if (typeof opts.feePerByte !== 'bigint')
       throw new Error(
         `Estimator: wrong feePerByte=${
@@ -399,7 +411,13 @@ export class _Estimator {
     }
     const inputKeys = new Set();
     this.normalizedInputs = allInputs.map((i) => {
-      const normalized = normalizeInput(i, undefined, undefined, opts.disableScriptCheck);
+      const normalized = normalizeInput(
+        i,
+        undefined,
+        undefined,
+        opts.disableScriptCheck,
+        opts.allowUnknown
+      );
       inputBeforeSign(normalized); // check fields
       const key = `${hex.encode(normalized.txid!)}:${normalized.index}`;
       if (!opts.allowSameUtxo && inputKeys.has(key))
@@ -442,27 +460,27 @@ export class _Estimator {
   }
 
   // Sort by value instead of amount
-  get biggest() {
+  get biggest(): number[] {
     return this.normalizedInputs
       .map((_i, j) => j)
       .sort((a, b) => _cmpBig(this.normalizedInputs[b].value, this.normalizedInputs[a].value));
   }
-  get smallest() {
+  get smallest(): number[] {
     return this.biggest.reverse();
   }
   // These assume that UTXO array has historical order.
   // Otherwise, we have no way to know which tx is oldest
   // Explorers usually give UTXO in this order.
-  get oldest() {
+  get oldest(): number[] {
     return this.normalizedInputs.map((_i, j) => j);
   }
-  get newest() {
+  get newest(): number[] {
     return this.oldest.reverse();
   }
   // exact - like blackjack from coinselect.
   // exact(biggest) will select one big utxo which is closer to targetValue+dust, if possible.
   // If not, it will accumulate largest utxo until value is close to targetValue+dust.
-  accumulate(indices: number[], exact = false, skipNegative = true, all = false) {
+  accumulate(indices: number[], exact = false, skipNegative = true, all = false): Accumulated {
     // TODO: how to handle change addresses?
     // - cost of input
     // - cost of change output (if input requires change)
@@ -476,10 +494,11 @@ export class _Estimator {
     let num = 0;
     let inputsAmount = 0n;
     const targetAmount = this.amount;
-    const res = [];
+    const res: Set<number> = new Set();
     let fee;
     for (const idx of this.requiredIndices) {
       this.checkInputIdx(idx);
+      if (res.has(idx)) throw new Error('required input encountered multiple times'); // should not happen
       const { estimate, amount } = this.normalizedInputs[idx];
       let newWeight = weight + estimate.weight;
       if (!hasWitnesses && estimate.hasWitnesses) newWeight += 2; // enable witness if needed
@@ -489,13 +508,14 @@ export class _Estimator {
       if (estimate.hasWitnesses) hasWitnesses = true;
       num++;
       inputsAmount += amount;
-      res.push(idx);
+      res.add(idx);
       // inputsAmount is enough to cover cost of tx
       if (!all && targetAmount + fee <= inputsAmount)
-        return { indices: res, fee, weight: totalWeight, total: inputsAmount };
+        return { indices: Array.from(res), fee, weight: totalWeight, total: inputsAmount };
     }
     for (const idx of indices) {
       this.checkInputIdx(idx);
+      if (res.has(idx)) continue; // skip required inputs
       const { estimate, amount, value } = this.normalizedInputs[idx];
       let newWeight = weight + estimate.weight;
       if (!hasWitnesses && estimate.hasWitnesses) newWeight += 2; // enable witness if needed
@@ -511,20 +531,20 @@ export class _Estimator {
       if (estimate.hasWitnesses) hasWitnesses = true;
       num++;
       inputsAmount += amount;
-      res.push(idx);
+      res.add(idx);
       // inputsAmount is enough to cover cost of tx
       if (!all && targetAmount + fee <= inputsAmount)
-        return { indices: res, fee, weight: totalWeight, total: inputsAmount };
+        return { indices: Array.from(res), fee, weight: totalWeight, total: inputsAmount };
     }
     if (all) {
       const newWeight = weight + 4 * CompactSizeLen.encode(num).length;
-      return { indices: res, fee, weight: newWeight, total: inputsAmount };
+      return { indices: Array.from(res), fee, weight: newWeight, total: inputsAmount };
     }
     return undefined;
   }
 
   // Works like coinselect default method
-  default() {
+  default(): Accumulated {
     const { biggest } = this;
     const exact = this.accumulate(biggest, true, false);
     if (exact) return exact;
@@ -602,7 +622,8 @@ export class _Estimator {
       for (const o of outputs)
         tx.addOutput({ ...o, script: getScript(o, this.opts, this.opts.network) });
     }
-    return { ...res, tx };
+    return Object.assign(res, { tx });
+    // return { ...res, tx: tx };
   }
 }
 

package/transaction.d.ts

@@ -1,7 +1,8 @@
 import * as P from 'micro-packed';
-import { CustomScript } from './payment.js';
+import { type CustomScript } from './payment.js';
 import * as psbt from './psbt.js';
-import { Bytes } from './utils.js';
+import * as u from './utils.js';
+import { type Bytes } from './utils.js';
 interface HDKey {
     publicKey: Bytes;
     privateKey: Bytes;
@@ -15,13 +16,10 @@ export declare const PRECISION = 8;
 export declare const DEFAULT_VERSION = 2;
 export declare const DEFAULT_LOCKTIME = 0;
 export declare const DEFAULT_SEQUENCE = 4294967295;
-export declare const Decimal: {
-    encode: (from: bigint) => string;
-    decode: (to: string) => bigint;
-};
+export declare const Decimal: P.Coder<bigint, string>;
 export declare const def: <T>(value: T | undefined, def: T) => T;
 export declare function cloneDeep<T>(obj: T): T;
-export type TxOpts = {
+export interface TxOpts {
     version?: number;
     lockTime?: number;
     PSBTVersion?: number;
@@ -36,7 +34,8 @@ export type TxOpts = {
     allowLegacyWitnessUtxo?: boolean;
     lowR?: boolean;
     customScripts?: CustomScript[];
-};
+    allowUnknown?: boolean;
+}
 /**
  * Internal, exported only for backwards-compat. Use `SigHash` instead.
  * @deprecated
@@ -65,22 +64,7 @@ export type TransactionInputRequired = {
     finalScriptSig: Bytes;
 };
 export declare function inputBeforeSign(i: psbt.TransactionInput): TransactionInputRequired;
-declare function validateOpts(opts: TxOpts): Readonly<{
-    version: number;
-    lockTime: number;
-    PSBTVersion: number;
-    /** @deprecated Use `allowUnknownOutputs` */
-    allowUnknowOutput?: boolean;
-    allowUnknownOutputs?: boolean;
-    /** @deprecated Use `allowUnknownInputs` */
-    allowUnknowInput?: boolean;
-    allowUnknownInputs?: boolean;
-    disableScriptCheck?: boolean;
-    bip174jsCompat?: boolean;
-    allowLegacyWitnessUtxo?: boolean;
-    lowR?: boolean;
-    customScripts?: CustomScript[];
-}>;
+declare function validateOpts(opts: TxOpts): Readonly<TxOpts>;
 export declare class Transaction {
     private global;
     private inputs;
@@ -89,7 +73,7 @@ export declare class Transaction {
     constructor(opts?: TxOpts);
     static fromRaw(raw: Bytes, opts?: TxOpts): Transaction;
     static fromPSBT(psbt_: Bytes, opts?: TxOpts): Transaction;
-    toPSBT(PSBTVersion?: number): Uint8Array;
+    toPSBT(PSBTVersion?: number | undefined): Uint8Array;
     get lockTime(): number;
     get version(): number;
     private inputStatus;
@@ -105,112 +89,18 @@ export declare class Transaction {
     get hash(): string;
     get id(): string;
     private checkInputIdx;
-    getInput(idx: number): psbt.PSBTKeyMapKeys<{
-        readonly nonWitnessUtxo: readonly [0, false, P.CoderType<P.StructInput<{
-            version: number;
-            segwitFlag: boolean | undefined;
-            inputs: P.StructInput<{
-                txid: any;
-                index: any;
-                finalScriptSig: any;
-                sequence: any;
-            }>[];
-            outputs: P.StructInput<{
-                amount: any;
-                script: any;
-            }>[];
-            witnesses: P.Option<Uint8Array[][]>;
-            lockTime: number;
-        }>>, readonly [], readonly [0, 2], false];
-        readonly witnessUtxo: readonly [1, false, P.CoderType<P.StructInput<{
-            amount: bigint;
-            script: Uint8Array;
-        }>>, readonly [], readonly [0, 2], false];
-        readonly partialSig: readonly [2, P.CoderType<Uint8Array>, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly sighashType: readonly [3, false, P.CoderType<number>, readonly [], readonly [0, 2], false];
-        readonly redeemScript: readonly [4, false, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly witnessScript: readonly [5, false, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly bip32Derivation: readonly [6, P.CoderType<Uint8Array>, P.CoderType<P.StructInput<{
-            fingerprint: number;
-            path: number[];
-        }>>, readonly [], readonly [0, 2], false];
-        readonly finalScriptSig: readonly [7, false, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly finalScriptWitness: readonly [8, false, P.CoderType<Uint8Array[]>, readonly [], readonly [0, 2], false];
-        readonly porCommitment: readonly [9, false, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly ripemd160: readonly [10, P.CoderType<Uint8Array>, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly sha256: readonly [11, P.CoderType<Uint8Array>, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly hash160: readonly [12, P.CoderType<Uint8Array>, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly hash256: readonly [13, P.CoderType<Uint8Array>, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly txid: readonly [14, false, P.CoderType<Uint8Array>, readonly [2], readonly [2], true];
-        readonly index: readonly [15, false, P.CoderType<number>, readonly [2], readonly [2], true];
-        readonly sequence: readonly [16, false, P.CoderType<number>, readonly [], readonly [2], true];
-        readonly requiredTimeLocktime: readonly [17, false, P.CoderType<number>, readonly [], readonly [2], false];
-        readonly requiredHeightLocktime: readonly [18, false, P.CoderType<number>, readonly [], readonly [2], false];
-        readonly tapKeySig: readonly [19, false, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly tapScriptSig: readonly [20, P.CoderType<P.StructInput<{
-            pubKey: Uint8Array;
-            leafHash: Uint8Array;
-        }>>, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly tapLeafScript: readonly [21, P.CoderType<P.StructInput<{
-            version: number;
-            internalKey: Uint8Array;
-            merklePath: Uint8Array[];
-        }>>, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly tapBip32Derivation: readonly [22, P.CoderType<Uint8Array>, P.CoderType<P.StructInput<{
-            hashes: Uint8Array[];
-            der: P.StructInput<{
-                fingerprint: any;
-                path: any;
-            }>;
-        }>>, readonly [], readonly [0, 2], false];
-        readonly tapInternalKey: readonly [23, false, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly tapMerkleRoot: readonly [24, false, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly proprietary: readonly [252, P.CoderType<Uint8Array>, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-    }>;
+    getInput(idx: number): psbt.TransactionInput;
     get inputsLength(): number;
     addInput(input: psbt.TransactionInputUpdate, _ignoreSignStatus?: boolean): number;
     updateInput(idx: number, input: psbt.TransactionInputUpdate, _ignoreSignStatus?: boolean): void;
     private checkOutputIdx;
-    getOutput(idx: number): psbt.PSBTKeyMapKeys<{
-        readonly redeemScript: readonly [0, false, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly witnessScript: readonly [1, false, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly bip32Derivation: readonly [2, P.CoderType<Uint8Array>, P.CoderType<P.StructInput<{
-            fingerprint: number;
-            path: number[];
-        }>>, readonly [], readonly [0, 2], false];
-        readonly amount: readonly [3, false, P.CoderType<bigint>, readonly [2], readonly [2], true];
-        readonly script: readonly [4, false, P.CoderType<Uint8Array>, readonly [2], readonly [2], true];
-        readonly tapInternalKey: readonly [5, false, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-        readonly tapTree: readonly [6, false, P.CoderType<P.StructInput<{
-            depth: number;
-            version: number;
-            script: Uint8Array;
-        }>[]>, readonly [], readonly [0, 2], false];
-        readonly tapBip32Derivation: readonly [7, P.CoderType<Uint8Array>, P.CoderType<P.StructInput<{
-            hashes: Uint8Array[];
-            der: P.StructInput<{
-                fingerprint: any;
-                path: any;
-            }>;
-        }>>, readonly [], readonly [0, 2], false];
-        readonly proprietary: readonly [252, P.CoderType<Uint8Array>, P.CoderType<Uint8Array>, readonly [], readonly [0, 2], false];
-    }>;
-    getOutputAddress(idx: number, network?: {
-        bech32: string;
-        pubKeyHash: number;
-        scriptHash: number;
-        wif: number;
-    }): string | undefined;
+    getOutput(idx: number): psbt.TransactionOutput;
+    getOutputAddress(idx: number, network?: u.BTC_NETWORK): string | undefined;
     get outputsLength(): number;
     private normalizeOutput;
     addOutput(o: psbt.TransactionOutputUpdate, _ignoreSignStatus?: boolean): number;
     updateOutput(idx: number, output: psbt.TransactionOutputUpdate, _ignoreSignStatus?: boolean): void;
-    addOutputAddress(address: string, amount: bigint, network?: {
-        bech32: string;
-        pubKeyHash: number;
-        scriptHash: number;
-        wif: number;
-    }): number;
+    addOutputAddress(address: string, amount: bigint, network?: u.BTC_NETWORK): number;
     get fee(): bigint;
     private preimageLegacy;
     preimageWitnessV0(idx: number, prevOutScript: Bytes, hashType: number, amount: bigint): Uint8Array;

package/transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["src/transaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["src/transaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,EAAW,KAAK,YAAY,EAAuC,MAAM,cAAc,CAAC;AAC/F,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAUlC,OAAO,KAAK,CAAC,MAAM,YAAY,CAAC;AAChC,OAAO,EAAE,KAAK,KAAK,EAA6C,MAAM,YAAY,CAAC;AAUnF,UAAU,KAAK;IACb,SAAS,EAAE,KAAK,CAAC;IACjB,UAAU,EAAE,KAAK,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAC5B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC;IAClC,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK,CAAC;CAC1B;AAED,MAAM,MAAM,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;AAEnC,eAAO,MAAM,SAAS,IAAI,CAAC;AAC3B,eAAO,MAAM,eAAe,IAAI,CAAC;AACjC,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,gBAAgB,aAAa,CAAC;AAC3C,eAAO,MAAM,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAA+B,CAAC;AAG5E,eAAO,MAAM,GAAG,GAAI,CAAC,EAAE,OAAO,CAAC,GAAG,SAAS,EAAE,KAAK,CAAC,KAAG,CAAwC,CAAC;AAE/F,wBAAgB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAetC;AAID,MAAM,WAAW,MAAM;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,4CAA4C;IAC5C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,2CAA2C;IAC3C,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAG7B,cAAc,CAAC,EAAE,OAAO,CAAC;IAGzB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAE/B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;GAGG;AACH,oBAAY,aAAa;IACvB,OAAO,IAAA;IACP,GAAG,IAAA;IACH,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,YAAY,MAAO;CACpB;AAED,oBAAY,OAAO;IACjB,OAAO,IAAwB;IAC/B,GAAG,IAAoB;IACvB,IAAI,IAAqB;IACzB,MAAM,IAAuB;IAC7B,oBAAoB,MAAqD;IACzE,gBAAgB,MAAiD;IACjE,iBAAiB,MAAkD;IACnE,mBAAmB,MAAoD;CACxE;AAgBD,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,KAAK,CAAC;CACvB,CAAC;AAUF,wBAAgB,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,gBAAgB,GAAG,wBAAwB,CASlF;AA0BD,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAqDpD;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAmD;IACjE,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,OAAO,CAAgC;IAC/C,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;gBACnC,IAAI,GAAE,MAAW;IAQ7B,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,GAAE,MAAW,GAAG,WAAW;IAa1D,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,GAAE,MAAW,GAAG,WAAW;IAmC7D,MAAM,CAAC,WAAW,GAAE,MAAM,GAAG,SAAiC,GAAG,UAAU;IAyD3E,IAAI,QAAQ,IAAI,MAAM,CAkBrB;IAED,IAAI,OAAO,IAAI,MAAM,CAIpB;IAED,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,UAAU;IAwBlB,IAAI,OAAO,IAAI,OAAO,CAIrB;IAGD,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED,IAAI,MAAM,IAAI,MAAM,CAgBnB;IACD,IAAI,KAAK,IAAI,MAAM,CAElB;IACD,OAAO,CAAC,aAAa,UAAQ,EAAE,WAAW,UAAQ,GAAG,UAAU;IAa/D,IAAI,UAAU,IAAI,KAAK,CAEtB;IACD,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;IACD,IAAI,EAAE,IAAI,MAAM,CAGf;IAED,OAAO,CAAC,aAAa;IAIrB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC,gBAAgB;IAI5C,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,iBAAiB,UAAQ,GAAG,MAAM;IAM/E,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,iBAAiB,UAAQ,GAAG,IAAI;IAiB7F,OAAO,CAAC,cAAc;IAItB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC,iBAAiB;IAI9C,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,CAAC,CAAC,WAAqB,GAAG,MAAM,GAAG,SAAS;IAMnF,IAAI,aAAa,IAAI,MAAM,CAE1B;IACD,OAAO,CAAC,eAAe;IA6BvB,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,uBAAuB,EAAE,iBAAiB,UAAQ,GAAG,MAAM;IAM7E,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,iBAAiB,UAAQ,GAAG,IAAI;IAUhG,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,CAAC,CAAC,WAAqB,GAAG,MAAM;IAI3F,IAAI,GAAG,IAAI,MAAM,CAUhB;IAMD,OAAO,CAAC,cAAc;IAmCtB,iBAAiB,CACf,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,KAAK,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,UAAU;IA6Bb,iBAAiB,CACf,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,KAAK,EAAE,EACtB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EAAE,EAChB,aAAa,SAAK,EAClB,UAAU,CAAC,EAAE,KAAK,EAClB,OAAO,SAAO,EACd,KAAK,CAAC,EAAE,KAAK,GACZ,UAAU;IA+Cb,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,EAAE,KAAK,GAAG,OAAO;IAqJ/F,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM;IAW7E,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAqJ9B,QAAQ,IAAI,IAAI;IAGhB,OAAO,IAAI,UAAU;IAMrB,OAAO,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAgCjC,KAAK,IAAI,WAAW;CAIrB;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAMjD;AAID,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAehD"}

package/transaction.js

@@ -5,14 +5,13 @@ exports.cloneDeep = cloneDeep;
 exports.inputBeforeSign = inputBeforeSign;
 exports.PSBTCombine = PSBTCombine;
 exports.bip32Path = bip32Path;
-const P = require("micro-packed");
 const base_1 = require("@scure/base");
+const P = require("micro-packed");
 const payment_js_1 = require("./payment.js");
 const psbt = require("./psbt.js"); // circular
 const script_js_1 = require("./script.js");
-const script_js_2 = require("./script.js");
-const utils_js_1 = require("./utils.js");
 const u = require("./utils.js");
+const utils_js_1 = require("./utils.js");
 const utxo_js_1 = require("./utxo.js"); // circular
 const EMPTY32 = new Uint8Array(32);
 const EMPTY_OUTPUT = {
@@ -129,7 +128,7 @@ function validateOpts(opts) {
     if (typeof _opts.allowUnknowOutput !== 'undefined')
         opts.allowUnknownOutputs = _opts.allowUnknowOutput;
     // 0 and -1 happens in tests
-    if (![-1, 0, 1, 2].includes(_opts.version))
+    if (![-1, 0, 1, 2, 3].includes(_opts.version))
         throw new Error(`Unknown version: ${_opts.version}`);
     if (typeof _opts.lockTime !== 'number')
         throw new Error('Transaction lock time should be number');
@@ -180,7 +179,7 @@ class Transaction {
     }
     // Import
     static fromRaw(raw, opts = {}) {
-        const parsed = script_js_2.RawTx.decode(raw);
+        const parsed = script_js_1.RawTx.decode(raw);
         const tx = new Transaction({ ...opts, version: parsed.version, lockTime: parsed.lockTime });
         for (const o of parsed.outputs)
             tx.addOutput(o);
@@ -258,7 +257,7 @@ class Transaction {
             - Parsing of PSBTv0 depends on unsignedTx (it looks for input count here)
             - BIP-174 requires old serialization format (without witnesses) inside global, which solves this
             */
-            global.unsignedTx = script_js_2.RawOldTx.decode(script_js_2.RawOldTx.encode({
+            global.unsignedTx = script_js_1.RawOldTx.decode(script_js_1.RawOldTx.encode({
                 version: this.version,
                 lockTime: this.lockTime,
                 inputs: this.inputs.map(inputBeforeSign).map((i) => ({
@@ -413,7 +412,7 @@ class Transaction {
         for (const i of this.inputs) {
             out += 160 + 4 * script_js_1.VarBytes.encode(i.finalScriptSig || P.EMPTY).length;
             if (this.hasWitnesses && i.finalScriptWitness)
-                out += script_js_2.RawWitness.encode(i.finalScriptWitness).length;
+                out += script_js_1.RawWitness.encode(i.finalScriptWitness).length;
         }
         return out;
     }
@@ -421,7 +420,7 @@ class Transaction {
         return (0, utxo_js_1.toVsize)(this.weight);
     }
     toBytes(withScriptSig = false, withWitness = false) {
-        return script_js_2.RawTx.encode({
+        return script_js_1.RawTx.encode({
             version: this.version,
             lockTime: this.lockTime,
             inputs: this.inputs.map(inputBeforeSign).map((i) => ({
@@ -476,7 +475,7 @@ class Transaction {
             if (!status.addInput || status.inputs.includes(idx))
                 allowedFields = psbt.PSBTInputUnsignedKeys;
         }
-        this.inputs[idx] = (0, utxo_js_1.normalizeInput)(input, this.inputs[idx], allowedFields, this.opts.disableScriptCheck);
+        this.inputs[idx] = (0, utxo_js_1.normalizeInput)(input, this.inputs[idx], allowedFields, this.opts.disableScriptCheck, this.opts.allowUnknown);
     }
     // Output stuff
     checkOutputIdx(idx) {
@@ -509,7 +508,7 @@ class Transaction {
         let res = { ...cur, ...o, amount, script };
         if (res.amount === undefined)
             delete res.amount;
-        res = psbt.mergeKeyMap(psbt.PSBTOutput, res, cur, allowedFields);
+        res = psbt.mergeKeyMap(psbt.PSBTOutput, res, cur, allowedFields, this.opts.allowUnknown);
         psbt.PSBTOutputCoder.encode(res);
         if (res.script &&
             !this.opts.allowUnknownOutputs &&
@@ -584,7 +583,7 @@ class Transaction {
         else if (isSingle) {
             outputs = outputs.slice(0, idx).fill(EMPTY_OUTPUT).concat([outputs[idx]]);
         }
-        const tmpTx = script_js_2.RawTx.encode({
+        const tmpTx = script_js_1.RawTx.encode({
             lockTime: this.lockTime,
             version: this.version,
             segwitFlag: false,
@@ -605,10 +604,10 @@ class Transaction {
         if (!isAny && !isSingle && !isNone)
             sequenceHash = u.sha256x2(...inputs.map((i) => P.U32LE.encode(i.sequence)));
         if (!isSingle && !isNone) {
-            outputHash = u.sha256x2(...outputs.map(script_js_2.RawOutput.encode));
+            outputHash = u.sha256x2(...outputs.map(script_js_1.RawOutput.encode));
         }
         else if (isSingle && idx < outputs.length)
-            outputHash = u.sha256x2(script_js_2.RawOutput.encode(outputs[idx]));
+            outputHash = u.sha256x2(script_js_1.RawOutput.encode(outputs[idx]));
         const input = inputs[idx];
         return u.sha256x2(P.I32LE.encode(this.version), inputHash, sequenceHash, P.bytes(32, true).encode(input.txid), P.U32LE.encode(input.index), script_js_1.VarBytes.encode(prevOutScript), P.U64LE.encode(amount), P.U32LE.encode(input.sequence), outputHash, P.U32LE.encode(this.lockTime), P.U32LE.encode(hashType));
     }
@@ -636,7 +635,7 @@ class Transaction {
             ].map((i) => u.sha256((0, utils_js_1.concatBytes)(...i))));
         }
         if (outType === SignatureHash.ALL) {
-            out.push(u.sha256((0, utils_js_1.concatBytes)(...outputs.map(script_js_2.RawOutput.encode))));
+            out.push(u.sha256((0, utils_js_1.concatBytes)(...outputs.map(script_js_1.RawOutput.encode))));
         }
         const spendType = (annex ? 1 : 0) | (leafScript ? 2 : 0);
         out.push(new Uint8Array([spendType]));
@@ -649,7 +648,7 @@ class Transaction {
         if (spendType & 1)
             out.push(u.sha256(script_js_1.VarBytes.encode(annex || P.EMPTY)));
         if (outType === SignatureHash.SINGLE)
-            out.push(idx < outputs.length ? u.sha256(script_js_2.RawOutput.encode(outputs[idx])) : EMPTY32);
+            out.push(idx < outputs.length ? u.sha256(script_js_1.RawOutput.encode(outputs[idx])) : EMPTY32);
         if (leafScript)
             out.push((0, payment_js_1.tapLeafHash)(leafScript, leafVer), P.U8.encode(0), P.I32LE.encode(codeSeparator));
         return u.tagSchnorr('TapSighash', ...out);
@@ -996,13 +995,13 @@ class Transaction {
                 throw new Error(`Transaction/combine: different ${k} length this=${this[k].length} other=${other[k].length}`);
             }
         }
-        const thisUnsigned = this.global.unsignedTx ? script_js_2.RawOldTx.encode(this.global.unsignedTx) : P.EMPTY;
+        const thisUnsigned = this.global.unsignedTx ? script_js_1.RawOldTx.encode(this.global.unsignedTx) : P.EMPTY;
         const otherUnsigned = other.global.unsignedTx
-            ? script_js_2.RawOldTx.encode(other.global.unsignedTx)
+            ? script_js_1.RawOldTx.encode(other.global.unsignedTx)
             : P.EMPTY;
         if (!(0, utils_js_1.equalBytes)(thisUnsigned, otherUnsigned))
             throw new Error(`Transaction/combine: different unsigned tx`);
-        this.global = psbt.mergeKeyMap(psbt.PSBTGlobal, this.global, other.global);
+        this.global = psbt.mergeKeyMap(psbt.PSBTGlobal, this.global, other.global, undefined, this.opts.allowUnknown);
         for (let i = 0; i < this.inputs.length; i++)
             this.updateInput(i, other.inputs[i], true);
         for (let i = 0; i < this.outputs.length; i++)