@btc-vision/transaction 1.7.27 → 1.7.29

package/build/transaction/TransactionFactory.d.ts

@@ -1,22 +1,15 @@
 import { Transaction } from '@btc-vision/bitcoin';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';
-import { ICustomTransactionParameters } from './builders/CustomScriptTransaction.js';
 import { FundingTransaction } from './builders/FundingTransaction.js';
 import { TransactionBuilder } from './builders/TransactionBuilder.js';
 import { TransactionType } from './enums/TransactionType.js';
 import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters } from './interfaces/ITransactionParameters.js';
-import { ICancelTransactionParametersWithoutSigner, ICustomTransactionWithoutSigner, InteractionParametersWithoutSigner } from './browser/Web3Provider.js';
+import { ICancelTransactionParametersWithoutSigner, ICustomTransactionWithoutSigner, InteractionParametersWithoutSigner } from './interfaces/IWeb3ProviderTypes.js';
 import { RawChallenge } from '../epoch/interfaces/IChallengeSolution.js';
-import { ICancelTransactionParameters } from './builders/CancelTransaction.js';
 import { IConsolidatedInteractionParameters } from './interfaces/IConsolidatedTransactionParameters.js';
-export interface DeploymentResult {
-    readonly transaction: [string, string];
-    readonly contractAddress: string;
-    readonly contractPubKey: string;
-    readonly challenge: RawChallenge;
-    readonly utxos: UTXO[];
-    readonly inputUtxos: UTXO[];
-}
+import { CancelledTransaction, DeploymentResult, InteractionResponse } from './interfaces/ITransactionResponses.js';
+import { ICancelTransactionParameters } from './interfaces/ICancelTransactionParameters.js';
+import { ICustomTransactionParameters } from './interfaces/ICustomTransactionParameters.js';
 export interface FundingTransactionResponse {
     readonly tx: Transaction;
     readonly original: FundingTransaction;
@@ -30,25 +23,9 @@ export interface BitcoinTransferBase {
     readonly nextUTXOs: UTXO[];
     readonly inputUtxos: UTXO[];
 }
-export interface InteractionResponse {
-    readonly fundingTransaction: string | null;
-    readonly interactionTransaction: string;
-    readonly estimatedFees: bigint;
-    readonly nextUTXOs: UTXO[];
-    readonly fundingUTXOs: UTXO[];
-    readonly fundingInputUtxos: UTXO[];
-    readonly challenge: RawChallenge;
-    readonly interactionAddress: string | null;
-    readonly compiledTargetScript: string | null;
-}
 export interface BitcoinTransferResponse extends BitcoinTransferBase {
     readonly original: FundingTransaction;
 }
-export interface CancelledTransaction {
-    readonly transaction: string;
-    readonly nextUTXOs: UTXO[];
-    readonly inputUtxos: UTXO[];
-}
 export interface ConsolidatedInteractionResponse {
     readonly setupTransaction: string;
     readonly revealTransaction: string;

package/build/transaction/TransactionFactory.js

@@ -1,6 +1,6 @@
 import { Transaction } from '@btc-vision/bitcoin';
 import { currentConsensus } from '../consensus/ConsensusConfig.js';
-import { CustomScriptTransaction, } from './builders/CustomScriptTransaction.js';
+import { CustomScriptTransaction } from './builders/CustomScriptTransaction.js';
 import { DeploymentTransaction } from './builders/DeploymentTransaction.js';
 import { FundingTransaction } from './builders/FundingTransaction.js';
 import { InteractionTransaction } from './builders/InteractionTransaction.js';

package/build/transaction/browser/Web3Provider.d.ts

@@ -1,29 +1,6 @@
-import { IDeploymentParameters, IInteractionParameters } from '../interfaces/ITransactionParameters.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { CancelledTransaction, DeploymentResult, InteractionResponse } from '../TransactionFactory';
-import { ICustomTransactionParameters } from '../builders/CustomScriptTransaction.js';
-import { ICancelTransactionParameters } from '../builders/CancelTransaction.js';
-import { MLDSASecurityLevel } from '@btc-vision/bip32';
-export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer' | 'challenge' | 'mldsaSigner'>;
-export type IDeploymentParametersWithoutSigner = Omit<IDeploymentParameters, 'signer' | 'network' | 'challenge' | 'mldsaSigner'>;
-export type ICustomTransactionWithoutSigner = Omit<ICustomTransactionParameters, 'signer' | 'challenge' | 'mldsaSigner'>;
-export type ICancelTransactionParametersWithoutSigner = Omit<ICancelTransactionParameters, 'signer' | 'challenge' | 'network' | 'mldsaSigner'>;
-export interface BroadcastTransactionOptions {
-    raw: string;
-    psbt: boolean;
-}
-export interface BroadcastedTransaction {
-    readonly success: boolean;
-    readonly result?: string;
-    readonly error?: string;
-    readonly peers?: number;
-}
-export interface MLDSASignature {
-    readonly signature: string;
-    readonly publicKey: string;
-    readonly securityLevel: MLDSASecurityLevel;
-    readonly messageHash: string;
-}
+import { CancelledTransaction, DeploymentResult, InteractionResponse } from '../interfaces/ITransactionResponses.js';
+import { BroadcastedTransaction, BroadcastTransactionOptions, ICancelTransactionParametersWithoutSigner, ICustomTransactionWithoutSigner, IDeploymentParametersWithoutSigner, InteractionParametersWithoutSigner, MLDSASignature } from '../interfaces/IWeb3ProviderTypes.js';
 export interface Web3Provider {
     signInteraction(interactionParameters: InteractionParametersWithoutSigner): Promise<InteractionResponse>;
     signAndBroadcastInteraction(interactionParameters: InteractionParametersWithoutSigner): Promise<[BroadcastedTransaction, BroadcastedTransaction, UTXO[], string]>;

package/build/transaction/builders/CancelTransaction.d.ts

@@ -2,10 +2,7 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { P2TRPayment, Psbt, PsbtInput, Taptree } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
-import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
-export interface ICancelTransactionParameters extends Omit<ITransactionParameters, 'priorityFee' | 'gasSatFee'> {
-    readonly compiledTargetScript: string | Buffer;
-}
+import { ICancelTransactionParameters } from '../interfaces/ICancelTransactionParameters.js';
 export declare class CancelTransaction extends TransactionBuilder<TransactionType.CANCEL> {
     type: TransactionType.CANCEL;
     protected tapLeafScript: TapLeafScript | null;

package/build/transaction/builders/ConsolidatedInteractionTransaction.d.ts

@@ -6,14 +6,14 @@ import { HashCommitmentGenerator } from '../../generators/builders/HashCommitmen
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { IConsolidatedInteractionParameters, IConsolidatedInteractionResult, IHashCommittedP2WSH, IRevealTransactionResult } from '../interfaces/IConsolidatedTransactionParameters.js';
 import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 export declare class ConsolidatedInteractionTransaction extends TransactionBuilder<TransactionType.INTERACTION> {
     readonly type: TransactionType.INTERACTION;
     readonly randomBytes: Buffer;
     protected readonly contractAddress: string;
     protected readonly contractSecret: Buffer;
     protected readonly calldata: Buffer;
-    protected readonly challenge: ChallengeSolution;
+    protected readonly challenge: IChallengeSolution;
     protected readonly epochChallenge: IP2WSHAddress;
     protected readonly scriptSigner: ECPairInterface;
     protected readonly calldataGenerator: CalldataGenerator;
@@ -27,7 +27,7 @@ export declare class ConsolidatedInteractionTransaction extends TransactionBuild
     exportCompiledTargetScript(): Buffer;
     getContractSecret(): Buffer;
     getRndBytes(): Buffer;
-    getChallenge(): ChallengeSolution;
+    getChallenge(): IChallengeSolution;
     getCommitmentOutputs(): IHashCommittedP2WSH[];
     getOutputCount(): number;
     getTotalChunkCount(): number;

package/build/transaction/builders/CustomScriptTransaction.d.ts

@@ -1,14 +1,8 @@
-import { P2TRPayment, Psbt, PsbtInput, Stack } from '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt, PsbtInput } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
-import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
-export interface ICustomTransactionParameters extends Omit<SharedInteractionParameters, 'challenge'> {
-    script: (Buffer | Stack)[];
-    witnesses: Buffer[];
-    annex?: Buffer;
-    to: string;
-}
+import { ICustomTransactionParameters } from '../interfaces/ICustomTransactionParameters.js';
 export declare class CustomScriptTransaction extends TransactionBuilder<TransactionType.CUSTOM_CODE> {
     type: TransactionType.CUSTOM_CODE;
     protected readonly _scriptAddress: string;

package/build/transaction/builders/DeploymentTransaction.d.ts

@@ -4,12 +4,12 @@ import { P2TRPayment, Psbt } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { Address } from '../../keypair/Address.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 export declare class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
     static readonly MAXIMUM_CONTRACT_SIZE: number;
     type: TransactionType.DEPLOYMENT;
-    protected readonly challenge: ChallengeSolution;
+    protected readonly challenge: IChallengeSolution;
     protected readonly epochChallenge: IP2WSHAddress;
     protected readonly _contractAddress: Address;
     protected tapLeafScript: TapLeafScript | null;
@@ -32,7 +32,7 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     get p2trAddress(): string;
     exportCompiledTargetScript(): Buffer;
     getRndBytes(): Buffer;
-    getChallenge(): ChallengeSolution;
+    getChallenge(): IChallengeSolution;
     getContractAddress(): string;
     protected contractSignerXOnlyPubKey(): Buffer;
     protected buildTransaction(): Promise<void>;

package/build/transaction/builders/InteractionTransactionP2WDA.d.ts

@@ -3,7 +3,7 @@ import { Psbt } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IInteractionParameters } from '../interfaces/ITransactionParameters.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 export declare class InteractionTransactionP2WDA extends TransactionBuilder<TransactionType.INTERACTION> {
     private static readonly MAX_WITNESS_FIELDS;
@@ -22,7 +22,7 @@ export declare class InteractionTransactionP2WDA extends TransactionBuilder<Tran
     private readonly compiledOperationData;
     constructor(parameters: IInteractionParameters);
     getRndBytes(): Buffer;
-    getChallenge(): ChallengeSolution;
+    getChallenge(): IChallengeSolution;
     getContractSecret(): Buffer;
     protected buildTransaction(): Promise<void>;
     protected createMineableRewardOutputs(): Promise<void>;

package/build/transaction/builders/SharedInteractionTransaction.d.ts

@@ -4,7 +4,7 @@ import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 export declare abstract class SharedInteractionTransaction<T extends TransactionType> extends TransactionBuilder<T> {
     static readonly MAXIMUM_CALLDATA_SIZE: number;
@@ -13,7 +13,7 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected leftOverFundsScriptRedeem: P2TRPayment | null;
     protected abstract readonly compiledTargetScript: Buffer;
     protected abstract readonly scriptTree: Taptree;
-    protected readonly challenge: ChallengeSolution;
+    protected readonly challenge: IChallengeSolution;
     protected readonly epochChallenge: IP2WSHAddress;
     protected calldataGenerator: CalldataGenerator;
     protected readonly calldata: Buffer;
@@ -24,7 +24,7 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     exportCompiledTargetScript(): Buffer;
     getContractSecret(): Buffer;
     getRndBytes(): Buffer;
-    getChallenge(): ChallengeSolution;
+    getChallenge(): IChallengeSolution;
     protected scriptSignerXOnlyPubKey(): Buffer;
     protected generateKeyPairFromSeed(): ECPairInterface;
     protected buildTransaction(): Promise<void>;

package/build/transaction/builders/TransactionBuilder.js

@@ -1,4 +1,5 @@
-import bitcoin, { getFinalScripts, initEccLib, opcodes, Psbt, script, toXOnly, Transaction, varuint, } from '@btc-vision/bitcoin';
+import bitcoin, { getFinalScripts, initEccLib, opcodes, Psbt, script, toXOnly, Transaction, } from '@btc-vision/bitcoin';
+import { witnessStackToScriptWitness } from '../utils/WitnessUtils.js';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressVerificator } from '../../keypair/AddressVerificator.js';
@@ -68,26 +69,7 @@ export class TransactionBuilder extends TweakedTransaction {
         return from || EcKeyPair.getTaprootAddress(keypair, network);
     }
     static witnessStackToScriptWitness(witness) {
-        let buffer = Buffer.allocUnsafe(0);
-        function writeSlice(slice) {
-            buffer = Buffer.concat([buffer, Buffer.from(slice)]);
-        }
-        function writeVarInt(i) {
-            const currentLen = buffer.length;
-            const varintLen = varuint.encodingLength(i);
-            buffer = Buffer.concat([buffer, Buffer.allocUnsafe(varintLen)]);
-            varuint.encode(i, buffer, currentLen);
-        }
-        function writeVarSlice(slice) {
-            writeVarInt(slice.length);
-            writeSlice(slice);
-        }
-        function writeVector(vector) {
-            writeVarInt(vector.length);
-            vector.forEach(writeVarSlice);
-        }
-        writeVector(witness);
-        return buffer;
+        return witnessStackToScriptWitness(witness);
     }
     addOPReturn(buffer) {
         const compileScript = script.compile([opcodes.OP_RETURN, buffer]);

package/build/transaction/interfaces/ICancelTransactionParameters.d.ts

@@ -0,0 +1,4 @@
+import { ITransactionParameters } from './ITransactionParameters.js';
+export interface ICancelTransactionParameters extends Omit<ITransactionParameters, 'priorityFee' | 'gasSatFee'> {
+    readonly compiledTargetScript: string | Buffer;
+}

package/build/transaction/interfaces/ICancelTransactionParameters.js

@@ -0,0 +1 @@
+export {};

package/build/transaction/interfaces/ICustomTransactionParameters.d.ts

@@ -0,0 +1,8 @@
+import { Stack } from '@btc-vision/bitcoin';
+import { SharedInteractionParameters } from './ITransactionParameters.js';
+export interface ICustomTransactionParameters extends Omit<SharedInteractionParameters, 'challenge'> {
+    script: (Buffer | Stack)[];
+    witnesses: Buffer[];
+    annex?: Buffer;
+    to: string;
+}

package/build/transaction/interfaces/ICustomTransactionParameters.js

@@ -0,0 +1 @@
+export {};

package/build/transaction/interfaces/ITransactionParameters.d.ts

@@ -1,9 +1,9 @@
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
+import { ITweakedTransactionData } from './ITweakedTransactionData.js';
 import { ChainId } from '../../network/ChainId.js';
 import { PsbtOutputExtended } from '@btc-vision/bitcoin';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
-import { AddressRotationConfig } from '../../signer/AddressRotation.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
+import { AddressRotationConfigBase } from '../../signer/IRotationSigner.js';
 export interface LoadedStorage {
     [key: string]: string[];
 }
@@ -26,7 +26,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     readonly priorityFee: bigint;
     readonly gasSatFee: bigint;
     readonly compiledTargetScript?: Buffer | string;
-    readonly addressRotation?: AddressRotationConfig;
+    readonly addressRotation?: AddressRotationConfigBase;
 }
 export interface IFundingTransactionParameters extends ITransactionParameters {
     amount: bigint;
@@ -35,7 +35,7 @@ export interface IFundingTransactionParameters extends ITransactionParameters {
 export interface SharedInteractionParameters extends ITransactionParameters {
     calldata?: Buffer;
     disableAutoRefund?: boolean;
-    readonly challenge: ChallengeSolution;
+    readonly challenge: IChallengeSolution;
     readonly randomBytes?: Buffer;
     readonly loadedStorage?: LoadedStorage;
     readonly isCancellation?: boolean;
@@ -49,5 +49,5 @@ export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'
     readonly bytecode: Buffer;
     readonly calldata?: Buffer;
     readonly randomBytes?: Buffer;
-    readonly challenge: ChallengeSolution;
+    readonly challenge: IChallengeSolution;
 }

package/build/transaction/interfaces/ITransactionResponses.d.ts

@@ -0,0 +1,26 @@
+import { RawChallenge } from '../../epoch/interfaces/IChallengeSolution.js';
+import { UTXO } from '../../utxo/interfaces/IUTXO.js';
+export interface DeploymentResult {
+    readonly transaction: [string, string];
+    readonly contractAddress: string;
+    readonly contractPubKey: string;
+    readonly challenge: RawChallenge;
+    readonly utxos: UTXO[];
+    readonly inputUtxos: UTXO[];
+}
+export interface InteractionResponse {
+    readonly fundingTransaction: string | null;
+    readonly interactionTransaction: string;
+    readonly estimatedFees: bigint;
+    readonly nextUTXOs: UTXO[];
+    readonly fundingUTXOs: UTXO[];
+    readonly fundingInputUtxos: UTXO[];
+    readonly challenge: RawChallenge;
+    readonly interactionAddress: string | null;
+    readonly compiledTargetScript: string | null;
+}
+export interface CancelledTransaction {
+    readonly transaction: string;
+    readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
+}

package/build/transaction/interfaces/ITransactionResponses.js

@@ -0,0 +1 @@
+export {};

package/build/transaction/interfaces/ITweakedTransactionData.d.ts

@@ -0,0 +1,17 @@
+import { Network, Signer } from '@btc-vision/bitcoin';
+import { ECPairInterface } from 'ecpair';
+import { QuantumBIP32Interface } from '@btc-vision/bip32';
+import { ChainId } from '../../network/ChainId.js';
+import { AddressRotationConfigBase } from '../../signer/IRotationSigner.js';
+export type SupportedTransactionVersion = 1 | 2 | 3;
+export interface ITweakedTransactionData {
+    readonly mldsaSigner: QuantumBIP32Interface | null;
+    readonly signer: Signer | ECPairInterface;
+    readonly network: Network;
+    readonly chainId?: ChainId;
+    readonly nonWitnessUtxo?: Buffer;
+    readonly noSignatures?: boolean;
+    readonly unlockScript?: Buffer[];
+    readonly txVersion?: SupportedTransactionVersion;
+    readonly addressRotation?: AddressRotationConfigBase;
+}

package/build/transaction/interfaces/ITweakedTransactionData.js

@@ -0,0 +1 @@
+export {};

package/build/transaction/interfaces/IWeb3ProviderTypes.d.ts

@@ -0,0 +1,24 @@
+import { IDeploymentParameters, IInteractionParameters } from './ITransactionParameters.js';
+import { ICustomTransactionParameters } from './ICustomTransactionParameters.js';
+import { ICancelTransactionParameters } from './ICancelTransactionParameters.js';
+import { MLDSASecurityLevel } from '@btc-vision/bip32';
+export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer' | 'challenge' | 'mldsaSigner'>;
+export type IDeploymentParametersWithoutSigner = Omit<IDeploymentParameters, 'signer' | 'network' | 'challenge' | 'mldsaSigner'>;
+export type ICustomTransactionWithoutSigner = Omit<ICustomTransactionParameters, 'signer' | 'challenge' | 'mldsaSigner'>;
+export type ICancelTransactionParametersWithoutSigner = Omit<ICancelTransactionParameters, 'signer' | 'challenge' | 'network' | 'mldsaSigner'>;
+export interface BroadcastTransactionOptions {
+    raw: string;
+    psbt: boolean;
+}
+export interface BroadcastedTransaction {
+    readonly success: boolean;
+    readonly result?: string;
+    readonly error?: string;
+    readonly peers?: number;
+}
+export interface MLDSASignature {
+    readonly signature: string;
+    readonly publicKey: string;
+    readonly securityLevel: MLDSASecurityLevel;
+    readonly messageHash: string;
+}

package/build/transaction/interfaces/IWeb3ProviderTypes.js

@@ -0,0 +1 @@
+export {};

package/build/transaction/shared/TweakedTransaction.d.ts

@@ -3,23 +3,11 @@ import { Network, P2TRPayment, Psbt, PsbtInput, PsbtInputExtended, Signer, Trans
 import { ECPairInterface } from 'ecpair';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
-import { ChainId } from '../../network/ChainId.js';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
 import { Buffer } from 'buffer';
 import { QuantumBIP32Interface } from '@btc-vision/bip32';
-import { AddressRotationConfig, RotationSigner, SignerMap } from '../../signer/AddressRotation.js';
-export type SupportedTransactionVersion = 1 | 2 | 3;
-export interface ITweakedTransactionData {
-    readonly mldsaSigner: QuantumBIP32Interface | null;
-    readonly signer: Signer | ECPairInterface | UnisatSigner;
-    readonly network: Network;
-    readonly chainId?: ChainId;
-    readonly nonWitnessUtxo?: Buffer;
-    readonly noSignatures?: boolean;
-    readonly unlockScript?: Buffer[];
-    readonly txVersion?: SupportedTransactionVersion;
-    readonly addressRotation?: AddressRotationConfig;
-}
+import { RotationSigner, SignerMap } from '../../signer/AddressRotation.js';
+import { ITweakedTransactionData, SupportedTransactionVersion } from '../interfaces/ITweakedTransactionData.js';
 export declare enum TransactionSequence {
     REPLACE_BY_FEE = 4294967293,
     FINAL = 4294967295

package/build/transaction/shared/TweakedTransaction.js

@@ -2,7 +2,7 @@ import { Logger } from '@btc-vision/logger';
 import { address as bitAddress, crypto as bitCrypto, getFinalScripts, isP2A, isP2MS, isP2PK, isP2PKH, isP2SHScript, isP2TR, isP2WPKH, isP2WSHScript, isUnknownSegwitVersion, opcodes, payments, PaymentType, script, toXOnly, varuint, } from '@btc-vision/bitcoin';
 import { TweakedSigner } from '../../signer/TweakedSigner.js';
 import { canSignNonTaprootInput, isTaprootInput, pubkeyInScript, } from '../../signer/SignerUtils.js';
-import { TransactionBuilder } from '../builders/TransactionBuilder.js';
+import { witnessStackToScriptWitness } from '../utils/WitnessUtils.js';
 import { Buffer } from 'buffer';
 import { P2WDADetector } from '../../p2wda/P2WDADetector.js';
 import { MessageSigner } from '../../keypair/MessageSigner.js';
@@ -69,7 +69,7 @@ export class TweakedTransaction extends Logger {
                     const witnessStack = [input.partialSig[0].signature, input.witnessScript];
                     return {
                         finalScriptSig: undefined,
-                        finalScriptWitness: TransactionBuilder.witnessStackToScriptWitness(witnessStack),
+                        finalScriptWitness: witnessStackToScriptWitness(witnessStack),
                     };
                 }
             }
@@ -609,7 +609,7 @@ export class TweakedTransaction extends Logger {
         const witnessStack = P2WDADetector.createSimpleP2WDAWitness(input.partialSig[0].signature, input.witnessScript);
         return {
             finalScriptSig: undefined,
-            finalScriptWitness: TransactionBuilder.witnessStackToScriptWitness(witnessStack),
+            finalScriptWitness: witnessStackToScriptWitness(witnessStack),
         };
     }
     async signInputsWalletBased(transaction) {

package/build/transaction/utils/WitnessUtils.d.ts

@@ -0,0 +1 @@
+export declare function witnessStackToScriptWitness(witness: Buffer[]): Buffer;

package/build/transaction/utils/WitnessUtils.js

@@ -0,0 +1,23 @@
+import { varuint } from '@btc-vision/bitcoin';
+export function witnessStackToScriptWitness(witness) {
+    let buffer = Buffer.allocUnsafe(0);
+    function writeSlice(slice) {
+        buffer = Buffer.concat([buffer, Buffer.from(slice)]);
+    }
+    function writeVarInt(i) {
+        const currentLen = buffer.length;
+        const varintLen = varuint.encodingLength(i);
+        buffer = Buffer.concat([buffer, Buffer.allocUnsafe(varintLen)]);
+        varuint.encode(i, buffer, currentLen);
+    }
+    function writeVarSlice(slice) {
+        writeVarInt(slice.length);
+        writeSlice(slice);
+    }
+    function writeVector(vector) {
+        writeVarInt(vector.length);
+        vector.forEach(writeVarSlice);
+    }
+    writeVector(witness);
+    return buffer;
+}