@btc-vision/transaction 1.0.111 → 1.0.113

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(
-            toXOnly(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,
         };

package/src/verification/TapscriptVerificator.ts

@@ -6,7 +6,7 @@ import { TransactionBuilder } from '../transaction/builders/TransactionBuilder.j
 import { AddressGenerator } from '../generators/AddressGenerator.js';
 
 export interface ContractAddressVerificationParams {
-    readonly deployerPubKeyXOnly: Buffer;
+    readonly deployerPubKey: Buffer;
     readonly contractSaltPubKey: Buffer;
     readonly originalSalt: Buffer;
     readonly bytecode: Buffer;
@@ -22,7 +22,7 @@ export class TapscriptVerificator {
     ): string | undefined {
         const network = params.network || networks.bitcoin;
         const scriptBuilder: DeploymentGenerator = new DeploymentGenerator(
-            params.deployerPubKeyXOnly,
+            params.deployerPubKey,
             toXOnly(params.contractSaltPubKey),
             network,
         );
@@ -80,7 +80,7 @@ export class TapscriptVerificator {
         const network = params.network || networks.bitcoin;
 
         const transactionData: Payment = {
-            internalPubkey: params.deployerPubKeyXOnly,
+            internalPubkey: toXOnly(params.deployerPubKey),
             network: network,
             scriptTree: scriptTree,
         };