@btc-vision/transaction 1.8.0-beta.3 → 1.8.0-beta.4

package/src/transaction/builders/ConsolidatedInteractionTransaction.ts

@@ -1,24 +1,31 @@
-import { Buffer } from 'buffer';
-import { Psbt, PsbtInput, toXOnly, Transaction } from '@btc-vision/bitcoin';
-import { ECPairInterface } from 'ecpair';
+import {
+    fromHex,
+    Psbt,
+    type PsbtInput,
+    type Script,
+    toSatoshi,
+    toXOnly,
+    Transaction,
+} from '@btc-vision/bitcoin';
+import { type UniversalSigner } from '@btc-vision/ecpair';
 import { TransactionType } from '../enums/TransactionType.js';
 import { MINIMUM_AMOUNT_REWARD, TransactionBuilder } from './TransactionBuilder.js';
 import { HashCommitmentGenerator } from '../../generators/builders/HashCommitmentGenerator.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
-import {
+import type {
     IConsolidatedInteractionParameters,
     IConsolidatedInteractionResult,
     IHashCommittedP2WSH,
     IRevealTransactionResult,
     ISetupTransactionResult,
 } from '../interfaces/IConsolidatedTransactionParameters.js';
-import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
+import type { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 import { TimeLockGenerator } from '../mineable/TimelockGenerator.js';
-import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
+import type { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Compressor } from '../../bytecode/Compressor.js';
-import { Feature, FeaturePriority, Features } from '../../generators/Features.js';
+import { type Feature, FeaturePriority, Features } from '../../generators/Features.js';
 import { AddressGenerator } from '../../generators/AddressGenerator.js';
 
 /**
@@ -69,19 +76,19 @@ import { AddressGenerator } from '../../generators/AddressGenerator.js';
 export class ConsolidatedInteractionTransaction extends TransactionBuilder<TransactionType.INTERACTION> {
     public readonly type: TransactionType.INTERACTION = TransactionType.INTERACTION;
     /** Random bytes for interaction (same as InteractionTransaction) */
-    public readonly randomBytes: Buffer;
+    public readonly randomBytes: Uint8Array;
     /** The contract address (same as InteractionTransaction.to) */
     protected readonly contractAddress: string;
     /** The contract secret - 32 bytes (same as InteractionTransaction) */
-    protected readonly contractSecret: Buffer;
+    protected readonly contractSecret: Uint8Array;
     /** The compressed calldata (same as InteractionTransaction) */
-    protected readonly calldata: Buffer;
+    protected readonly calldata: Uint8Array;
     /** Challenge solution for epoch (same as InteractionTransaction) */
     protected readonly challenge: IChallengeSolution;
     /** Epoch challenge P2WSH address (same as InteractionTransaction) */
     protected readonly epochChallenge: IP2WSHAddress;
     /** Script signer for interaction (same as InteractionTransaction) */
-    protected readonly scriptSigner: ECPairInterface;
+    protected readonly scriptSigner: UniversalSigner;
 
     /** Calldata generator - produces same output as InteractionTransaction */
     protected readonly calldataGenerator: CalldataGenerator;
@@ -90,7 +97,7 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
     protected readonly hashCommitmentGenerator: HashCommitmentGenerator;
 
     /** The compiled operation data - SAME as InteractionTransaction's compiledTargetScript */
-    protected readonly compiledTargetScript: Buffer;
+    protected readonly compiledTargetScript: Uint8Array;
 
     /** Generated hash-committed P2WSH outputs */
     protected readonly commitmentOutputs: IHashCommittedP2WSH[];
@@ -125,7 +132,7 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
         }
 
         this.contractAddress = parameters.to;
-        this.contractSecret = Buffer.from(parameters.contract.replace('0x', ''), 'hex');
+        this.contractSecret = fromHex(parameters.contract.replace('0x', ''));
         this.disableAutoRefund = parameters.disableAutoRefund || false;
         this.maxChunkSize = parameters.maxChunkSize ?? HashCommitmentGenerator.MAX_CHUNK_SIZE;
 
@@ -150,17 +157,17 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
 
         // Create calldata generator (same as SharedInteractionTransaction)
         this.calldataGenerator = new CalldataGenerator(
-            Buffer.from(this.signer.publicKey),
-            toXOnly(Buffer.from(this.scriptSigner.publicKey)),
+            this.signer.publicKey,
+            toXOnly(this.scriptSigner.publicKey),
             this.network,
         );
 
         // Compile the target script - SAME as InteractionTransaction
         if (parameters.compiledTargetScript) {
-            if (Buffer.isBuffer(parameters.compiledTargetScript)) {
+            if (parameters.compiledTargetScript instanceof Uint8Array) {
                 this.compiledTargetScript = parameters.compiledTargetScript;
             } else if (typeof parameters.compiledTargetScript === 'string') {
-                this.compiledTargetScript = Buffer.from(parameters.compiledTargetScript, 'hex');
+                this.compiledTargetScript = fromHex(parameters.compiledTargetScript);
             } else {
                 throw new Error('Invalid compiled target script format.');
             }
@@ -176,7 +183,7 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
 
         // Create hash commitment generator
         this.hashCommitmentGenerator = new HashCommitmentGenerator(
-            Buffer.from(this.signer.publicKey),
+            this.signer.publicKey,
             this.network,
         );
 
@@ -204,21 +211,21 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
     /**
      * Get the compiled target script (same as InteractionTransaction).
      */
-    public exportCompiledTargetScript(): Buffer {
+    public exportCompiledTargetScript(): Uint8Array {
         return this.compiledTargetScript;
     }
 
     /**
      * Get the contract secret (same as InteractionTransaction).
      */
-    public getContractSecret(): Buffer {
+    public getContractSecret(): Uint8Array {
         return this.contractSecret;
     }
 
     /**
      * Get the random bytes (same as InteractionTransaction).
      */
-    public getRndBytes(): Buffer {
+    public getRndBytes(): Uint8Array {
         return this.randomBytes;
     }
 
@@ -299,14 +306,14 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
 
         // Add commitment outputs as inputs (from setup tx)
         for (let i = 0; i < this.commitmentOutputs.length; i++) {
-            const commitment = this.commitmentOutputs[i];
+            const commitment = this.commitmentOutputs[i] as IHashCommittedP2WSH;
 
             revealPsbt.addInput({
                 hash: setupTxId,
                 index: i,
                 witnessUtxo: {
-                    script: commitment.scriptPubKey,
-                    value: Number(valuePerOutput),
+                    script: commitment.scriptPubKey as Script,
+                    value: toSatoshi(valuePerOutput),
                 },
                 witnessScript: commitment.witnessScript,
             });
@@ -322,7 +329,7 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
         // Add output to epoch challenge address (same as InteractionTransaction)
         revealPsbt.addOutput({
             address: this.epochChallenge.address,
-            value: Number(feeAmount),
+            value: toSatoshi(feeAmount),
         });
 
         // Estimate reveal transaction fee
@@ -335,7 +342,7 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
             const refundAddress = this.getRefundAddress();
             revealPsbt.addOutput({
                 address: refundAddress,
-                value: Number(changeValue),
+                value: toSatoshi(changeValue),
             });
         }
 
@@ -346,7 +353,7 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
 
         // Finalize all inputs with hash-commitment finalizer
         for (let i = 0; i < this.commitmentOutputs.length; i++) {
-            const commitment = this.commitmentOutputs[i];
+            const commitment = this.commitmentOutputs[i] as IHashCommittedP2WSH;
             revealPsbt.finalizeInput(i, (_inputIndex: number, input: PsbtInput) => {
                 return this.finalizeCommitmentInput(input, commitment);
             });
@@ -389,7 +396,7 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
         // Add each hash-committed P2WSH as an output
         for (const commitment of this.commitmentOutputs) {
             this.addOutput({
-                value: Number(valuePerOutput),
+                value: toSatoshi(valuePerOutput),
                 address: commitment.address,
             });
         }
@@ -416,8 +423,8 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
         input: PsbtInput,
         commitment: IHashCommittedP2WSH,
     ): {
-        finalScriptSig: Buffer | undefined;
-        finalScriptWitness: Buffer | undefined;
+        finalScriptSig: Uint8Array | undefined;
+        finalScriptWitness: Uint8Array | undefined;
     } {
         if (!input.partialSig || input.partialSig.length === 0) {
             throw new Error('No signature for commitment input');
@@ -429,8 +436,8 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
 
         // Witness stack for hash-committed P2WSH with multiple chunks
         // Order: [signature, data_1, data_2, ..., data_N, witnessScript]
-        const witnessStack: Buffer[] = [
-            input.partialSig[0].signature, // Signature for OP_CHECKSIG
+        const witnessStack: Uint8Array[] = [
+            (input.partialSig[0] as { signature: Uint8Array }).signature, // Signature for OP_CHECKSIG
             ...commitment.dataChunks, // All data chunks for OP_HASH160 verification
             input.witnessScript, // The witness script
         ];
@@ -445,8 +452,6 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
      * Estimate reveal transaction vBytes.
      */
     private estimateRevealVBytes(): number {
-        const inputCount = this.commitmentOutputs.length;
-
         // Calculate actual witness weight based on chunks per output
         let witnessWeight = 0;
         for (const commitment of this.commitmentOutputs) {

package/src/transaction/builders/CustomScriptTransaction.ts

@@ -1,23 +1,26 @@
 import {
     crypto as bitCrypto,
-    P2TRPayment,
-    Payment,
+    type FinalScriptsFunc,
+    type P2TRPayment,
     PaymentType,
     Psbt,
-    PsbtInput,
-    Signer,
-    Taptree,
+    type PsbtInput,
+    type Script,
+    type Signer,
+    type Taptree,
+    toSatoshi,
     toXOnly,
 } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
-import { TapLeafScript } from '../interfaces/Tap.js';
+import type { TapLeafScript } from '../interfaces/Tap.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { CustomGenerator } from '../../generators/builders/CustomGenerator.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressGenerator } from '../../generators/AddressGenerator.js';
-import { ECPairInterface } from 'ecpair';
-import { ICustomTransactionParameters } from '../interfaces/ICustomTransactionParameters.js';
+import { type UniversalSigner } from '@btc-vision/ecpair';
+import { isUniversalSigner } from '../../signer/TweakedSigner.js';
+import type { ICustomTransactionParameters } from '../interfaces/ICustomTransactionParameters.js';
 
 /**
  * Class for interaction transactions
@@ -35,7 +38,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * The tap leaf script
      * @private
      */
-    protected tapLeafScript: TapLeafScript | null = null;
+    protected override tapLeafScript: TapLeafScript | null = null;
     /**
      * The target script redeem
      * @private
@@ -50,7 +53,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * The compiled target script
      * @private
      */
-    private readonly compiledTargetScript: Buffer;
+    private readonly compiledTargetScript: Uint8Array;
     /**
      * The script tree
      * @private
@@ -66,26 +69,26 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * The contract seed
      * @private
      */
-    private readonly scriptSeed: Buffer;
+    private readonly scriptSeed: Uint8Array;
 
     /**
      * The contract signer
      * @private
      */
-    private readonly contractSigner: Signer | ECPairInterface;
+    private readonly contractSigner: Signer | UniversalSigner;
 
     /**
      * The contract salt random bytes
      * @private
      */
-    private readonly randomBytes: Buffer;
+    private readonly randomBytes: Uint8Array;
 
     /**
      * The witnesses
      * @private
      */
-    private readonly witnesses: Buffer[];
-    private readonly annexData?: Buffer;
+    private readonly witnesses: Uint8Array[];
+    private readonly annexData?: Uint8Array;
 
     public constructor(parameters: ICustomTransactionParameters) {
         super(parameters);
@@ -125,7 +128,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
         return this.to || this.getScriptAddress();
     }
 
-    public exportCompiledTargetScript(): Buffer {
+    public exportCompiledTargetScript(): Uint8Array {
         return this.compiledTargetScript;
     }
 
@@ -133,7 +136,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * Get the random bytes used for the interaction
      * @returns {Buffer} The random bytes
      */
-    public getRndBytes(): Buffer {
+    public getRndBytes(): Uint8Array {
         return this.randomBytes;
     }
 
@@ -141,8 +144,8 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * Get the contract signer public key
      * @protected
      */
-    protected contractSignerXOnlyPubKey(): Buffer {
-        return toXOnly(Buffer.from(this.contractSigner.publicKey));
+    protected contractSignerXOnlyPubKey(): Uint8Array {
+        return toXOnly(this.contractSigner.publicKey);
     }
 
     /**
@@ -154,7 +157,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
             this.to = this.getScriptAddress();
         }
 
-        const selectedRedeem: Payment | null = this.contractSigner
+        const selectedRedeem: P2TRPayment | null = this.contractSigner
             ? this.targetScriptRedeem
             : this.leftOverFundsScriptRedeem;
 
@@ -180,7 +183,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
 
         const amountSpent: bigint = this.getTransactionOPNetFee();
         this.addOutput({
-            value: Number(amountSpent),
+            value: toSatoshi(amountSpent),
             address: this.to,
         });
 
@@ -192,25 +195,55 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * @param {Psbt} transaction The transaction to sign
      * @protected
      */
-    protected async signInputs(transaction: Psbt): Promise<void> {
+    protected override async signInputs(transaction: Psbt): Promise<void> {
         if (!this.contractSigner) {
             await super.signInputs(transaction);
 
             return;
         }
 
-        for (let i = 0; i < transaction.data.inputs.length; i++) {
-            if (i === 0) {
-                // multi sig input
-                try {
-                    transaction.signInput(0, this.contractSigner);
-                } catch (e) {}
-
-                transaction.signInput(0, this.getSignerKey());
+        // Input 0: sequential (contractSigner + main signer, custom finalizer)
+        try {
+            transaction.signInput(0, this.contractSigner);
+        } catch {
+            // contractSigner may fail for some script types
+        }
+        transaction.signInput(0, this.getSignerKey());
+        transaction.finalizeInput(0, this.customFinalizer);
+
+        // Inputs 1+: parallel key-path if available, then sequential for remaining
+        const signedIndices = new Set<number>([0]);
+
+        if (this.canUseParallelSigning && isUniversalSigner(this.signer)) {
+            try {
+                const result = await this.signKeyPathInputsParallel(
+                    transaction,
+                    new Set([0]),
+                );
+                if (result.success) {
+                    for (const idx of result.signatures.keys()) signedIndices.add(idx);
+                }
+            } catch (e) {
+                this.error(
+                    `Parallel signing failed: ${(e as Error).message}`,
+                );
+            }
+        }
 
-                transaction.finalizeInput(0, this.customFinalizer);
-            } else {
+        for (let i = 1; i < transaction.data.inputs.length; i++) {
+            if (!signedIndices.has(i)) {
                 transaction.signInput(i, this.getSignerKey());
+            }
+        }
+
+        // Finalize inputs 1+
+        for (let i = 1; i < transaction.data.inputs.length; i++) {
+            try {
+                transaction.finalizeInput(
+                    i,
+                    this.customFinalizerP2SH.bind(this) as FinalScriptsFunc,
+                );
+            } catch {
                 transaction.finalizeInput(i);
             }
         }
@@ -255,12 +288,12 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
         };
     }
 
-    protected getScriptSolution(input: PsbtInput): Buffer[] {
+    protected getScriptSolution(input: PsbtInput): Uint8Array[] {
         if (!input.tapScriptSig) {
             throw new Error('Tap script signature is required');
         }
 
-        const witnesses: Buffer[] = [...this.witnesses];
+        const witnesses: Uint8Array[] = [...this.witnesses];
         if (input.tapScriptSig) {
             for (const sig of input.tapScriptSig) {
                 witnesses.push(sig.signature);
@@ -274,7 +307,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * Generate the contract seed for the deployment
      * @private
      */
-    private getContractSeed(): Buffer {
+    private getContractSeed(): Uint8Array {
         return bitCrypto.hash256(this.randomBytes);
     }
 
@@ -294,11 +327,15 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
             .concat(this.tapLeafScript.controlBlock);
 
         if (this.annexData && this.annexData.length > 0) {
-            const annex =
-                this.annexData[0] === 0x50
-                    ? this.annexData
-                    : Buffer.concat([Buffer.from([0x50]), this.annexData]);
-
+            let annex: Uint8Array;
+            if (this.annexData[0] === 0x50) {
+                annex = this.annexData;
+            } else {
+                const prefixed = new Uint8Array(this.annexData.length + 1);
+                prefixed[0] = 0x50;
+                prefixed.set(this.annexData, 1);
+                annex = prefixed;
+            }
             witness.push(annex);
         }
 
@@ -307,20 +344,6 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
         };
     };
 
-    /**
-     * Get the public keys for the redeem scripts
-     * @private
-     */
-    private getPubKeys(): Buffer[] {
-        const pubkeys = [Buffer.from(this.signer.publicKey)];
-
-        if (this.contractSigner) {
-            pubkeys.push(Buffer.from(this.contractSigner.publicKey));
-        }
-
-        return pubkeys;
-    }
-
     /**
      * Generate the redeem scripts
      * @private
@@ -329,7 +352,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
         this.targetScriptRedeem = {
             name: PaymentType.P2TR,
             //pubkeys: this.getPubKeys(),
-            output: this.compiledTargetScript,
+            output: this.compiledTargetScript as Script,
             redeemVersion: 192,
         };
 
@@ -345,7 +368,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * Get the second leaf script
      * @private
      */
-    private getLeafScript(): Buffer {
+    private getLeafScript(): Script {
         return this.LOCK_LEAF_SCRIPT;
     }