@btc-vision/bitcoin 6.4.5 → 6.4.7

package/browser/psbt.d.ts

@@ -43,6 +43,7 @@ export declare class Psbt {
     clone(): Psbt;
     setMaximumFeeRate(satoshiPerByte: number): void;
     setVersion(version: number): this;
+    setVersionTRUC(): this;
     setLocktime(locktime: number): this;
     setInputSequence(inputIndex: number, sequence: number): this;
     addInputs(inputDatas: PsbtInputExtended[], checkPartialSigs?: boolean): this;
@@ -98,6 +99,7 @@ export declare class Psbt {
 export interface PsbtOptsOptional {
     network?: Network;
     maximumFeeRate?: number;
+    version?: 1 | 2 | 3;
 }
 export interface PsbtOpts {
     network: Network;
@@ -155,11 +157,11 @@ type FinalScriptsFunc = (inputIndex: number, input: PsbtInput, script: Buffer, i
 type FinalTaprootScriptsFunc = (inputIndex: number, input: PsbtInput, tapLeafHashToFinalize?: Buffer) => {
     finalScriptWitness: Buffer | undefined;
 };
-export declare function getFinalScripts(inputIndex: number, input: PsbtInput, script: Buffer, isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean, canRunChecks?: boolean): {
+export declare function getFinalScripts(inputIndex: number, input: PsbtInput, script: Buffer, isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean, canRunChecks?: boolean, solution?: Buffer[]): {
     finalScriptSig: Buffer | undefined;
     finalScriptWitness: Buffer | undefined;
 };
-export declare function prepareFinalScripts(script: Buffer, scriptType: string, partialSig: PartialSig[], isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean): {
+export declare function prepareFinalScripts(script: Buffer, scriptType: string, partialSig: PartialSig[], isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean, solution?: Buffer[]): {
     finalScriptSig: Buffer | undefined;
     finalScriptWitness: Buffer | undefined;
 };

package/browser/transaction.d.ts

@@ -20,6 +20,9 @@ export declare class Transaction {
     static readonly SIGHASH_INPUT_MASK = 128;
     static readonly ADVANCED_TRANSACTION_MARKER = 0;
     static readonly ADVANCED_TRANSACTION_FLAG = 1;
+    static readonly TRUC_VERSION = 3;
+    static readonly TRUC_MAX_VSIZE = 10000;
+    static readonly TRUC_CHILD_MAX_VSIZE = 1000;
     version: number;
     locktime: number;
     ins: Input[];

package/build/address.d.ts

@@ -8,7 +8,16 @@ export interface Bech32Result {
     prefix: string;
     data: Buffer;
 }
+export declare const FUTURE_SEGWIT_MAX_SIZE: number;
+export declare const FUTURE_SEGWIT_MIN_SIZE: number;
+export declare const FUTURE_SEGWIT_MAX_VERSION: number;
+export declare const FUTURE_MAX_VERSION: number;
+export declare const FUTURE_OPNET_VERSION: number;
+export declare const FUTURE_SEGWIT_MIN_VERSION: number;
+export declare const FUTURE_SEGWIT_VERSION_DIFF: number;
+export declare const isUnknownSegwitVersion: (output: Buffer) => boolean;
 export declare function toFutureOPNetAddress(output: Buffer, network: Network): string;
+export declare function _toFutureSegwitAddress(output: Buffer, network: Network): string;
 export declare function fromBase58Check(address: string): Base58CheckResult;
 export declare function fromBech32(address: string): Bech32Result;
 export declare function toBase58Check(hash: Buffer, version: number): string;

package/build/address.js

@@ -4,17 +4,34 @@ import { opcodes, payments } from './index.js';
 import * as networks from './networks.js';
 import * as bscript from './script.js';
 import { Hash160bit, tuple, typeforce, UInt8 } from './types.js';
-const FUTURE_SEGWIT_MAX_SIZE = 40;
-const FUTURE_SEGWIT_MIN_SIZE = 2;
-const FUTURE_SEGWIT_MAX_VERSION = 15;
-const FUTURE_MAX_VERSION = 16;
-const FUTURE_OPNET_VERSION = 16;
-const FUTURE_SEGWIT_MIN_VERSION = 2;
-const FUTURE_SEGWIT_VERSION_DIFF = 0x50;
+export const FUTURE_SEGWIT_MAX_SIZE = 40;
+export const FUTURE_SEGWIT_MIN_SIZE = 2;
+export const FUTURE_SEGWIT_MAX_VERSION = 15;
+export const FUTURE_MAX_VERSION = 16;
+export const FUTURE_OPNET_VERSION = 16;
+export const FUTURE_SEGWIT_MIN_VERSION = 2;
+export const FUTURE_SEGWIT_VERSION_DIFF = 0x50;
 const FUTURE_SEGWIT_VERSION_WARNING = 'WARNING: Sending to a future segwit version address can lead to loss of funds. ' +
     'End users MUST be warned carefully in the GUI and asked if they wish to proceed ' +
     'with caution. Wallets should verify the segwit version from the output of fromBech32, ' +
     'then decide when it is safe to use which version of segwit.';
+export const isUnknownSegwitVersion = (output) => {
+    try {
+        const data = output.subarray(2);
+        if (data.length < FUTURE_SEGWIT_MIN_SIZE || data.length > FUTURE_SEGWIT_MAX_SIZE) {
+            throw new TypeError('Invalid program length for segwit address');
+        }
+        const version = output[0] - FUTURE_SEGWIT_VERSION_DIFF;
+        if (version < FUTURE_SEGWIT_MIN_VERSION || version > FUTURE_SEGWIT_MAX_VERSION + 1) {
+            throw new TypeError('Invalid version for segwit address');
+        }
+        if (version === 1)
+            throw new TypeError('taproot');
+        return true;
+    }
+    catch (e) { }
+    return false;
+};
 export function toFutureOPNetAddress(output, network) {
     if (!Buffer.isBuffer(output))
         throw new TypeError('output must be a Buffer');
@@ -46,7 +63,7 @@ export function toFutureOPNetAddress(output, network) {
     const words = [version, ...bech32m.toWords(program)];
     return bech32m.encode(network.bech32Opnet, words);
 }
-function _toFutureSegwitAddress(output, network) {
+export function _toFutureSegwitAddress(output, network) {
     const data = output.subarray(2);
     if (data.length < FUTURE_SEGWIT_MIN_SIZE || data.length > FUTURE_SEGWIT_MAX_SIZE) {
         throw new TypeError('Invalid program length for segwit address');

package/build/psbt.d.ts

@@ -43,6 +43,7 @@ export declare class Psbt {
     clone(): Psbt;
     setMaximumFeeRate(satoshiPerByte: number): void;
     setVersion(version: number): this;
+    setVersionTRUC(): this;
     setLocktime(locktime: number): this;
     setInputSequence(inputIndex: number, sequence: number): this;
     addInputs(inputDatas: PsbtInputExtended[], checkPartialSigs?: boolean): this;
@@ -98,6 +99,7 @@ export declare class Psbt {
 export interface PsbtOptsOptional {
     network?: Network;
     maximumFeeRate?: number;
+    version?: 1 | 2 | 3;
 }
 export interface PsbtOpts {
     network: Network;
@@ -155,11 +157,11 @@ type FinalScriptsFunc = (inputIndex: number, input: PsbtInput, script: Buffer, i
 type FinalTaprootScriptsFunc = (inputIndex: number, input: PsbtInput, tapLeafHashToFinalize?: Buffer) => {
     finalScriptWitness: Buffer | undefined;
 };
-export declare function getFinalScripts(inputIndex: number, input: PsbtInput, script: Buffer, isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean, canRunChecks?: boolean): {
+export declare function getFinalScripts(inputIndex: number, input: PsbtInput, script: Buffer, isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean, canRunChecks?: boolean, solution?: Buffer[]): {
     finalScriptSig: Buffer | undefined;
     finalScriptWitness: Buffer | undefined;
 };
-export declare function prepareFinalScripts(script: Buffer, scriptType: string, partialSig: PartialSig[], isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean): {
+export declare function prepareFinalScripts(script: Buffer, scriptType: string, partialSig: PartialSig[], isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean, solution?: Buffer[]): {
     finalScriptSig: Buffer | undefined;
     finalScriptWitness: Buffer | undefined;
 };

package/build/psbt.js

@@ -1,7 +1,7 @@
 import { Psbt as PsbtBase } from 'bip174';
 import * as varuint from 'bip174/src/lib/converter/varint.js';
 import { checkForInput, checkForOutput } from 'bip174/src/lib/utils.js';
-import { fromOutputScript, toOutputScript } from './address.js';
+import { fromOutputScript, isUnknownSegwitVersion, toOutputScript } from './address.js';
 import { cloneBuffer, reverseBuffer } from './bufferutils.js';
 import { payments } from './index.js';
 import { bitcoin as btcNetwork } from './networks.js';
@@ -25,7 +25,10 @@ export class Psbt {
             __TX: this.data.globalMap.unsignedTx.tx,
             __UNSAFE_SIGN_NONSEGWIT: false,
         };
-        if (this.data.inputs.length === 0)
+        if (opts.version === 3) {
+            this.setVersionTRUC();
+        }
+        else if (this.data.inputs.length === 0)
             this.setVersion(2);
         const dpew = (obj, attr, enumerable, writable) => {
             Object.defineProperty(obj, attr, {
@@ -105,6 +108,9 @@ export class Psbt {
         c.__EXTRACTED_TX = undefined;
         return this;
     }
+    setVersionTRUC() {
+        return this.setVersion(Transaction.TRUC_VERSION);
+    }
     setLocktime(locktime) {
         check32Bit(locktime);
         checkInputsForPartialSig(this.data.inputs, 'setLocktime');
@@ -818,14 +824,14 @@ function getTxCacheValue(key, name, inputs, c, disableOutputChecks = false) {
     else if (key === '__FEE')
         return c.__FEE;
 }
-export function getFinalScripts(inputIndex, input, script, isSegwit, isP2SH, isP2WSH, canRunChecks = true) {
+export function getFinalScripts(inputIndex, input, script, isSegwit, isP2SH, isP2WSH, canRunChecks = true, solution) {
     const scriptType = classifyScript(script);
     if (!canFinalize(input, script, scriptType) && canRunChecks) {
         throw new Error(`Can not finalize input #${inputIndex}`);
     }
-    return prepareFinalScripts(script, scriptType, input.partialSig, isSegwit, isP2SH, isP2WSH);
+    return prepareFinalScripts(script, scriptType, input.partialSig, isSegwit, isP2SH, isP2WSH, solution);
 }
-export function prepareFinalScripts(script, scriptType, partialSig, isSegwit, isP2SH, isP2WSH) {
+export function prepareFinalScripts(script, scriptType, partialSig, isSegwit, isP2SH, isP2WSH, solution) {
     let finalScriptSig;
     let finalScriptWitness;
     const payment = getPayment(script, scriptType, partialSig);
@@ -835,19 +841,28 @@ export function prepareFinalScripts(script, scriptType, partialSig, isSegwit, is
         if (p2wsh) {
             finalScriptWitness = witnessStackToScriptWitness(p2wsh.witness);
         }
-        else {
+        else if (payment) {
             finalScriptWitness = witnessStackToScriptWitness(payment.witness);
         }
+        else {
+            finalScriptWitness = witnessStackToScriptWitness(solution ?? [Buffer.from([0x00])]);
+        }
         if (p2sh) {
-            finalScriptSig = p2sh.input;
+            finalScriptSig = p2sh?.input;
         }
     }
     else {
         if (p2sh) {
-            finalScriptSig = p2sh.input;
+            finalScriptSig = p2sh?.input;
         }
         else {
-            finalScriptSig = payment.input;
+            if (!payment) {
+                finalScriptSig =
+                    Array.isArray(solution) && solution[0] ? solution[0] : Buffer.from([0x01]);
+            }
+            else {
+                finalScriptSig = payment.input;
+            }
         }
     }
     return {
@@ -1043,6 +1058,15 @@ function getScriptFromInput(inputIndex, input, cache) {
     if (input.witnessScript || isP2WPKH(res.script)) {
         res.isSegwit = true;
     }
+    else {
+        try {
+            const output = res.script;
+            if (!output)
+                throw new TypeError('Invalid script for segwit address');
+            res.isSegwit = isUnknownSegwitVersion(output);
+        }
+        catch (e) { }
+    }
     return res;
 }
 function getSignersFromHD(inputIndex, inputs, hdKeyPair) {
@@ -1167,7 +1191,7 @@ function inputFinalizeGetAmts(inputs, tx, cache, mustFinalize, disableOutputChec
     const fee = inputAmount - outputAmount;
     if (!disableOutputChecks) {
         if (fee < 0) {
-            throw new Error('Outputs are spending more than Inputs');
+            throw new Error(`Outputs are spending more than Inputs ${inputAmount} < ${outputAmount}`);
         }
     }
     const bytes = tx.virtualSize();

package/build/transaction.d.ts

@@ -20,6 +20,9 @@ export declare class Transaction {
     static readonly SIGHASH_INPUT_MASK = 128;
     static readonly ADVANCED_TRANSACTION_MARKER = 0;
     static readonly ADVANCED_TRANSACTION_FLAG = 1;
+    static readonly TRUC_VERSION = 3;
+    static readonly TRUC_MAX_VSIZE = 10000;
+    static readonly TRUC_CHILD_MAX_VSIZE = 1000;
     version: number;
     locktime: number;
     ins: Input[];

package/build/transaction.js

@@ -443,3 +443,6 @@ Transaction.SIGHASH_OUTPUT_MASK = 0x03;
 Transaction.SIGHASH_INPUT_MASK = 0x80;
 Transaction.ADVANCED_TRANSACTION_MARKER = 0x00;
 Transaction.ADVANCED_TRANSACTION_FLAG = 0x01;
+Transaction.TRUC_VERSION = 3;
+Transaction.TRUC_MAX_VSIZE = 10000;
+Transaction.TRUC_CHILD_MAX_VSIZE = 1000;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/bitcoin",
     "type": "module",
-    "version": "6.4.5",
+    "version": "6.4.7",
     "description": "Client-side Bitcoin JavaScript library",
     "engines": {
         "node": ">=16.0.0"

package/src/address.ts

@@ -33,19 +33,39 @@ export interface Bech32Result {
     data: Buffer;
 }
 
-const FUTURE_SEGWIT_MAX_SIZE: number = 40;
-const FUTURE_SEGWIT_MIN_SIZE: number = 2;
-const FUTURE_SEGWIT_MAX_VERSION: number = 15;
-const FUTURE_MAX_VERSION: number = 16;
-const FUTURE_OPNET_VERSION: number = 16;
-const FUTURE_SEGWIT_MIN_VERSION: number = 2;
-const FUTURE_SEGWIT_VERSION_DIFF: number = 0x50;
+export const FUTURE_SEGWIT_MAX_SIZE: number = 40;
+export const FUTURE_SEGWIT_MIN_SIZE: number = 2;
+export const FUTURE_SEGWIT_MAX_VERSION: number = 15;
+export const FUTURE_MAX_VERSION: number = 16;
+export const FUTURE_OPNET_VERSION: number = 16;
+export const FUTURE_SEGWIT_MIN_VERSION: number = 2;
+export const FUTURE_SEGWIT_VERSION_DIFF: number = 0x50;
 const FUTURE_SEGWIT_VERSION_WARNING: string =
     'WARNING: Sending to a future segwit version address can lead to loss of funds. ' +
     'End users MUST be warned carefully in the GUI and asked if they wish to proceed ' +
     'with caution. Wallets should verify the segwit version from the output of fromBech32, ' +
     'then decide when it is safe to use which version of segwit.';
 
+export const isUnknownSegwitVersion = (output: Buffer): boolean => {
+    try {
+        const data = output.subarray(2);
+        if (data.length < FUTURE_SEGWIT_MIN_SIZE || data.length > FUTURE_SEGWIT_MAX_SIZE) {
+            throw new TypeError('Invalid program length for segwit address');
+        }
+
+        const version = output[0] - FUTURE_SEGWIT_VERSION_DIFF;
+        if (version < FUTURE_SEGWIT_MIN_VERSION || version > FUTURE_SEGWIT_MAX_VERSION + 1) {
+            throw new TypeError('Invalid version for segwit address');
+        }
+
+        if (version === 1) throw new TypeError('taproot');
+
+        return true;
+    } catch (e) {}
+
+    return false;
+};
+
 /**
  * Encode a future Taproot-style segwit address (SegWit v2 - v16) using bech32m.
  * Only for versions not yet assigned specific meanings (future use).
@@ -92,7 +112,7 @@ export function toFutureOPNetAddress(output: Buffer, network: Network): string {
     return bech32m.encode(network.bech32Opnet, words);
 }
 
-function _toFutureSegwitAddress(output: Buffer, network: Network): string {
+export function _toFutureSegwitAddress(output: Buffer, network: Network): string {
     const data = output.subarray(2);
     if (data.length < FUTURE_SEGWIT_MIN_SIZE || data.length > FUTURE_SEGWIT_MAX_SIZE) {
         throw new TypeError('Invalid program length for segwit address');