@btc-vision/transaction 1.0.115 → 1.0.117

package/build/utils/types.d.ts

@@ -4,6 +4,7 @@ export type MemorySlotPointer = bigint;
 export type BufferLike = Uint8Array | Buffer;
 export type MemorySlotData<T> = T;
 export type PointerStorage = DeterministicMap<MemorySlotPointer, MemorySlotData<bigint>>;
+export type BlockchainStorage = DeterministicMap<string, PointerStorage>;
 export type i32 = number;
 export type u8 = number;
 export type u16 = number;

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.115",
+    "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.115';
+export const version = '1.0.117';

package/src/buffer/BinaryWriter.ts

@@ -306,13 +306,13 @@ export class BinaryWriter {
     }
 
     private fromAddress(pubKey: Address): Uint8Array {
-        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;
     }
 
     private resize(size: u32): void {

package/src/deterministic/AddressMap.ts

@@ -54,4 +54,10 @@ export class AddressMap<V> extends Map<Address, V> {
 
         return true;
     }
+
+    *[Symbol.iterator](): IterableIterator<[Address, V]> {
+        for (const key of this._keys) {
+            yield [key, this.get(key) as V];
+        }
+    }
 }

package/src/deterministic/AddressSet.ts

@@ -1,4 +1,3 @@
-import { i32 } from '../utils/types.js';
 import { Address } from '../keypair/Address.js';
 
 export class AddressSet {
@@ -8,6 +7,10 @@ export class AddressSet {
         this.keys = keys;
     }
 
+    public get size(): number {
+        return this.keys.length;
+    }
+
     public add(address: Address): void {
         if (!this.has(address)) {
             this.keys.push(address);
@@ -32,10 +35,6 @@ export class AddressSet {
         }
     }
 
-    public size(): i32 {
-        return this.keys.length;
-    }
-
     public clone(): AddressSet {
         const clone = new AddressSet();
 
@@ -59,4 +58,10 @@ export class AddressSet {
 
         return clone;
     }
+
+    *[Symbol.iterator]() {
+        for (let i = 0; i < this.keys.length; i++) {
+            yield this.keys[i];
+        }
+    }
 }

package/src/keypair/Address.ts

@@ -9,9 +9,10 @@ export class Address extends Uint8Array {
     private isP2TROnly: boolean = false;
     #p2tr: string | undefined;
     #network: Network | undefined;
+    #tweakedBytes: Uint8Array | undefined;
 
     public constructor(bytes?: ArrayLike<number>) {
-        super(ADDRESS_BYTE_LENGTH);
+        super(bytes?.length || ADDRESS_BYTE_LENGTH);
 
         if (!bytes) {
             return;
@@ -33,6 +34,14 @@ export class Address extends Uint8Array {
         return this._keyPair;
     }
 
+    /**
+     * Get the tweaked bytes
+     * @returns {Uint8Array} The tweaked bytes
+     */
+    public get tweakedBytes(): Uint8Array {
+        return this.#tweakedBytes || this;
+    }
+
     public static dead(): Address {
         return Address.fromString(
             '0x04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f',
@@ -45,6 +54,10 @@ export class Address extends Uint8Array {
      * @returns {Address} The address
      */
     public static fromString(pubKey: string): Address {
+        if (!pubKey) {
+            throw new Error('Invalid public key');
+        }
+
         if (pubKey.startsWith('0x')) {
             pubKey = pubKey.slice(2);
         }
@@ -70,12 +83,15 @@ export class Address extends Uint8Array {
     }
 
     public equals(a: Address): boolean {
-        if (a.length !== this.length) {
+        const b = this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array);
+        const c = a.isP2TROnly ? a : (a.#tweakedBytes as Uint8Array);
+
+        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;
             }
         }
@@ -89,9 +105,12 @@ export class Address extends Uint8Array {
      */
     public lessThan(a: Address): boolean {
         // Compare the two addresses byte-by-byte, treating them as big-endian uint256
+        const b = this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array);
+        const c = a.isP2TROnly ? a : (a.#tweakedBytes as Uint8Array);
+
         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; // this is less than a
@@ -109,9 +128,12 @@ export class Address extends Uint8Array {
      */
     public greaterThan(a: Address): boolean {
         // Compare the two addresses byte-by-byte, treating them as big-endian uint256
+        const b = this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array);
+        const c = a.isP2TROnly ? a : (a.#tweakedBytes as Uint8Array);
+
         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; // this is greater than a
@@ -130,7 +152,7 @@ export class Address extends Uint8Array {
      */
     public override set(publicKey: ArrayLike<number>): void {
         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) {
@@ -143,14 +165,14 @@ export class Address extends Uint8Array {
         } else {
             this._keyPair = EcKeyPair.fromPublicKey(Uint8Array.from(publicKey));
 
-            const tweaked = toXOnly(
+            this.#tweakedBytes = toXOnly(
                 Buffer.from(
                     EcKeyPair.tweakPublicKey(this._keyPair.publicKey.toString('hex')),
                     'hex',
                 ),
             );
 
-            super.set(Uint8Array.from(tweaked));
+            super.set(publicKey);
         }
     }
 
@@ -207,12 +229,10 @@ export class Address extends Uint8Array {
             return this.#p2tr;
         }
 
-        let p2trAddy: string | undefined;
-        if (this._keyPair) {
-            p2trAddy = EcKeyPair.getTaprootAddress(this.keyPair, network);
-        } else if (this.isP2TROnly) {
-            p2trAddy = EcKeyPair.tweakedPubKeyBufferToAddress(this, network);
-        }
+        const p2trAddy: string | undefined = EcKeyPair.tweakedPubKeyBufferToAddress(
+            this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array),
+            network,
+        );
 
         if (p2trAddy) {
             this.#network = network;

package/src/keypair/AddressVerificator.ts

@@ -175,6 +175,7 @@ export class AddressVerificator {
                 }
             }
         } catch (error) {
+            console.log(error);
             // Ignore errors from Bech32/Bech32m decoding
         }
 

package/src/keypair/Wallet.ts

@@ -73,7 +73,7 @@ export class Wallet {
             'hex',
         );
 
-        this._bufferPubKey = Buffer.from(wallet.publicKey, 'hex');
+        this._bufferPubKey = this._keypair.publicKey;
         this._address = new Address(this._keypair.publicKey);
     }
 

package/src/transaction/browser/extensions/UnisatSigner.ts

@@ -1,5 +1,4 @@
-import { TapScriptSig } from 'bip174/src/lib/interfaces.js';
-import { Network, networks, Psbt } from 'bitcoinjs-lib';
+import { Network, networks, Psbt, TapScriptSig } from 'bitcoinjs-lib';
 import { ECPairInterface } from 'ecpair';
 import { EcKeyPair } from '../../../keypair/EcKeyPair.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';

package/src/transaction/builders/CustomScriptTransaction.ts

@@ -2,14 +2,13 @@ import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
-import { crypto as bitCrypto, Payment, Psbt, Signer, Stack } from 'bitcoinjs-lib';
+import { crypto as bitCrypto, Payment, Psbt, PsbtInput, Signer, Stack } from 'bitcoinjs-lib';
 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 { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
-import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { ECPairInterface } from 'ecpair';
 
 export interface ICustomTransactionParameters extends SharedInteractionParameters {

package/src/transaction/builders/DeploymentTransaction.ts

@@ -1,6 +1,6 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { IDeploymentParameters } from '../interfaces/ITransactionParameters.js';
-import { crypto as bitCrypto, Payment, Psbt, Signer } from 'bitcoinjs-lib';
+import { crypto as bitCrypto, Payment, Psbt, PsbtInput, Signer } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
@@ -8,7 +8,6 @@ import { DeploymentGenerator } from '../../generators/builders/DeploymentGenerat
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
-import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { ECPairInterface } from 'ecpair';
@@ -121,8 +120,8 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
 
         this.internalInit();
 
-        this._contractPubKey = '0x' + this.contractSigner.publicKey.toString('hex');
-        this._contractAddress = new Address(this.contractSigner.publicKey); //AddressGenerator.generatePKSH(this.contractSeed, this.network);
+        this._contractPubKey = '0x' + this.contractSeed.toString('hex');
+        this._contractAddress = new Address(this.contractSeed);
     }
 
     /**
@@ -198,7 +197,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         const amountSpent: bigint = this.getTransactionOPNetFee();
         this.addOutput({
             value: Number(amountSpent),
-            address: this.to,
+            address: this.contractAddress.p2tr(this.network),
         });
 
         await this.addRefundOutput(amountSpent);
@@ -296,7 +295,6 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         const deployerPubKey: Buffer = this.internalPubKeyToXOnly();
         const salt: Buffer = bitCrypto.hash256(this.randomBytes);
         const sha256OfBytecode: Buffer = bitCrypto.hash256(this.bytecode);
-
         const buf: Buffer = Buffer.concat([deployerPubKey, salt, sha256OfBytecode]);
 
         return bitCrypto.hash256(buf);

package/src/transaction/builders/InteractionTransaction.ts

@@ -31,7 +31,7 @@ export class InteractionTransaction extends SharedInteractionTransaction<Transac
             this.calldata,
             this.contractSecret,
         );
-        
+
         this.scriptTree = this.getScriptTree();
         this.internalInit();
     }

package/src/transaction/builders/MultiSignTransaction.ts

@@ -1,11 +1,20 @@
-import { PsbtInput, TapScriptSig } from 'bip174/src/lib/interfaces.js';
-import { crypto as bitcoinCrypto, opcodes, Payment, Psbt, script, Signer } from 'bitcoinjs-lib';
+import {
+    crypto as bitcoinCrypto,
+    opcodes,
+    Payment,
+    Psbt,
+    PsbtInput,
+    PsbtInputExtended,
+    PsbtOutputExtended,
+    script,
+    Signer,
+    TapScriptSig,
+} from 'bitcoinjs-lib';
 import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.js';
-import { PsbtInputExtended, PsbtOutputExtended } from '../interfaces/Tap.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -1,5 +1,4 @@
-import { PsbtInput } from 'bip174/src/lib/interfaces.js';
-import { address, Payment, Psbt, Signer } from 'bitcoinjs-lib';
+import { address, Payment, Psbt, PsbtInput, Signer } from 'bitcoinjs-lib';
 import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { ECPairInterface } from 'ecpair';
 import { TransactionBuilder } from './TransactionBuilder.js';
@@ -187,35 +186,17 @@ export abstract class SharedInteractionTransaction<
             return;
         }
 
-        const txs: PsbtInput[] = transaction.data.inputs;
-        for (let i = 0; i < txs.length; i += 20) {
-            const batch = txs.slice(i, i + 20);
+        for (let i = 0; i < transaction.data.inputs.length; i++) {
+            if (i === 0) {
+                // multi sig input
+                transaction.signInput(0, this.scriptSigner);
+                transaction.signInput(0, this.getSignerKey());
 
-            const promises: Promise<void>[] = [];
-            for (let y = 0; y < batch.length; y++) {
-                const offset = i * 20 + y;
-                const input = batch[y];
-
-                promises.push(this.signIndividualInputs(transaction, input, offset));
-            }
-
-            await Promise.all(promises).catch((e: unknown) => {
-                throw e;
-            });
-        }
-
-        try {
-            transaction.finalizeInput(0, this.customFinalizer);
-        } catch (e) {
-            this.error(`Failed to finalize input 0: ${(e as Error).stack}`);
-        }
-
-        for (let i = 0; i < txs.length; i++) {
-            try {
+                transaction.finalizeInput(0, this.customFinalizer);
+            } else {
+                transaction.signInput(i, this.getSignerKey());
                 transaction.finalizeInput(i);
-
-                this.log(`Finalized input ${i}!`);
-            } catch {}
+            }
         }
     }
 
@@ -265,7 +246,7 @@ export abstract class SharedInteractionTransaction<
             this.internalPubKeyToXOnly(),
             input.tapScriptSig[0].signature,
             input.tapScriptSig[1].signature,
-        ];
+        ] as Buffer[];
     }
 
     /**
@@ -303,12 +284,6 @@ export abstract class SharedInteractionTransaction<
             throw new Error('Tap leaf script is required');
         }
 
-        //console.log('finalizing input', input);
-
-        //if (!input.tapLeafScript) {
-        //    throw new Error('Tap script signature is required');
-        //}
-
         if (!this.contractSecret) {
             throw new Error('Contract secret is required');
         }
@@ -323,38 +298,6 @@ export abstract class SharedInteractionTransaction<
         };
     };
 
-    private async signIndividualInputs(
-        transaction: Psbt,
-        input: PsbtInput,
-        i: number,
-    ): Promise<void> {
-        let signed: boolean = 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');
-    }
-
     /**
      * Get the public keys
      * @private

package/src/transaction/builders/TransactionBuilder.ts

@@ -1,7 +1,17 @@
-import { initEccLib, Network, opcodes, Psbt, script, Signer, Transaction } from 'bitcoinjs-lib';
+import {
+    initEccLib,
+    Network,
+    opcodes,
+    Psbt,
+    PsbtInputExtended,
+    PsbtOutputExtended,
+    script,
+    Signer,
+    Transaction,
+} from 'bitcoinjs-lib';
 import { varuint } from 'bitcoinjs-lib/src/bufferutils.js';
 import * as ecc from '@bitcoinerlab/secp256k1';
-import { PsbtInputExtended, PsbtOutputExtended, UpdateInput } from '../interfaces/Tap.js';
+import { UpdateInput } from '../interfaces/Tap.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import {
     IFundingTransactionParameters,

package/src/transaction/builders/UnwrapSegwitTransaction.ts

@@ -4,10 +4,9 @@ import { IUnwrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
-import { payments, Psbt, Signer } from 'bitcoinjs-lib';
+import { payments, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer } from 'bitcoinjs-lib';
 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';
 import { Selector } from '../../utils/types.js';
@@ -195,6 +194,7 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction<Transa
     /**
      * Builds the transaction.
      * @param {Psbt} transaction - The transaction to build
+     * @param checkPartialSigs
      * @protected
      * @returns {Promise<boolean>}
      * @throws {Error} - If something went wrong while building the transaction

package/src/transaction/builders/UnwrapTransaction.ts

@@ -4,15 +4,21 @@ import { IUnwrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
-import { Network, Payment, payments, Psbt } from 'bitcoinjs-lib';
+import {
+    Network,
+    Payment,
+    payments,
+    Psbt,
+    PsbtInput,
+    PsbtInputExtended,
+    PsbtOutputExtended,
+} from 'bitcoinjs-lib';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { IWBTCUTXODocument, PsbtTransaction, VaultUTXOs } from '../processor/PsbtTransaction.js';
-import { PsbtInputExtended, PsbtOutputExtended } from '../interfaces/Tap.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.js';
 import { MultiSignTransaction } from './MultiSignTransaction.js';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
-import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Features } from '../../generators/Features.js';

package/src/transaction/builders/WrapTransaction.ts

@@ -1,12 +1,12 @@
 import { Taptree } from 'bitcoinjs-lib/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
-import { PsbtOutputExtendedAddress, TapLeafScript } from '../interfaces/Tap.js';
+import { TapLeafScript } from '../interfaces/Tap.js';
 import { IWrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
 import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
-import { Network } from 'bitcoinjs-lib';
+import { Network, PsbtOutputExtendedAddress } from 'bitcoinjs-lib';
 import { P2TR_MS } from '../shared/P2TR_MS.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';
 import { Selector } from '../../utils/types.js';

package/src/transaction/interfaces/ITransactionParameters.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;

package/src/transaction/interfaces/Tap.ts

@@ -1,5 +1,16 @@
-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;
@@ -11,16 +22,24 @@ 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 type PsbtOutputExtended = PsbtOutputExtendedAddress | PsbtOutputExtendedScript;
+export interface PsbtInputUpdate extends _PsbtInputUpdate {}