@btc-vision/transaction 1.0.116 → 1.0.117

package/browser/keypair/Address.d.ts

@@ -6,6 +6,7 @@ export declare class Address extends Uint8Array {
     constructor(bytes?: ArrayLike<number>);
     private _keyPair;
     get keyPair(): ECPairInterface;
+    get tweakedBytes(): Uint8Array;
     static dead(): Address;
     static fromString(pubKey: string): Address;
     static wrap(bytes: ArrayLike<number>): Address;

package/browser/transaction/builders/MultiSignTransaction.d.ts

@@ -1,5 +1,4 @@
-import { PsbtInput, TapScriptSig } from 'bip174/src/lib/interfaces.js';
-import { Payment, Psbt, Signer } from 'bitcoinjs-lib';
+import { Payment, Psbt, PsbtInput, Signer, TapScriptSig } from 'bitcoinjs-lib';
 import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';

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

@@ -1,5 +1,4 @@
-import { PsbtInput } from 'bip174/src/lib/interfaces.js';
-import { Payment, Psbt, Signer } from 'bitcoinjs-lib';
+import { Payment, Psbt, PsbtInput, Signer } from 'bitcoinjs-lib';
 import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { ECPairInterface } from 'ecpair';
 import { TransactionBuilder } from './TransactionBuilder.js';
@@ -33,7 +32,6 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected customFinalizer: (_inputIndex: number, input: PsbtInput) => {
         finalScriptWitness: Buffer;
     };
-    private signIndividualInputs;
     private getPubKeys;
     private generateRedeemScripts;
 }

package/browser/transaction/builders/TransactionBuilder.d.ts

@@ -1,5 +1,5 @@
-import { Network, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
-import { PsbtInputExtended, PsbtOutputExtended, UpdateInput } from '../interfaces/Tap.js';
+import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from 'bitcoinjs-lib';
+import { UpdateInput } from '../interfaces/Tap.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IFundingTransactionParameters, ITransactionParameters } from '../interfaces/ITransactionParameters.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';

package/browser/transaction/builders/UnwrapTransaction.d.ts

@@ -2,9 +2,8 @@ import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IUnwrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
-import { Network, Payment, Psbt } from 'bitcoinjs-lib';
+import { Network, Payment, Psbt, PsbtInput } from 'bitcoinjs-lib';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
-import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 export declare class UnwrapTransaction extends SharedInteractionTransaction<TransactionType.WBTC_UNWRAP> {
     private static readonly UNWRAP_SELECTOR;
     type: TransactionType.WBTC_UNWRAP;

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

@@ -3,8 +3,8 @@ import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
 import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { ChainId } from '../../network/ChainId.js';
-import { PsbtOutputExtended } from './Tap.js';
 import { Address } from '../../keypair/Address.js';
+import { PsbtOutputExtended } from 'bitcoinjs-lib';
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: string;
     readonly to?: string;

package/browser/transaction/interfaces/Tap.d.ts

@@ -1,5 +1,4 @@
-import { PsbtInput, PsbtOutput } from 'bip174/src/lib/interfaces.js';
-import { TransactionInput } from 'bitcoinjs-lib/src/psbt.js';
+import { PsbtInput as _PsbtInput, PsbtInputUpdate as _PsbtInputUpdate, PsbtOutput as _PsbtOutput, TapBip32Derivation as _TapBip32Derivation, TapInternalKey as _TapInternalKey, TapKeySig as _TapKeySig, TapLeaf as _TapLeaf, TapLeafScript as _TapLeafScript, TapMerkleRoot as _TapMerkleRoot, TapScriptSig as _TapScriptSig, TapTree as _TapTree } from 'bitcoinjs-lib';
 export interface TapLeafScript {
     readonly leafVersion: number;
     readonly controlBlock: Buffer;
@@ -8,14 +7,25 @@ export interface TapLeafScript {
 export interface UpdateInput {
     tapLeafScript: TapLeafScript[];
 }
-export interface PsbtInputExtended extends PsbtInput, TransactionInput {
+export interface PsbtInput extends _PsbtInput {
 }
-export interface PsbtOutputExtendedAddress extends PsbtOutput {
-    address: string;
-    value: number;
+export interface PsbtOutput extends _PsbtOutput {
 }
-export interface PsbtOutputExtendedScript extends PsbtOutput {
-    script: Buffer;
-    value: number;
+export interface TapInternalKey extends _TapInternalKey {
+}
+export interface TapLeaf extends _TapLeaf {
+}
+export interface TapScriptSig extends _TapScriptSig {
+}
+export interface TapKeySig extends _TapKeySig {
+}
+export interface TapTree extends _TapTree {
+}
+export interface TapMerkleRoot extends _TapMerkleRoot {
+}
+export interface TapLeafScript extends _TapLeafScript {
+}
+export interface TapBip32Derivation extends _TapBip32Derivation {
+}
+export interface PsbtInputUpdate extends _PsbtInputUpdate {
 }
-export type PsbtOutputExtended = PsbtOutputExtendedAddress | PsbtOutputExtendedScript;

package/browser/transaction/processor/PsbtTransaction.d.ts

@@ -1,5 +1,4 @@
-import { Network, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
-import { PsbtInputExtended, PsbtOutputExtended } from '../interfaces/Tap.js';
+import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from 'bitcoinjs-lib';
 import { ITweakedTransactionData, TweakedTransaction } from '../shared/TweakedTransaction.js';
 export interface PsbtTransactionData extends ITweakedTransactionData {
     readonly psbt: Psbt;

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

@@ -1,9 +1,8 @@
 import { Logger } from '@btc-vision/logger';
-import { Network, Payment, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
+import { Network, Payment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from 'bitcoinjs-lib';
 import { ECPairInterface } from 'ecpair';
-import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { PsbtInputExtended, TapLeafScript } from '../interfaces/Tap.js';
+import { TapLeafScript } from '../interfaces/Tap.js';
 import { ChainId } from '../../network/ChainId.js';
 export interface ITweakedTransactionData {
     readonly signer: Signer | ECPairInterface;

package/browser/verification/TapscriptVerificator.d.ts

@@ -11,6 +11,7 @@ export interface ContractAddressVerificationParams {
 export declare class TapscriptVerificator {
     private static readonly TAP_SCRIPT_VERSION;
     static getContractAddress(params: ContractAddressVerificationParams): string | undefined;
+    static verifyControlBlock(params: ContractAddressVerificationParams, controlBlock: Buffer): boolean;
     static getContractSeed(deployerPubKey: Buffer, bytecode: Buffer, saltHash: Buffer): Buffer;
     static generateContractVirtualAddress(deployerPubKey: Buffer, bytecode: Buffer, saltHash: Buffer, network?: Network): string;
     static generateAddressFromScript(params: ContractAddressVerificationParams, scriptTree: Taptree): string | undefined;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.116";
+export declare const version = "1.0.117";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.116';
+export const version = '1.0.117';

package/build/buffer/BinaryWriter.js

@@ -240,10 +240,10 @@ export class BinaryWriter {
         });
     }
     fromAddress(pubKey) {
-        if (pubKey.byteLength > ADDRESS_BYTE_LENGTH) {
+        if (pubKey.tweakedBytes.byteLength > ADDRESS_BYTE_LENGTH) {
             throw new Error(`Address is too long ${pubKey.byteLength} > ${ADDRESS_BYTE_LENGTH} bytes`);
         }
-        return pubKey;
+        return pubKey.tweakedBytes;
     }
     resize(size) {
         const buf = new Uint8Array(this.buffer.byteLength + size);

package/build/keypair/Address.d.ts

@@ -6,6 +6,7 @@ export declare class Address extends Uint8Array {
     constructor(bytes?: ArrayLike<number>);
     private _keyPair;
     get keyPair(): ECPairInterface;
+    get tweakedBytes(): Uint8Array;
     static dead(): Address;
     static fromString(pubKey: string): Address;
     static wrap(bytes: ArrayLike<number>): Address;

package/build/keypair/Address.js

@@ -9,17 +9,18 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _Address_p2tr, _Address_network;
+var _Address_p2tr, _Address_network, _Address_tweakedBytes;
 import { EcKeyPair } from './EcKeyPair.js';
 import { ADDRESS_BYTE_LENGTH } from '../utils/types.js';
 import { AddressVerificator } from './AddressVerificator.js';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 export class Address extends Uint8Array {
     constructor(bytes) {
-        super(ADDRESS_BYTE_LENGTH);
+        super(bytes?.length || ADDRESS_BYTE_LENGTH);
         this.isP2TROnly = false;
         _Address_p2tr.set(this, void 0);
         _Address_network.set(this, void 0);
+        _Address_tweakedBytes.set(this, void 0);
         if (!bytes) {
             return;
         }
@@ -31,10 +32,16 @@ export class Address extends Uint8Array {
         }
         return this._keyPair;
     }
+    get tweakedBytes() {
+        return __classPrivateFieldGet(this, _Address_tweakedBytes, "f") || this;
+    }
     static dead() {
         return Address.fromString('0x04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f');
     }
     static fromString(pubKey) {
+        if (!pubKey) {
+            throw new Error('Invalid public key');
+        }
         if (pubKey.startsWith('0x')) {
             pubKey = pubKey.slice(2);
         }
@@ -47,20 +54,24 @@ export class Address extends Uint8Array {
         return '0x' + Buffer.from(this).toString('hex');
     }
     equals(a) {
-        if (a.length !== this.length) {
+        const b = this.isP2TROnly ? this : __classPrivateFieldGet(this, _Address_tweakedBytes, "f");
+        const c = a.isP2TROnly ? a : __classPrivateFieldGet(a, _Address_tweakedBytes, "f");
+        if (c.length !== b.length) {
             return false;
         }
-        for (let i = 0; i < this.length; i++) {
-            if (this[i] !== a[i]) {
+        for (let i = 0; i < b.length; i++) {
+            if (b[i] !== c[i]) {
                 return false;
             }
         }
         return true;
     }
     lessThan(a) {
+        const b = this.isP2TROnly ? this : __classPrivateFieldGet(this, _Address_tweakedBytes, "f");
+        const c = a.isP2TROnly ? a : __classPrivateFieldGet(a, _Address_tweakedBytes, "f");
         for (let i = 0; i < 32; i++) {
-            const thisByte = this[i];
-            const aByte = a[i];
+            const thisByte = b[i];
+            const aByte = c[i];
             if (thisByte < aByte) {
                 return true;
             }
@@ -71,9 +82,11 @@ export class Address extends Uint8Array {
         return false;
     }
     greaterThan(a) {
+        const b = this.isP2TROnly ? this : __classPrivateFieldGet(this, _Address_tweakedBytes, "f");
+        const c = a.isP2TROnly ? a : __classPrivateFieldGet(a, _Address_tweakedBytes, "f");
         for (let i = 0; i < 32; i++) {
-            const thisByte = this[i];
-            const aByte = a[i];
+            const thisByte = b[i];
+            const aByte = c[i];
             if (thisByte > aByte) {
                 return true;
             }
@@ -85,7 +98,7 @@ export class Address extends Uint8Array {
     }
     set(publicKey) {
         if (publicKey.length !== 33 && publicKey.length !== 32 && publicKey.length !== 65) {
-            throw new Error('Invalid public key length');
+            throw new Error(`Invalid public key length ${publicKey.length}`);
         }
         if (publicKey.length === 32) {
             this.isP2TROnly = true;
@@ -95,8 +108,8 @@ export class Address extends Uint8Array {
         }
         else {
             this._keyPair = EcKeyPair.fromPublicKey(Uint8Array.from(publicKey));
-            const tweaked = toXOnly(Buffer.from(EcKeyPair.tweakPublicKey(this._keyPair.publicKey.toString('hex')), 'hex'));
-            super.set(Uint8Array.from(tweaked));
+            __classPrivateFieldSet(this, _Address_tweakedBytes, toXOnly(Buffer.from(EcKeyPair.tweakPublicKey(this._keyPair.publicKey.toString('hex')), 'hex')), "f");
+            super.set(publicKey);
         }
     }
     isValid(network) {
@@ -121,13 +134,7 @@ export class Address extends Uint8Array {
         if (__classPrivateFieldGet(this, _Address_p2tr, "f") && __classPrivateFieldGet(this, _Address_network, "f") === network) {
             return __classPrivateFieldGet(this, _Address_p2tr, "f");
         }
-        let p2trAddy;
-        if (this._keyPair) {
-            p2trAddy = EcKeyPair.getTaprootAddress(this.keyPair, network);
-        }
-        else if (this.isP2TROnly) {
-            p2trAddy = EcKeyPair.tweakedPubKeyBufferToAddress(this, network);
-        }
+        const p2trAddy = EcKeyPair.tweakedPubKeyBufferToAddress(this.isP2TROnly ? this : __classPrivateFieldGet(this, _Address_tweakedBytes, "f"), network);
         if (p2trAddy) {
             __classPrivateFieldSet(this, _Address_network, network, "f");
             __classPrivateFieldSet(this, _Address_p2tr, p2trAddy, "f");
@@ -136,4 +143,4 @@ export class Address extends Uint8Array {
         throw new Error('Public key not set');
     }
 }
-_Address_p2tr = new WeakMap(), _Address_network = new WeakMap();
+_Address_p2tr = new WeakMap(), _Address_network = new WeakMap(), _Address_tweakedBytes = new WeakMap();

package/build/keypair/Wallet.js

@@ -11,7 +11,7 @@ export class Wallet {
         this._legacy = EcKeyPair.getLegacyAddress(this._keypair, this.network);
         this._segwitLegacy = EcKeyPair.getLegacySegwitAddress(this._keypair, this.network);
         this._tweakedKey = Buffer.from(EcKeyPair.tweakPublicKey(this._keypair.publicKey.toString('hex')), 'hex');
-        this._bufferPubKey = Buffer.from(wallet.publicKey, 'hex');
+        this._bufferPubKey = this._keypair.publicKey;
         this._address = new Address(this._keypair.publicKey);
     }
     get address() {

package/build/transaction/builders/DeploymentTransaction.js

@@ -48,8 +48,8 @@ export class DeploymentTransaction extends TransactionBuilder {
         this.compiledTargetScript = this.deploymentGenerator.compile(this.bytecode, this.randomBytes, this.calldata);
         this.scriptTree = this.getScriptTree();
         this.internalInit();
-        this._contractPubKey = '0x' + this.contractSigner.publicKey.toString('hex');
-        this._contractAddress = new Address(this.contractSigner.publicKey);
+        this._contractPubKey = '0x' + this.contractSeed.toString('hex');
+        this._contractAddress = new Address(this.contractSeed);
     }
     get contractPubKey() {
         return this._contractPubKey;
@@ -91,7 +91,7 @@ export class DeploymentTransaction extends TransactionBuilder {
         const amountSpent = this.getTransactionOPNetFee();
         this.addOutput({
             value: Number(amountSpent),
-            address: this.to,
+            address: this.contractAddress.p2tr(this.network),
         });
         await this.addRefundOutput(amountSpent);
     }

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

@@ -1,5 +1,4 @@
-import { PsbtInput, TapScriptSig } from 'bip174/src/lib/interfaces.js';
-import { Payment, Psbt, Signer } from 'bitcoinjs-lib';
+import { Payment, Psbt, PsbtInput, Signer, TapScriptSig } from 'bitcoinjs-lib';
 import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';

package/build/transaction/builders/MultiSignTransaction.js

@@ -1,4 +1,4 @@
-import { crypto as bitcoinCrypto, opcodes, Psbt, script } from 'bitcoinjs-lib';
+import { crypto as bitcoinCrypto, opcodes, Psbt, script, } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.js';

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

@@ -1,5 +1,4 @@
-import { PsbtInput } from 'bip174/src/lib/interfaces.js';
-import { Payment, Psbt, Signer } from 'bitcoinjs-lib';
+import { Payment, Psbt, PsbtInput, Signer } from 'bitcoinjs-lib';
 import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { ECPairInterface } from 'ecpair';
 import { TransactionBuilder } from './TransactionBuilder.js';
@@ -33,7 +32,6 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected customFinalizer: (_inputIndex: number, input: PsbtInput) => {
         finalScriptWitness: Buffer;
     };
-    private signIndividualInputs;
     private getPubKeys;
     private generateRedeemScripts;
 }

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -88,31 +88,16 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             await super.signInputs(transaction);
             return;
         }
-        const txs = transaction.data.inputs;
-        for (let i = 0; i < txs.length; i += 20) {
-            const batch = txs.slice(i, i + 20);
-            const promises = [];
-            for (let y = 0; y < batch.length; y++) {
-                const offset = i * 20 + y;
-                const input = batch[y];
-                promises.push(this.signIndividualInputs(transaction, input, offset));
+        for (let i = 0; i < transaction.data.inputs.length; i++) {
+            if (i === 0) {
+                transaction.signInput(0, this.scriptSigner);
+                transaction.signInput(0, this.getSignerKey());
+                transaction.finalizeInput(0, this.customFinalizer);
             }
-            await Promise.all(promises).catch((e) => {
-                throw e;
-            });
-        }
-        try {
-            transaction.finalizeInput(0, this.customFinalizer);
-        }
-        catch (e) {
-            this.error(`Failed to finalize input 0: ${e.stack}`);
-        }
-        for (let i = 0; i < txs.length; i++) {
-            try {
+            else {
+                transaction.signInput(i, this.getSignerKey());
                 transaction.finalizeInput(i);
-                this.log(`Finalized input ${i}!`);
             }
-            catch { }
         }
     }
     generateScriptAddress() {
@@ -166,27 +151,6 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             },
         ];
     }
-    async signIndividualInputs(transaction, input, i) {
-        let signed = false;
-        try {
-            await this.signInput(transaction, input, i, this.scriptSigner);
-            signed = true;
-        }
-        catch { }
-        try {
-            await this.signInput(transaction, input, i);
-            signed = true;
-        }
-        catch { }
-        if (signed) {
-            this.log(`Signed input #${i} out of ${transaction.data.inputs.length}! {Signed: ${signed}}`);
-            return;
-        }
-        if (this.regenerated || this.ignoreSignatureErrors) {
-            return;
-        }
-        throw new Error('Failed to sign input');
-    }
     getPubKeys() {
         const pubkeys = [Buffer.from(this.signer.publicKey)];
         if (this.scriptSigner) {

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

@@ -1,5 +1,5 @@
-import { Network, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
-import { PsbtInputExtended, PsbtOutputExtended, UpdateInput } from '../interfaces/Tap.js';
+import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from 'bitcoinjs-lib';
+import { UpdateInput } from '../interfaces/Tap.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IFundingTransactionParameters, ITransactionParameters } from '../interfaces/ITransactionParameters.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';

package/build/transaction/builders/TransactionBuilder.js

@@ -1,4 +1,4 @@
-import { initEccLib, opcodes, Psbt, script, Transaction } from 'bitcoinjs-lib';
+import { initEccLib, opcodes, Psbt, script, Transaction, } from 'bitcoinjs-lib';
 import { varuint } from 'bitcoinjs-lib/src/bufferutils.js';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';

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

@@ -2,9 +2,8 @@ import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IUnwrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
-import { Network, Payment, Psbt } from 'bitcoinjs-lib';
+import { Network, Payment, Psbt, PsbtInput } from 'bitcoinjs-lib';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
-import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 export declare class UnwrapTransaction extends SharedInteractionTransaction<TransactionType.WBTC_UNWRAP> {
     private static readonly UNWRAP_SELECTOR;
     type: TransactionType.WBTC_UNWRAP;

package/build/transaction/builders/UnwrapTransaction.js

@@ -2,7 +2,7 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
-import { payments } from 'bitcoinjs-lib';
+import { payments, } from 'bitcoinjs-lib';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { PsbtTransaction } from '../processor/PsbtTransaction.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.js';

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

@@ -3,8 +3,8 @@ import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
 import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { ChainId } from '../../network/ChainId.js';
-import { PsbtOutputExtended } from './Tap.js';
 import { Address } from '../../keypair/Address.js';
+import { PsbtOutputExtended } from 'bitcoinjs-lib';
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: string;
     readonly to?: string;

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

@@ -1,5 +1,4 @@
-import { PsbtInput, PsbtOutput } from 'bip174/src/lib/interfaces.js';
-import { TransactionInput } from 'bitcoinjs-lib/src/psbt.js';
+import { PsbtInput as _PsbtInput, PsbtInputUpdate as _PsbtInputUpdate, PsbtOutput as _PsbtOutput, TapBip32Derivation as _TapBip32Derivation, TapInternalKey as _TapInternalKey, TapKeySig as _TapKeySig, TapLeaf as _TapLeaf, TapLeafScript as _TapLeafScript, TapMerkleRoot as _TapMerkleRoot, TapScriptSig as _TapScriptSig, TapTree as _TapTree } from 'bitcoinjs-lib';
 export interface TapLeafScript {
     readonly leafVersion: number;
     readonly controlBlock: Buffer;
@@ -8,14 +7,25 @@ export interface TapLeafScript {
 export interface UpdateInput {
     tapLeafScript: TapLeafScript[];
 }
-export interface PsbtInputExtended extends PsbtInput, TransactionInput {
+export interface PsbtInput extends _PsbtInput {
 }
-export interface PsbtOutputExtendedAddress extends PsbtOutput {
-    address: string;
-    value: number;
+export interface PsbtOutput extends _PsbtOutput {
 }
-export interface PsbtOutputExtendedScript extends PsbtOutput {
-    script: Buffer;
-    value: number;
+export interface TapInternalKey extends _TapInternalKey {
+}
+export interface TapLeaf extends _TapLeaf {
+}
+export interface TapScriptSig extends _TapScriptSig {
+}
+export interface TapKeySig extends _TapKeySig {
+}
+export interface TapTree extends _TapTree {
+}
+export interface TapMerkleRoot extends _TapMerkleRoot {
+}
+export interface TapLeafScript extends _TapLeafScript {
+}
+export interface TapBip32Derivation extends _TapBip32Derivation {
+}
+export interface PsbtInputUpdate extends _PsbtInputUpdate {
 }
-export type PsbtOutputExtended = PsbtOutputExtendedAddress | PsbtOutputExtendedScript;

package/build/transaction/processor/PsbtTransaction.d.ts

@@ -1,5 +1,4 @@
-import { Network, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
-import { PsbtInputExtended, PsbtOutputExtended } from '../interfaces/Tap.js';
+import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from 'bitcoinjs-lib';
 import { ITweakedTransactionData, TweakedTransaction } from '../shared/TweakedTransaction.js';
 export interface PsbtTransactionData extends ITweakedTransactionData {
     readonly psbt: Psbt;

package/build/transaction/processor/PsbtTransaction.js

@@ -1,4 +1,4 @@
-import { Psbt } from 'bitcoinjs-lib';
+import { Psbt, } from 'bitcoinjs-lib';
 import { TweakedTransaction } from '../shared/TweakedTransaction.js';
 export class PsbtTransaction extends TweakedTransaction {
     constructor(data) {

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

@@ -1,9 +1,8 @@
 import { Logger } from '@btc-vision/logger';
-import { Network, Payment, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
+import { Network, Payment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from 'bitcoinjs-lib';
 import { ECPairInterface } from 'ecpair';
-import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { PsbtInputExtended, TapLeafScript } from '../interfaces/Tap.js';
+import { TapLeafScript } from '../interfaces/Tap.js';
 import { ChainId } from '../../network/ChainId.js';
 export interface ITweakedTransactionData {
     readonly signer: Signer | ECPairInterface;

package/build/transaction/shared/TweakedTransaction.js

@@ -1,5 +1,5 @@
 import { Logger } from '@btc-vision/logger';
-import { payments } from 'bitcoinjs-lib';
+import { payments, } from 'bitcoinjs-lib';
 import { TweakedSigner } from '../../signer/TweakedSigner.js';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 import { AddressVerificator } from '../../keypair/AddressVerificator.js';

package/build/verification/TapscriptVerificator.d.ts

@@ -11,6 +11,7 @@ export interface ContractAddressVerificationParams {
 export declare class TapscriptVerificator {
     private static readonly TAP_SCRIPT_VERSION;
     static getContractAddress(params: ContractAddressVerificationParams): string | undefined;
+    static verifyControlBlock(params: ContractAddressVerificationParams, controlBlock: Buffer): boolean;
     static getContractSeed(deployerPubKey: Buffer, bytecode: Buffer, saltHash: Buffer): Buffer;
     static generateContractVirtualAddress(deployerPubKey: Buffer, bytecode: Buffer, saltHash: Buffer, network?: Network): string;
     static generateAddressFromScript(params: ContractAddressVerificationParams, scriptTree: Taptree): string | undefined;

package/build/verification/TapscriptVerificator.js

@@ -20,6 +20,37 @@ export class TapscriptVerificator {
         ];
         return TapscriptVerificator.generateAddressFromScript(params, scriptTree);
     }
+    static verifyControlBlock(params, controlBlock) {
+        const network = params.network || networks.bitcoin;
+        const scriptBuilder = new DeploymentGenerator(params.deployerPubKey, toXOnly(params.contractSaltPubKey), network);
+        const compiledTargetScript = scriptBuilder.compile(params.bytecode, params.originalSalt, params.calldata);
+        const scriptTree = [
+            {
+                output: compiledTargetScript,
+                version: TapscriptVerificator.TAP_SCRIPT_VERSION,
+            },
+            {
+                output: TransactionBuilder.LOCK_LEAF_SCRIPT,
+                version: TapscriptVerificator.TAP_SCRIPT_VERSION,
+            },
+        ];
+        const tapData = payments.p2tr({
+            internalPubkey: toXOnly(params.deployerPubKey),
+            network: network,
+            scriptTree: scriptTree,
+            redeem: {
+                pubkeys: [params.deployerPubKey, params.contractSaltPubKey],
+                output: compiledTargetScript,
+                redeemVersion: TapscriptVerificator.TAP_SCRIPT_VERSION,
+            },
+        });
+        const witness = tapData.witness;
+        if (!witness || witness.length === 0) {
+            return false;
+        }
+        const requiredControlBlock = witness[witness.length - 1];
+        return requiredControlBlock.equals(controlBlock);
+    }
     static getContractSeed(deployerPubKey, bytecode, saltHash) {
         const sha256OfBytecode = bitCrypto.hash256(bytecode);
         const buf = Buffer.concat([deployerPubKey, saltHash, sha256OfBytecode]);

package/eslint.config.js

@@ -28,6 +28,7 @@ export default tseslint.config(
             '@typescript-eslint/no-unnecessary-type-parameters': 'off',
             '@typescript-eslint/no-duplicate-enum-values': 'off',
             'prefer-spread': 'off',
+            '@typescript-eslint/no-empty-object-type': 'off',
         },
     },
     {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.0.116",
+    "version": "1.0.117",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.116';
+export const version = '1.0.117';