@btc-vision/transaction 1.4.0 → 1.5.0

package/browser/index.js.LICENSE.txt

@@ -20,9 +20,7 @@
 
 /*! noble-hashes - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 
-/*! noble-secp256k1 - MIT License (c) 2019 Paul Miller (paulmillr.com) */
-
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
 
 /*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 

package/browser/keypair/Address.d.ts

@@ -28,6 +28,7 @@ export declare class Address extends Uint8Array {
     toString(): string;
     toJSON(): string;
     p2tr(network: Network): string;
+    p2op(network: Network): string;
     toTweakedHybridPublicKeyHex(): string;
     toTweakedHybridPublicKeyBuffer(): Buffer;
     private autoFormat;

package/browser/keypair/AddressVerificator.d.ts

@@ -1,6 +1,7 @@
 import { Network } from '@btc-vision/bitcoin';
 export declare enum AddressTypes {
     P2PKH = "P2PKH",
+    P2OP = "P2OP",
     P2SH_OR_P2SH_P2WPKH = "P2SH_OR_P2SH-P2WPKH",
     P2PK = "P2PK",
     P2TR = "P2TR",

package/browser/keypair/EcKeyPair.d.ts

@@ -13,12 +13,15 @@ export declare class EcKeyPair {
     static getP2WPKHAddress(keyPair: ECPairInterface, network?: Network): string;
     static tweakedPubKeyToAddress(tweakedPubKeyHex: string, network: Network): string;
     static tweakedPubKeyBufferToAddress(tweakedPubKeyBuffer: Buffer | Uint8Array, network: Network): string;
+    static p2op(bytes: Buffer | Uint8Array, network?: Network, deploymentVersion?: number): string;
     static xOnlyTweakedPubKeyToAddress(tweakedPubKeyHex: string, network: Network): string;
-    static tweakPublicKey(compressedPubKeyHex: string | Buffer): Buffer;
+    static tweakPublicKey(pub: Uint8Array | Buffer | string): Buffer;
+    static tweakBatchSharedT(pubkeys: readonly Uint8Array[], tweakScalar: bigint): Uint8Array[];
     static generateWallet(network?: Network): IWallet;
     static verifyContractAddress(contractAddress: string, network?: Network): boolean;
     static getLegacySegwitAddress(keyPair: ECPairInterface, network?: Network): string;
     static getLegacyAddress(keyPair: ECPairInterface, network?: Network): string;
+    static getP2PKH(publicKey: Buffer | Uint8Array, network?: Network): string;
     static getP2PKAddress(keyPair: ECPairInterface, network?: Network): string;
     static generateRandomKeyPair(network?: Network): ECPairInterface;
     static fromSeed(seed: Buffer, network?: Network): BIP32Interface;

package/browser/transaction/TransactionFactory.d.ts

@@ -11,7 +11,6 @@ export interface DeploymentResult {
     readonly transaction: [string, string];
     readonly contractAddress: string;
     readonly contractPubKey: string;
-    readonly p2trAddress: string;
     readonly preimage: string;
     readonly utxos: UTXO[];
 }

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

@@ -1,8 +1,10 @@
 import { IDeploymentParameters, IInteractionParameters } from '../interfaces/ITransactionParameters.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { DeploymentResult, InteractionResponse } from '../TransactionFactory';
+import { ICustomTransactionParameters } from '../builders/CustomScriptTransaction.js';
 export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer' | 'preimage'>;
 export type IDeploymentParametersWithoutSigner = Omit<IDeploymentParameters, 'signer' | 'network' | 'preimage'>;
+export type CustomTransactionWithoutSigner = Omit<ICustomTransactionParameters, 'signer' | 'preimage'>;
 export interface BroadcastTransactionOptions {
     raw: string;
     psbt: boolean;

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

@@ -1,12 +1,13 @@
-import { Payment, Psbt, Stack } from '@btc-vision/bitcoin';
+import { Payment, Psbt, PsbtInput, Stack } 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 SharedInteractionParameters {
-    readonly script: (Buffer | Stack)[];
-    readonly witnesses: Buffer[];
-    readonly to: string;
+    script: (Buffer | Stack)[];
+    witnesses: Buffer[];
+    annex?: Buffer;
+    to: string;
 }
 export declare class CustomScriptTransaction extends TransactionBuilder<TransactionType.CUSTOM_CODE> {
     type: TransactionType.CUSTOM_CODE;
@@ -21,6 +22,7 @@ export declare class CustomScriptTransaction extends TransactionBuilder<Transact
     private readonly contractSigner;
     private readonly randomBytes;
     private readonly witnesses;
+    private readonly annexData?;
     constructor(parameters: ICustomTransactionParameters);
     get scriptAddress(): string;
     get p2trAddress(): string;
@@ -30,6 +32,7 @@ export declare class CustomScriptTransaction extends TransactionBuilder<Transact
     protected signInputs(transaction: Psbt): Promise<void>;
     protected generateScriptAddress(): Payment;
     protected generateTapData(): Payment;
+    protected getScriptSolution(input: PsbtInput): Buffer[];
     private getContractSeed;
     private customFinalizer;
     private getPubKeys;

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

@@ -12,6 +12,7 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     protected readonly rewardChallenge: IMineableReward;
     protected readonly _contractAddress: Address;
     protected tapLeafScript: TapLeafScript | null;
+    private readonly deploymentVersion;
     private targetScriptRedeem;
     private leftOverFundsScriptRedeem;
     private readonly compiledTargetScript;
@@ -23,12 +24,14 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     private readonly contractSigner;
     private readonly _contractPubKey;
     private readonly randomBytes;
+    private _computedAddress;
     constructor(parameters: IDeploymentParameters);
     get contractPubKey(): string;
     get contractAddress(): Address;
     get p2trAddress(): string;
     getRndBytes(): Buffer;
     getPreimage(): Buffer;
+    getContractAddress(): string;
     protected contractSignerXOnlyPubKey(): Buffer;
     protected buildTransaction(): Promise<void>;
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;

package/build/buffer/BinaryReader.d.ts

@@ -21,7 +21,7 @@ export declare class BinaryReader {
     readBoolean(): boolean;
     readSelector(): Selector;
     readBytes(length: u32, zeroStop?: boolean): Uint8Array;
-    readString(length: u16): string;
+    readString(length: u32): string;
     readStringWithLength(be?: boolean): string;
     readAddress(): Address;
     readBytesWithLength(maxLength?: number, be?: boolean): Uint8Array;

package/build/buffer/BinaryReader.js

@@ -112,7 +112,7 @@ export class BinaryReader {
         return textDecoder.decode(bytes);
     }
     readStringWithLength(be = true) {
-        const length = this.readU16(be);
+        const length = this.readU32(be);
         return this.readString(length);
     }
     readAddress() {

package/build/buffer/BinaryWriter.js

@@ -119,8 +119,8 @@ export class BinaryWriter {
         this.writeBytes(value);
     }
     writeStringWithLength(value) {
-        this.allocSafe(U16_BYTE_LENGTH + value.length);
-        this.writeU16(value.length);
+        this.allocSafe(U32_BYTE_LENGTH + value.length);
+        this.writeU32(value.length);
         this.writeString(value);
     }
     getBuffer(clear = true) {

package/build/keypair/Address.d.ts

@@ -28,6 +28,7 @@ export declare class Address extends Uint8Array {
     toString(): string;
     toJSON(): string;
     p2tr(network: Network): string;
+    p2op(network: Network): string;
     toTweakedHybridPublicKeyHex(): string;
     toTweakedHybridPublicKeyBuffer(): Buffer;
     private autoFormat;

package/build/keypair/Address.js

@@ -9,7 +9,7 @@ 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, _Address_originalPublicKey, _Address_keyPair, _Address_uncompressed, _Address_tweakedUncompressed;
+var _Address_p2tr, _Address_p2op, _Address_network, _Address_originalPublicKey, _Address_keyPair, _Address_uncompressed, _Address_tweakedUncompressed;
 import { decompressPublicKey, toXOnly } from '@btc-vision/bitcoin';
 import { ADDRESS_BYTE_LENGTH } from '../utils/lengths.js';
 import { AddressVerificator } from './AddressVerificator.js';
@@ -20,6 +20,7 @@ export class Address extends Uint8Array {
     constructor(bytes) {
         super(ADDRESS_BYTE_LENGTH);
         _Address_p2tr.set(this, void 0);
+        _Address_p2op.set(this, void 0);
         _Address_network.set(this, void 0);
         _Address_originalPublicKey.set(this, void 0);
         _Address_keyPair.set(this, void 0);
@@ -193,6 +194,18 @@ export class Address extends Uint8Array {
         }
         throw new Error('Public key not set');
     }
+    p2op(network) {
+        if (__classPrivateFieldGet(this, _Address_p2op, "f") && __classPrivateFieldGet(this, _Address_network, "f") === network) {
+            return __classPrivateFieldGet(this, _Address_p2op, "f");
+        }
+        const p2opAddy = EcKeyPair.p2op(this, network);
+        if (p2opAddy) {
+            __classPrivateFieldSet(this, _Address_network, network, "f");
+            __classPrivateFieldSet(this, _Address_p2op, p2opAddy, "f");
+            return p2opAddy;
+        }
+        throw new Error('Public key not set');
+    }
     toTweakedHybridPublicKeyHex() {
         if (!__classPrivateFieldGet(this, _Address_tweakedUncompressed, "f")) {
             throw new Error('Public key not set');
@@ -220,4 +233,4 @@ export class Address extends Uint8Array {
         super.set(tweakedBytes);
     }
 }
-_Address_p2tr = new WeakMap(), _Address_network = new WeakMap(), _Address_originalPublicKey = new WeakMap(), _Address_keyPair = new WeakMap(), _Address_uncompressed = new WeakMap(), _Address_tweakedUncompressed = new WeakMap();
+_Address_p2tr = new WeakMap(), _Address_p2op = new WeakMap(), _Address_network = new WeakMap(), _Address_originalPublicKey = new WeakMap(), _Address_keyPair = new WeakMap(), _Address_uncompressed = new WeakMap(), _Address_tweakedUncompressed = new WeakMap();

package/build/keypair/AddressVerificator.d.ts

@@ -1,6 +1,7 @@
 import { Network } from '@btc-vision/bitcoin';
 export declare enum AddressTypes {
     P2PKH = "P2PKH",
+    P2OP = "P2OP",
     P2SH_OR_P2SH_P2WPKH = "P2SH_OR_P2SH-P2WPKH",
     P2PK = "P2PK",
     P2TR = "P2TR",

package/build/keypair/AddressVerificator.js

@@ -6,6 +6,7 @@ initEccLib(ecc);
 export var AddressTypes;
 (function (AddressTypes) {
     AddressTypes["P2PKH"] = "P2PKH";
+    AddressTypes["P2OP"] = "P2OP";
     AddressTypes["P2SH_OR_P2SH_P2WPKH"] = "P2SH_OR_P2SH-P2WPKH";
     AddressTypes["P2PK"] = "P2PK";
     AddressTypes["P2TR"] = "P2TR";
@@ -102,6 +103,9 @@ export class AddressVerificator {
         catch { }
         try {
             const decodedBech32 = address.fromBech32(addy);
+            if (decodedBech32.prefix === network.bech32Opnet && decodedBech32.version === 16) {
+                return AddressTypes.P2OP;
+            }
             if (decodedBech32.prefix === network.bech32) {
                 if (decodedBech32.version === 0 && decodedBech32.data.length === 20) {
                     return AddressTypes.P2WPKH;

package/build/keypair/EcKeyPair.d.ts

@@ -13,12 +13,15 @@ export declare class EcKeyPair {
     static getP2WPKHAddress(keyPair: ECPairInterface, network?: Network): string;
     static tweakedPubKeyToAddress(tweakedPubKeyHex: string, network: Network): string;
     static tweakedPubKeyBufferToAddress(tweakedPubKeyBuffer: Buffer | Uint8Array, network: Network): string;
+    static p2op(bytes: Buffer | Uint8Array, network?: Network, deploymentVersion?: number): string;
     static xOnlyTweakedPubKeyToAddress(tweakedPubKeyHex: string, network: Network): string;
-    static tweakPublicKey(compressedPubKeyHex: string | Buffer): Buffer;
+    static tweakPublicKey(pub: Uint8Array | Buffer | string): Buffer;
+    static tweakBatchSharedT(pubkeys: readonly Uint8Array[], tweakScalar: bigint): Uint8Array[];
     static generateWallet(network?: Network): IWallet;
     static verifyContractAddress(contractAddress: string, network?: Network): boolean;
     static getLegacySegwitAddress(keyPair: ECPairInterface, network?: Network): string;
     static getLegacyAddress(keyPair: ECPairInterface, network?: Network): string;
+    static getP2PKH(publicKey: Buffer | Uint8Array, network?: Network): string;
     static getP2PKAddress(keyPair: ECPairInterface, network?: Network): string;
     static generateRandomKeyPair(network?: Network): ECPairInterface;
     static fromSeed(seed: Buffer, network?: Network): BIP32Interface;

package/build/keypair/EcKeyPair.js

@@ -1,17 +1,23 @@
 import * as ecc from '@bitcoinerlab/secp256k1';
 import bip32, { BIP32Factory } from 'bip32';
-import { address, initEccLib, networks, payments, taggedHash, toXOnly, } from '@btc-vision/bitcoin';
+import bitcoin, { address, fromOutputScript, initEccLib, networks, opcodes, payments, script, toXOnly, } from '@btc-vision/bitcoin';
 import { ECPairFactory } from 'ecpair';
-import { CURVE, ProjectivePoint as Point } from '@noble/secp256k1';
+import { secp256k1 } from '@noble/curves/secp256k1';
+import { bytesToNumberBE, concatBytes, utf8ToBytes } from '@noble/curves/abstract/utils';
+import { mod } from '@noble/curves/abstract/modular';
+import { sha256 } from '@noble/hashes/sha2';
 initEccLib(ecc);
 const BIP32factory = typeof bip32 === 'function' ? bip32 : BIP32Factory;
 if (!BIP32factory) {
     throw new Error('Failed to load BIP32 library');
 }
-const mod = (a, b) => {
-    const result = a % b;
-    return result >= 0n ? result : result + b;
-};
+secp256k1.utils.precompute(8);
+const { ProjectivePoint: Point, CURVE } = secp256k1;
+const TAP_TAG = utf8ToBytes('TapTweak');
+const TAP_TAG_HASH = sha256(TAP_TAG);
+function tapTweakHash(x) {
+    return sha256(concatBytes(TAP_TAG_HASH, TAP_TAG_HASH, x));
+}
 export class EcKeyPair {
     static fromWIF(wif, network = networks.bitcoin) {
         return this.ECPair.fromWIF(wif, network);
@@ -77,6 +83,17 @@ export class EcKeyPair {
         }
         return address;
     }
+    static p2op(bytes, network = networks.bitcoin, deploymentVersion = 0) {
+        const witnessProgram = Buffer.concat([
+            Buffer.from([deploymentVersion]),
+            bitcoin.crypto.hash160(Buffer.from(bytes)),
+        ]);
+        if (witnessProgram.length < 2 || witnessProgram.length > 40) {
+            throw new Error('Witness program must be 2-40 bytes.');
+        }
+        const scriptData = script.compile([opcodes.OP_16, witnessProgram]);
+        return fromOutputScript(scriptData, network);
+    }
     static xOnlyTweakedPubKeyToAddress(tweakedPubKeyHex, network) {
         if (tweakedPubKeyHex.startsWith('0x')) {
             tweakedPubKeyHex = tweakedPubKeyHex.slice(2);
@@ -91,23 +108,26 @@ export class EcKeyPair {
         }
         return address;
     }
-    static tweakPublicKey(compressedPubKeyHex) {
-        if (typeof compressedPubKeyHex === 'string' && compressedPubKeyHex.startsWith('0x')) {
-            compressedPubKeyHex = compressedPubKeyHex.slice(2);
-        }
-        if (typeof compressedPubKeyHex !== 'string') {
-            compressedPubKeyHex = compressedPubKeyHex.toString('hex');
-        }
-        let P = Point.fromHex(compressedPubKeyHex);
-        if ((P.y & 1n) !== 0n) {
-            P = P.negate();
-        }
-        const x = P.toRawBytes(true).slice(1);
-        const tHash = taggedHash('TapTweak', Buffer.from(x));
-        const t = mod(BigInt('0x' + Buffer.from(tHash).toString('hex')), CURVE.n);
-        const Q = P.add(Point.BASE.mul(t));
+    static tweakPublicKey(pub) {
+        if (typeof pub === 'string' && pub.startsWith('0x'))
+            pub = pub.slice(2);
+        const P = Point.fromHex(pub);
+        const Peven = (P.y & 1n) === 0n ? P : P.negate();
+        const xBytes = Peven.toRawBytes(true).subarray(1);
+        const tBytes = tapTweakHash(xBytes);
+        const t = mod(bytesToNumberBE(tBytes), CURVE.n);
+        const Q = Peven.add(Point.BASE.multiply(t));
         return Buffer.from(Q.toRawBytes(true));
     }
+    static tweakBatchSharedT(pubkeys, tweakScalar) {
+        const T = Point.BASE.multiply(tweakScalar);
+        return pubkeys.map((bytes) => {
+            const P = Point.fromHex(bytes);
+            const P_even = P.hasEvenY() ? P : P.negate();
+            const Q = P_even.add(T);
+            return Q.toRawBytes(true);
+        });
+    }
     static generateWallet(network = networks.bitcoin) {
         const keyPair = this.ECPair.makeRandom({
             network: network,
@@ -142,6 +162,13 @@ export class EcKeyPair {
         }
         return wallet.address;
     }
+    static getP2PKH(publicKey, network = networks.bitcoin) {
+        const wallet = payments.p2pkh({ pubkey: Buffer.from(publicKey), network: network });
+        if (!wallet.address) {
+            throw new Error('Failed to generate wallet');
+        }
+        return wallet.address;
+    }
     static getP2PKAddress(keyPair, network = networks.bitcoin) {
         const wallet = payments.p2pk({ pubkey: Buffer.from(keyPair.publicKey), network: network });
         if (!wallet.output) {

package/build/transaction/TransactionFactory.d.ts

@@ -11,7 +11,6 @@ export interface DeploymentResult {
     readonly transaction: [string, string];
     readonly contractAddress: string;
     readonly contractPubKey: string;
-    readonly p2trAddress: string;
     readonly preimage: string;
     readonly utxos: UTXO[];
 }

package/build/transaction/TransactionFactory.js

@@ -13,9 +13,17 @@ export class TransactionFactory {
         if (!interactionParameters.from) {
             throw new Error('Field "from" not provided.');
         }
+        if (!interactionParameters.utxos[0]) {
+            throw new Error('Missing at least one UTXO.');
+        }
+        if (!('signer' in interactionParameters)) {
+            throw new Error('Field "signer" not provided, OP_WALLET not detected.');
+        }
+        const inputs = this.parseOptionalInputs(interactionParameters.optionalInputs);
         const preTransaction = new CustomScriptTransaction({
             ...interactionParameters,
             utxos: [interactionParameters.utxos[0]],
+            optionalInputs: inputs,
         });
         await preTransaction.generateTransactionMinimalSignatures();
         const parameters = await preTransaction.getFundingTransactionParameters();
@@ -33,17 +41,24 @@ export class TransactionFactory {
             throw new Error('Could not sign funding transaction.');
         }
         parameters.estimatedFees = feeEstimationFundingTransaction.estimatedFees;
-        const signedTransaction = await this.createFundTransaction(parameters);
+        const signedTransaction = await this.createFundTransaction({
+            ...parameters,
+            optionalOutputs: [],
+            optionalInputs: [],
+        });
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
         }
         interactionParameters.utxos = this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0);
         const newParams = {
             ...interactionParameters,
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0),
+            utxos: [
+                ...this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0),
+            ],
             randomBytes: preTransaction.getRndBytes(),
             nonWitnessUtxo: signedTransaction.tx.toBuffer(),
             estimatedFees: preTransaction.estimatedFees,
+            optionalInputs: inputs,
         };
         const finalTransaction = new CustomScriptTransaction(newParams);
         const outTx = await finalTransaction.signTransaction();
@@ -194,9 +209,8 @@ export class TransactionFactory {
         };
         return {
             transaction: [signedTransaction.toHex(), outTx.toHex()],
-            contractAddress: finalTransaction.contractAddress.p2tr(deploymentParameters.network),
+            contractAddress: finalTransaction.getContractAddress(),
             contractPubKey: finalTransaction.contractPubKey,
-            p2trAddress: finalTransaction.p2trAddress,
             utxos: [refundUTXO],
             preimage: preTransaction.getPreimage().toString('hex'),
         };

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

@@ -1,8 +1,10 @@
 import { IDeploymentParameters, IInteractionParameters } from '../interfaces/ITransactionParameters.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { DeploymentResult, InteractionResponse } from '../TransactionFactory';
+import { ICustomTransactionParameters } from '../builders/CustomScriptTransaction.js';
 export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer' | 'preimage'>;
 export type IDeploymentParametersWithoutSigner = Omit<IDeploymentParameters, 'signer' | 'network' | 'preimage'>;
+export type CustomTransactionWithoutSigner = Omit<ICustomTransactionParameters, 'signer' | 'preimage'>;
 export interface BroadcastTransactionOptions {
     raw: string;
     psbt: boolean;

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

@@ -1,12 +1,13 @@
-import { Payment, Psbt, Stack } from '@btc-vision/bitcoin';
+import { Payment, Psbt, PsbtInput, Stack } 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 SharedInteractionParameters {
-    readonly script: (Buffer | Stack)[];
-    readonly witnesses: Buffer[];
-    readonly to: string;
+    script: (Buffer | Stack)[];
+    witnesses: Buffer[];
+    annex?: Buffer;
+    to: string;
 }
 export declare class CustomScriptTransaction extends TransactionBuilder<TransactionType.CUSTOM_CODE> {
     type: TransactionType.CUSTOM_CODE;
@@ -21,6 +22,7 @@ export declare class CustomScriptTransaction extends TransactionBuilder<Transact
     private readonly contractSigner;
     private readonly randomBytes;
     private readonly witnesses;
+    private readonly annexData?;
     constructor(parameters: ICustomTransactionParameters);
     get scriptAddress(): string;
     get p2trAddress(): string;
@@ -30,6 +32,7 @@ export declare class CustomScriptTransaction extends TransactionBuilder<Transact
     protected signInputs(transaction: Psbt): Promise<void>;
     protected generateScriptAddress(): Payment;
     protected generateTapData(): Payment;
+    protected getScriptSolution(input: PsbtInput): Buffer[];
     private getContractSeed;
     private customFinalizer;
     private getPubKeys;

package/build/transaction/builders/CustomScriptTransaction.js

@@ -12,14 +12,20 @@ export class CustomScriptTransaction extends TransactionBuilder {
         this.tapLeafScript = null;
         this.targetScriptRedeem = null;
         this.leftOverFundsScriptRedeem = null;
-        this.customFinalizer = (_inputIndex, _input) => {
+        this.customFinalizer = (_inputIndex, input) => {
             if (!this.tapLeafScript) {
                 throw new Error('Tap leaf script is required');
             }
-            const scriptSolution = this.witnesses;
+            const scriptSolution = this.getScriptSolution(input);
             const witness = scriptSolution
                 .concat(this.tapLeafScript.script)
                 .concat(this.tapLeafScript.controlBlock);
+            if (this.annexData && this.annexData.length > 0) {
+                const annex = this.annexData[0] === 0x50
+                    ? this.annexData
+                    : Buffer.concat([Buffer.from([0x50]), this.annexData]);
+                witness.push(annex);
+            }
             return {
                 finalScriptWitness: TransactionBuilder.witnessStackToScriptWitness(witness),
             };
@@ -86,7 +92,10 @@ export class CustomScriptTransaction extends TransactionBuilder {
         }
         for (let i = 0; i < transaction.data.inputs.length; i++) {
             if (i === 0) {
-                transaction.signInput(0, this.contractSigner);
+                try {
+                    transaction.signInput(0, this.contractSigner);
+                }
+                catch (e) { }
                 transaction.signInput(0, this.getSignerKey());
                 transaction.finalizeInput(0, this.customFinalizer);
             }
@@ -120,6 +129,18 @@ export class CustomScriptTransaction extends TransactionBuilder {
             redeem: selectedRedeem,
         };
     }
+    getScriptSolution(input) {
+        if (!input.tapScriptSig) {
+            throw new Error('Tap script signature is required');
+        }
+        const witnesses = [...this.witnesses];
+        if (input.tapScriptSig) {
+            for (const sig of input.tapScriptSig) {
+                witnesses.push(sig.signature);
+            }
+        }
+        return witnesses;
+    }
     getContractSeed() {
         return bitCrypto.hash256(this.randomBytes);
     }

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

@@ -12,6 +12,7 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     protected readonly rewardChallenge: IMineableReward;
     protected readonly _contractAddress: Address;
     protected tapLeafScript: TapLeafScript | null;
+    private readonly deploymentVersion;
     private targetScriptRedeem;
     private leftOverFundsScriptRedeem;
     private readonly compiledTargetScript;
@@ -23,12 +24,14 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     private readonly contractSigner;
     private readonly _contractPubKey;
     private readonly randomBytes;
+    private _computedAddress;
     constructor(parameters: IDeploymentParameters);
     get contractPubKey(): string;
     get contractAddress(): Address;
     get p2trAddress(): string;
     getRndBytes(): Buffer;
     getPreimage(): Buffer;
+    getContractAddress(): string;
     protected contractSignerXOnlyPubKey(): Buffer;
     protected buildTransaction(): Promise<void>;
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;

package/build/transaction/builders/DeploymentTransaction.js

@@ -14,6 +14,7 @@ export class DeploymentTransaction extends TransactionBuilder {
         super(parameters);
         this.type = TransactionType.DEPLOYMENT;
         this.tapLeafScript = null;
+        this.deploymentVersion = 0x00;
         this.targetScriptRedeem = null;
         this.leftOverFundsScriptRedeem = null;
         this.customFinalizer = (_inputIndex, input) => {
@@ -70,6 +71,13 @@ export class DeploymentTransaction extends TransactionBuilder {
     getPreimage() {
         return this.preimage;
     }
+    getContractAddress() {
+        if (this._computedAddress) {
+            return this._computedAddress;
+        }
+        this._computedAddress = EcKeyPair.p2op(this.contractSeed, this.network, this.deploymentVersion);
+        return this._computedAddress;
+    }
     contractSignerXOnlyPubKey() {
         return toXOnly(Buffer.from(this.contractSigner.publicKey));
     }
@@ -105,7 +113,7 @@ export class DeploymentTransaction extends TransactionBuilder {
         }
         this.addOutput({
             value: Number(amountToCA),
-            address: this.contractAddress.p2tr(this.network),
+            address: this.getContractAddress(),
         });
         if (amountToCA === MINIMUM_AMOUNT_CA &&
             amountSpent - MINIMUM_AMOUNT_CA > MINIMUM_AMOUNT_REWARD) {

package/build/transaction/builders/TransactionBuilder.js

@@ -5,7 +5,7 @@ import { AddressVerificator } from '../../keypair/AddressVerificator.js';
 import { TweakedTransaction } from '../shared/TweakedTransaction.js';
 initEccLib(ecc);
 export const MINIMUM_AMOUNT_REWARD = 540n;
-export const MINIMUM_AMOUNT_CA = 330n;
+export const MINIMUM_AMOUNT_CA = 297n;
 export class TransactionBuilder extends TweakedTransaction {
     constructor(parameters) {
         super(parameters);
@@ -386,6 +386,7 @@ export class TransactionBuilder extends TweakedTransaction {
     }
 }
 TransactionBuilder.LOCK_LEAF_SCRIPT = script.compile([
-    opcodes.OP_0,
+    opcodes.OP_FALSE,
+    opcodes.OP_VERIFY,
 ]);
 TransactionBuilder.MINIMUM_DUST = 50n;

package/build/transaction/shared/TweakedTransaction.js

@@ -47,8 +47,8 @@ export class TweakedTransaction extends Logger {
         }
         function readVarInt() {
             const varint = varuint.decode(Buffer, offset);
-            offset += varuint.decode.bytes;
-            return varint;
+            offset += varint.bytes;
+            return varint.numberValue || 0;
         }
         function readVarSlice() {
             const len = readVarInt();