@btc-vision/transaction 1.0.112 → 1.0.113

package/src/transaction/builders/DeploymentTransaction.ts

@@ -13,6 +13,7 @@ import { Compressor } from '../../bytecode/Compressor.js';
 import { AddressGenerator } from '../../generators/AddressGenerator.js';
 import { Address } from '@btc-vision/bsi-binary';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
+import { ECPairInterface } from 'ecpair';
 
 export class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
     public static readonly MAXIMUM_CONTRACT_SIZE = 128 * 1024;
@@ -75,7 +76,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      * The contract signer
      * @private
      */
-    private readonly contractSigner: Signer;
+    private readonly contractSigner: Signer | ECPairInterface;
 
     /**
      * The contract salt random bytes
@@ -100,7 +101,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         this.contractSigner = EcKeyPair.fromSeedKeyPair(this.contractSeed, this.network);
 
         this.deploymentGenerator = new DeploymentGenerator(
-            this.signer.publicKey,
+            Buffer.from(this.signer.publicKey),
             this.contractSignerXOnlyPubKey(),
             this.network,
         );
@@ -145,7 +146,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      * @protected
      */
     protected contractSignerXOnlyPubKey(): Buffer {
-        return toXOnly(this.contractSigner.publicKey);
+        return toXOnly(Buffer.from(this.contractSigner.publicKey));
     }
 
     /**
@@ -323,10 +324,10 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      * @private
      */
     private getPubKeys(): Buffer[] {
-        const pubkeys = [this.signer.publicKey];
+        const pubkeys = [Buffer.from(this.signer.publicKey)];
 
         if (this.contractSigner) {
-            pubkeys.push(this.contractSigner.publicKey);
+            pubkeys.push(Buffer.from(this.contractSigner.publicKey));
         }
 
         return pubkeys;

package/src/transaction/builders/FundingTransaction.ts

@@ -2,6 +2,7 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { IFundingTransactionParameters } from '../interfaces/ITransactionParameters.js';
 import { Signer } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
+import { ECPairInterface } from 'ecpair';
 
 export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {
     public readonly type: TransactionType.FUNDING = TransactionType.FUNDING;
@@ -64,7 +65,7 @@ export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDI
         }
     }
 
-    protected override getSignerKey(): Signer {
+    protected override getSignerKey(): Signer | ECPairInterface {
         return this.signer;
     }
 }

package/src/transaction/builders/MultiSignTransaction.ts

@@ -10,6 +10,7 @@ import { Address } from '@btc-vision/bsi-binary';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
+import { ECPairInterface } from 'ecpair';
 
 export interface MultiSignParameters
     extends Omit<ITransactionParameters, 'priorityFee' | 'signer'> {
@@ -172,7 +173,7 @@ export class MultiSignTransaction extends TransactionBuilder<TransactionType.MUL
      */
     public static signPartial(
         psbt: Psbt,
-        signer: Signer,
+        signer: Signer | ECPairInterface,
         originalInputCount: number,
         minimums: number[],
     ): {
@@ -498,7 +499,10 @@ export class MultiSignTransaction extends TransactionBuilder<TransactionType.MUL
      * @returns {Promise<boolean>}
      * @throws {Error} - If something went wrong while building the transaction
      */
-    protected override async internalBuildTransaction(transaction: Psbt, checkPartialSigs: boolean = false): Promise<boolean> {
+    protected override async internalBuildTransaction(
+        transaction: Psbt,
+        checkPartialSigs: boolean = false,
+    ): Promise<boolean> {
         const inputs: PsbtInputExtended[] = this.getInputs();
         const outputs: PsbtOutputExtended[] = this.getOutputs();
 

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -50,7 +50,7 @@ export abstract class SharedInteractionTransaction<
      * Script signer for the interaction
      * @protected
      */
-    protected readonly scriptSigner: Signer;
+    protected readonly scriptSigner: Signer | ECPairInterface;
 
     /**
      * Disable auto refund
@@ -73,7 +73,7 @@ export abstract class SharedInteractionTransaction<
         this.scriptSigner = this.generateKeyPairFromSeed();
 
         this.calldataGenerator = new CalldataGenerator(
-            this.signer.publicKey,
+            Buffer.from(this.signer.publicKey),
             this.scriptSignerXOnlyPubKey(),
             this.network,
         );
@@ -113,7 +113,7 @@ export abstract class SharedInteractionTransaction<
      * @returns {Buffer} The internal pubkey as an x-only key
      */
     protected scriptSignerXOnlyPubKey(): Buffer {
-        return toXOnly(this.scriptSigner.publicKey);
+        return toXOnly(Buffer.from(this.scriptSigner.publicKey));
     }
 
     /**
@@ -362,10 +362,10 @@ export abstract class SharedInteractionTransaction<
      * @returns {Buffer[]} The public keys
      */
     private getPubKeys(): Buffer[] {
-        const pubkeys = [this.signer.publicKey];
+        const pubkeys = [Buffer.from(this.signer.publicKey)];
 
         if (this.scriptSigner) {
-            pubkeys.push(this.scriptSigner.publicKey);
+            pubkeys.push(Buffer.from(this.scriptSigner.publicKey));
         }
 
         return pubkeys;

package/src/transaction/builders/TransactionBuilder.ts

@@ -43,65 +43,79 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      * @description Cost in satoshis of the transaction fee
      */
     public transactionFee: bigint = 0n;
+
     /**
      * @description The estimated fees of the transaction
      */
     public estimatedFees: bigint = 0n;
+
     /**
      * @param {ITransactionParameters} parameters - The transaction parameters
      */
-
     public optionalOutputs: PsbtOutputExtended[] | undefined;
+
     /**
      * @description The transaction itself.
      */
     protected transaction: Psbt;
+
     /**
      * @description Inputs to update later on.
      */
     protected readonly updateInputs: UpdateInput[] = [];
+
     /**
      * @description The outputs of the transaction
      */
     protected readonly outputs: PsbtOutputExtended[] = [];
+
     /**
      * @description Output that will be used to pay the fees
      */
     protected feeOutput: PsbtOutputExtended | null = null;
+
     /**
      * @description The total amount of satoshis in the inputs
      */
     protected totalInputAmount: bigint;
+
     /**
      * @description The signer of the transaction
      */
-    protected readonly signer: Signer;
+    protected readonly signer: Signer | ECPairInterface;
+
     /**
      * @description The network where the transaction will be broadcasted
      */
     protected readonly network: Network;
+
     /**
      * @description The fee rate of the transaction
      */
     protected readonly feeRate: number;
+
     /**
      * @description The opnet priority fee of the transaction
      */
     protected priorityFee: bigint;
+
     /**
      * @description The utxos used in the transaction
      */
     protected utxos: UTXO[];
+
     /**
      * @description The address where the transaction is sent to
      * @protected
      */
     protected to: Address | undefined;
+
     /**
      * @description The address where the transaction is sent from
      * @protected
      */
     protected from: Address;
+
     /**
      * @description The maximum fee rate of the transaction
      */
@@ -131,11 +145,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
 
         this.optionalOutputs = parameters.optionalOutputs;
 
-        this.from = TransactionBuilder.getFrom(
-            parameters.from,
-            this.signer as ECPairInterface,
-            this.network,
-        );
+        this.from = TransactionBuilder.getFrom(parameters.from, this.signer, this.network);
 
         this.totalInputAmount = this.calculateTotalUTXOAmount();
 
@@ -151,7 +161,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
 
     public static getFrom(
         from: string | undefined,
-        keypair: ECPairInterface,
+        keypair: ECPairInterface | Signer,
         network: Network,
     ): Address {
         return from || EcKeyPair.getTaprootAddress(keypair, network);

package/src/transaction/builders/UnwrapSegwitTransaction.ts

@@ -10,6 +10,7 @@ import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { IWBTCUTXODocument, PsbtTransaction, VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { PsbtInputExtended, PsbtOutputExtended } from '../interfaces/Tap.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';
+import { ECPairInterface } from 'ecpair';
 
 const abiCoder: ABICoder = new ABICoder();
 
@@ -196,7 +197,10 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction<Transa
      * @returns {Promise<boolean>}
      * @throws {Error} - If something went wrong while building the transaction
      */
-    protected async internalBuildTransaction(transaction: Psbt, checkPartialSigs: boolean = false): Promise<boolean> {
+    protected async internalBuildTransaction(
+        transaction: Psbt,
+        checkPartialSigs: boolean = false,
+    ): Promise<boolean> {
         if (transaction.data.inputs.length === 0) {
             const inputs: PsbtInputExtended[] = this.getInputs();
             const outputs: PsbtOutputExtended[] = this.getOutputs();
@@ -300,12 +304,12 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction<Transa
     /**
      * @description Add vault inputs to the transaction
      * @param {VaultUTXOs} vault The vault UTXOs
-     * @param {Signer} [firstSigner] The first signer
+     * @param {Signer | ECPairInterface} [firstSigner] The first signer
      * @private
      */
     private async addVaultInputs(
         vault: VaultUTXOs,
-        firstSigner: Signer = this.signer,
+        firstSigner: Signer | ECPairInterface = this.signer,
     ): Promise<void> {
         const p2wshOutput = this.generateMultiSignRedeemScript(vault.publicKeys, vault.minimum);
         for (const utxo of vault.utxos) {

package/src/transaction/builders/UnwrapTransaction.ts

@@ -109,7 +109,7 @@ export class UnwrapTransaction extends SharedInteractionTransaction<TransactionT
         this.contractSecret = this.generateSecret();
 
         this.calldataGenerator = new CalldataGenerator(
-            this.signer.publicKey,
+            Buffer.from(this.signer.publicKey),
             this.scriptSignerXOnlyPubKey(),
             this.network,
         );
@@ -372,7 +372,7 @@ export class UnwrapTransaction extends SharedInteractionTransaction<TransactionT
 
         return [
             this.contractSecret,
-            toXOnly(this.signer.publicKey),
+            toXOnly(Buffer.from(this.signer.publicKey)),
             input.tapScriptSig[0].signature,
             input.tapScriptSig[1].signature,
         ];

package/src/transaction/builders/WrapTransaction.ts

@@ -6,7 +6,6 @@ import { SharedInteractionTransaction } from './SharedInteractionTransaction.js'
 import { wBTC } from '../../metadata/contracts/wBTC.js';
 import { ABICoder, Address, BinaryWriter, Selector } from '@btc-vision/bsi-binary';
 import { TransactionBuilder } from './TransactionBuilder.js';
-import { ECPairInterface } from 'ecpair';
 import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { AddressVerificator } from '../../keypair/AddressVerificator.js';
@@ -94,11 +93,7 @@ export class WrapTransaction extends SharedInteractionTransaction<TransactionTyp
 
         const receiver: Address =
             parameters.receiver ||
-            TransactionBuilder.getFrom(
-                parameters.from,
-                parameters.signer as ECPairInterface,
-                parameters.network,
-            );
+            TransactionBuilder.getFrom(parameters.from, parameters.signer, parameters.network);
 
         parameters.calldata = WrapTransaction.generateMintCalldata(
             parameters.amount,

package/src/transaction/shared/TweakedTransaction.ts

@@ -11,7 +11,7 @@ import { ChainId } from '../../network/ChainId.js';
 import { varuint } from 'bitcoinjs-lib/src/bufferutils.js';
 
 export interface ITweakedTransactionData {
-    readonly signer: Signer;
+    readonly signer: Signer | ECPairInterface;
     readonly network: Network;
     readonly chainId?: ChainId;
     readonly nonWitnessUtxo?: Buffer;
@@ -34,11 +34,11 @@ export abstract class TweakedTransaction extends Logger {
     /**
      * @description Was the transaction signed?
      */
-    protected signer: Signer;
+    protected signer: Signer | ECPairInterface;
     /**
      * @description Tweaked signer
      */
-    protected tweakedSigner?: Signer;
+    protected tweakedSigner?: ECPairInterface;
     /**
      * @description The network of the transaction
      */
@@ -190,7 +190,7 @@ export abstract class TweakedTransaction extends Logger {
         transaction: Psbt,
         input: PsbtInput,
         i: number,
-        signer: Signer,
+        signer: Signer | ECPairInterface,
         sighashTypes: number[],
     ): void {
         if (sighashTypes && sighashTypes[0]) input.sighashType = sighashTypes[0];
@@ -336,9 +336,9 @@ export abstract class TweakedTransaction extends Logger {
     /**
      * Returns the signer key.
      * @protected
-     * @returns {Signer}
+     * @returns {Signer | ECPairInterface}
      */
-    protected getSignerKey(): Signer {
+    protected getSignerKey(): Signer | ECPairInterface {
         return this.signer;
     }
 
@@ -354,7 +354,7 @@ export abstract class TweakedTransaction extends Logger {
         transaction: Psbt,
         input: PsbtInput,
         i: number,
-        signer?: Signer,
+        signer?: Signer | ECPairInterface,
     ): Promise<void> {
         const signHash =
             this.sighashTypes && this.sighashTypes.length
@@ -367,7 +367,7 @@ export abstract class TweakedTransaction extends Logger {
         if (input.tapInternalKey) {
             if (!this.tweakedSigner) this.tweakSigner();
 
-            let tweakedSigner: Signer | undefined;
+            let tweakedSigner: ECPairInterface | undefined;
             if (signer !== this.signer) {
                 tweakedSigner = this.getTweakedSigner(true, signer);
             } else {
@@ -481,7 +481,7 @@ export abstract class TweakedTransaction extends Logger {
      * @returns {Buffer}
      */
     protected internalPubKeyToXOnly(): Buffer {
-        return toXOnly(this.signer.publicKey);
+        return toXOnly(Buffer.from(this.signer.publicKey));
     }
 
     /**
@@ -507,12 +507,12 @@ export abstract class TweakedTransaction extends Logger {
     /**
      * Get the tweaked signer
      * @private
-     * @returns {Signer} The tweaked signer
+     * @returns {ECPairInterface} The tweaked signer
      */
     protected getTweakedSigner(
         useTweakedHash: boolean = false,
-        signer: Signer = this.signer,
-    ): Signer | undefined {
+        signer: Signer | ECPairInterface = this.signer,
+    ): ECPairInterface | undefined {
         const settings: TweakSettings = {
             network: this.network,
         };