@btc-vision/transaction 1.0.5 → 1.0.7

package/browser/index.js.LICENSE.txt

@@ -16,6 +16,8 @@
 
 /*! 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 */
 
 /*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.5";
+export declare const version = "1.0.7";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.5';
+export const version = '1.0.7';

package/build/generators/AddressGenerator.js

@@ -1,7 +1,7 @@
 import { createHash } from 'crypto';
 import { bech32 } from 'bech32';
 import { initEccLib } from 'bitcoinjs-lib';
-import * as ecc from 'tiny-secp256k1';
+import * as ecc from '@bitcoinerlab/secp256k1';
 initEccLib(ecc);
 export class AddressGenerator {
     static generatePKSH(sha256Hash, network) {

package/build/keypair/EcKeyPair.js

@@ -1,7 +1,7 @@
 import bip32 from 'bip32';
 import { address, initEccLib, networks, payments } from 'bitcoinjs-lib';
 import { ECPairFactory } from 'ecpair';
-import * as ecc from 'tiny-secp256k1';
+import * as ecc from '@bitcoinerlab/secp256k1';
 initEccLib(ecc);
 const BIP32Factory = typeof bip32 === 'function' ? bip32 : bip32.BIP32Factory;
 export class EcKeyPair {

package/build/signer/TweakedSigner.js

@@ -1,7 +1,7 @@
 import { initEccLib } from 'bitcoinjs-lib';
 import { tapTweakHash } from 'bitcoinjs-lib/src/payments/bip341.js';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
-import * as ecc from 'tiny-secp256k1';
+import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from '../keypair/EcKeyPair.js';
 initEccLib(ecc);
 export class TweakedSigner {

package/build/transaction/builders/TransactionBuilder.js

@@ -1,7 +1,7 @@
 import { initEccLib, opcodes, payments, Psbt, script } from 'bitcoinjs-lib';
 import { varuint } from 'bitcoinjs-lib/src/bufferutils.js';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
-import * as ecc from 'tiny-secp256k1';
+import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { Logger } from '@btc-vision/logger';
 export class TransactionBuilder extends Logger {

package/cjs/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.0";
+export declare const version = "1.0.6";

package/cjs/_version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = '1.0.0';
+exports.version = '1.0.6';

package/cjs/bytecode/Compressor.js

@@ -7,7 +7,7 @@ exports.Compressor = void 0;
 const zlib_1 = __importDefault(require("zlib"));
 class Compressor {
     static zlibOptions = {
-        level: zlib_1.default.constants.Z_MAX_LEVEL,
+        level: 9,
         maxOutputLength: 1024 * 1024 * 16,
     };
     static compress(data) {

package/cjs/generators/AddressGenerator.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="node" />
+import { Network } from 'bitcoinjs-lib';
+export declare class AddressGenerator {
+    static generatePKSH(sha256Hash: Buffer, network: Network): string;
+    private static ripemd160;
+    private static toSegwitAddress;
+}

package/cjs/generators/AddressGenerator.js

@@ -0,0 +1,48 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AddressGenerator = void 0;
+const crypto_1 = require("crypto");
+const bech32_1 = require("bech32");
+const bitcoinjs_lib_1 = require("bitcoinjs-lib");
+const ecc = __importStar(require("tiny-secp256k1"));
+(0, bitcoinjs_lib_1.initEccLib)(ecc);
+class AddressGenerator {
+    static generatePKSH(sha256Hash, network) {
+        if (sha256Hash.length !== 32)
+            throw new Error('Invalid hash length');
+        const pkh = this.ripemd160(sha256Hash);
+        return this.toSegwitAddress(pkh, network);
+    }
+    static ripemd160(data) {
+        return (0, crypto_1.createHash)('ripemd160').update(data).digest();
+    }
+    static toSegwitAddress(pkh, network) {
+        const words = bech32_1.bech32.toWords(pkh);
+        words.unshift(0x00);
+        return bech32_1.bech32.encode(network.bech32, words);
+    }
+}
+exports.AddressGenerator = AddressGenerator;

package/cjs/generators/Generator.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
-import { Logger } from '@btc-vision/logger';
 import { Network } from 'bitcoinjs-lib';
-export declare abstract class Generator extends Logger {
+export declare abstract class Generator {
     static readonly DATA_CHUNK_SIZE: number;
     static readonly MAGIC: Buffer;
     protected readonly senderPubKey: Buffer;

package/cjs/generators/Generator.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Generator = void 0;
-const logger_1 = require("@btc-vision/logger");
 const bitcoinjs_lib_1 = require("bitcoinjs-lib");
-class Generator extends logger_1.Logger {
+class Generator {
     static DATA_CHUNK_SIZE = 512;
     static MAGIC = Buffer.from('bsi', 'utf-8');
     senderPubKey;
     contractSaltPubKey;
     network = bitcoinjs_lib_1.networks.bitcoin;
     constructor(senderPubKey, contractSaltPubKey, network = bitcoinjs_lib_1.networks.bitcoin) {
-        super();
         this.senderPubKey = senderPubKey;
         this.contractSaltPubKey = contractSaltPubKey;
         this.network = network;

package/cjs/generators/builders/DeploymentGenerator.d.ts

@@ -4,4 +4,5 @@ import { Generator } from '../Generator.js';
 export declare class DeploymentGenerator extends Generator {
     constructor(senderPubKey: Buffer, contractSaltPubKey: Buffer, network?: Network);
     compile(contractBytecode: Buffer, contractSalt: Buffer): Buffer;
+    private getAsm;
 }

package/cjs/generators/builders/DeploymentGenerator.js

@@ -8,8 +8,17 @@ class DeploymentGenerator extends Generator_js_1.Generator {
         super(senderPubKey, contractSaltPubKey, network);
     }
     compile(contractBytecode, contractSalt) {
+        const asm = this.getAsm(contractBytecode, contractSalt);
+        const compiled = bitcoinjs_lib_1.script.compile(asm);
+        const decompiled = bitcoinjs_lib_1.script.decompile(compiled);
+        if (!decompiled) {
+            throw new Error('Failed to decompile script??');
+        }
+        return compiled;
+    }
+    getAsm(contractBytecode, contractSalt) {
         const dataChunks = this.splitBufferIntoChunks(contractBytecode);
-        const asm = [
+        return [
             this.senderPubKey,
             bitcoinjs_lib_1.opcodes.OP_CHECKSIGVERIFY,
             this.contractSaltPubKey,
@@ -31,12 +40,6 @@ class DeploymentGenerator extends Generator_js_1.Generator {
             bitcoinjs_lib_1.opcodes.OP_1,
             bitcoinjs_lib_1.opcodes.OP_ENDIF,
         ].flat();
-        const compiled = bitcoinjs_lib_1.script.compile(asm);
-        const decompiled = bitcoinjs_lib_1.script.decompile(compiled);
-        if (!decompiled) {
-            throw new Error('Failed to decompile script??');
-        }
-        return compiled;
     }
 }
 exports.DeploymentGenerator = DeploymentGenerator;

package/cjs/keypair/Wallet.d.ts

@@ -13,4 +13,5 @@ export declare class Wallet {
     get p2wpkh(): Address;
     get p2tr(): Address;
     get publicKey(): Buffer;
+    get xOnly(): Buffer;
 }

package/cjs/keypair/Wallet.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Wallet = void 0;
 const EcKeyPair_js_1 = require("./EcKeyPair.js");
 const bitcoinjs_lib_1 = require("bitcoinjs-lib");
+const bip371_js_1 = require("bitcoinjs-lib/src/psbt/bip371.js");
 class Wallet {
     network;
     _keypair;
@@ -30,5 +31,10 @@ class Wallet {
             throw new Error('Keypair not set');
         return this.keypair.publicKey;
     }
+    get xOnly() {
+        if (!this.keypair)
+            throw new Error('Keypair not set');
+        return (0, bip371_js_1.toXOnly)(this.keypair.publicKey);
+    }
 }
 exports.Wallet = Wallet;

package/cjs/opnet.d.ts

@@ -1 +1,24 @@
 export { version } from './_version.js';
+export * from './bytecode/Compressor.js';
+export * from './generators/Generator.js';
+export * from './generators/builders/CalldataGenerator.js';
+export * from './generators/builders/DeploymentGenerator.js';
+export * from './generators/AddressGenerator.js';
+export * from './verification/TapscriptVerificator.js';
+export * from './keypair/EcKeyPair.js';
+export * from './keypair/Wallet.js';
+export * from './keypair/interfaces/IWallet.js';
+export * from './metadata/contracts/wBTC.js';
+export * from './metadata/ContractBaseMetadata.js';
+export * from './network/NetworkInformation.js';
+export * from './signer/TweakedSigner.js';
+export * from './transaction/TransactionFactory.js';
+export * from './transaction/interfaces/ITransactionParameters.js';
+export * from './transaction/interfaces/Tap.js';
+export * from './transaction/enums/TransactionType.js';
+export * from './transaction/builders/InteractionTransaction.js';
+export * from './transaction/builders/FundingTransaction.js';
+export * from './transaction/builders/TransactionBuilder.js';
+export * from './utils/BitcoinUtils.js';
+export * from './utxo/interfaces/IUTXO.js';
+export * from './utxo/UTXOManager.js';

package/cjs/opnet.js

@@ -1,5 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 var _version_js_1 = require("./_version.js");
 Object.defineProperty(exports, "version", { enumerable: true, get: function () { return _version_js_1.version; } });
+__exportStar(require("./bytecode/Compressor.js"), exports);
+__exportStar(require("./generators/Generator.js"), exports);
+__exportStar(require("./generators/builders/CalldataGenerator.js"), exports);
+__exportStar(require("./generators/builders/DeploymentGenerator.js"), exports);
+__exportStar(require("./generators/AddressGenerator.js"), exports);
+__exportStar(require("./verification/TapscriptVerificator.js"), exports);
+__exportStar(require("./keypair/EcKeyPair.js"), exports);
+__exportStar(require("./keypair/Wallet.js"), exports);
+__exportStar(require("./keypair/interfaces/IWallet.js"), exports);
+__exportStar(require("./metadata/contracts/wBTC.js"), exports);
+__exportStar(require("./metadata/ContractBaseMetadata.js"), exports);
+__exportStar(require("./network/NetworkInformation.js"), exports);
+__exportStar(require("./signer/TweakedSigner.js"), exports);
+__exportStar(require("./transaction/TransactionFactory.js"), exports);
+__exportStar(require("./transaction/interfaces/ITransactionParameters.js"), exports);
+__exportStar(require("./transaction/interfaces/Tap.js"), exports);
+__exportStar(require("./transaction/enums/TransactionType.js"), exports);
+__exportStar(require("./transaction/builders/InteractionTransaction.js"), exports);
+__exportStar(require("./transaction/builders/FundingTransaction.js"), exports);
+__exportStar(require("./transaction/builders/TransactionBuilder.js"), exports);
+__exportStar(require("./utils/BitcoinUtils.js"), exports);
+__exportStar(require("./utxo/interfaces/IUTXO.js"), exports);
+__exportStar(require("./utxo/UTXOManager.js"), exports);

package/{browser/scripts → cjs/tests}/Regtest.d.ts

@@ -1,2 +1,3 @@
 import { NetworkInformation } from '../network/NetworkInformation.js';
 export declare const Regtest: NetworkInformation;
+export declare const Testnet: NetworkInformation;

package/cjs/tests/Regtest.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Testnet = exports.Regtest = void 0;
+const bsi_common_1 = require("@btc-vision/bsi-common");
+exports.Regtest = {
+    wallet: {
+        address: 'bcrt1qfqsr3m7vjxheghcvw4ks0fryqxfq8qzjf8fxes',
+        publicKey: '020373626d317ae8788ce3280b491068610d840c23ecb64c14075bbb9f670af52c',
+        privateKey: 'cRCiYAgCBrU7hSaJBRuPqKVYXQqM5CKXbMfWHb25X4FDAWJ8Ai92',
+    },
+    config: {
+        BITCOIND_NETWORK: bsi_common_1.BitcoinNetwork.Regtest,
+        BITCOIND_HOST: '51.81.67.34',
+        BITCOIND_PORT: 9242,
+        BITCOIND_USERNAME: 'HJSiowseujhs',
+        BITCOIND_PASSWORD: 'YHEFHSDJ23JOIhjjef2ied9u290efu2930u90U',
+    },
+};
+exports.Testnet = {
+    wallet: {
+        address: 'tb1qcfszz8dcvsz9mcp70ezw5zy2r3ydr0cfz60d3t',
+        privateKey: 'cSZU2QB9aUYvaL6ukU9d3DKq7QaxTRms1BCQnx5vqXbxBk4bdBc4',
+        publicKey: '026764d622f083d78f47c2f2a007ab08e96edf398de74acc0251a7bba202ffb92b',
+    },
+    config: {
+        BITCOIND_NETWORK: bsi_common_1.BitcoinNetwork.TestNet,
+        BITCOIND_HOST: '51.81.67.34',
+        BITCOIND_PORT: 9237,
+        BITCOIND_USERNAME: 'HJSiowseujhs',
+        BITCOIND_PASSWORD: 'YHEFHSDJ23JOIhjjef2ied9u290efu2930u90U',
+    },
+};

package/cjs/tests/gen.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const TapscriptVerificator_js_1 = require("../verification/TapscriptVerificator.js");
+const bitcoinjs_lib_1 = require("bitcoinjs-lib");
+const Regtest_js_1 = require("./Regtest.js");
+const Wallet_js_1 = require("../keypair/Wallet.js");
+const wallet = new Wallet_js_1.Wallet(Regtest_js_1.Regtest.wallet, bitcoinjs_lib_1.networks.regtest);
+const params = {
+    bytecode: Buffer.from('deadbeef', 'hex'),
+    contractSaltPubKey: Buffer.from('deadbeef', 'hex'),
+    deployerPubKeyXOnly: wallet.xOnly,
+    originalSalt: Buffer.from('deadbeef', 'hex'),
+    network: bitcoinjs_lib_1.networks.regtest,
+};
+const contractAddress = TapscriptVerificator_js_1.TapscriptVerificator.getContractAddress(params);
+const virtualAddress = TapscriptVerificator_js_1.TapscriptVerificator.generateContractVirtualAddress(params.deployerPubKeyXOnly, params.bytecode, params.originalSalt, bitcoinjs_lib_1.networks.regtest);
+console.log('contract sewgit address', virtualAddress, '\ncontract p2tr address', contractAddress);

package/cjs/tests/test.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Wallet_js_1 = require("../keypair/Wallet.js");
+const Regtest_js_1 = require("./Regtest.js");
+const UTXOManager_js_1 = require("../utxo/UTXOManager.js");
+const bitcoinjs_lib_1 = require("bitcoinjs-lib");
+const bsi_bitcoin_rpc_1 = require("@btc-vision/bsi-bitcoin-rpc");
+const FundingTransaction_js_1 = require("../transaction/builders/FundingTransaction.js");
+const network = bitcoinjs_lib_1.networks.regtest;
+const rpc = new bsi_bitcoin_rpc_1.BitcoinRPC();
+const wallet = new Wallet_js_1.Wallet(Regtest_js_1.Regtest.wallet, network);
+const utxoManager = new UTXOManager_js_1.UTXOManager('http://localhost:9001');
+const shouldMineBlock = true;
+async function mineBlock() {
+    const ok = await rpc.generateToAddress(1, wallet.p2wpkh, 'default');
+    if (!ok) {
+        throw new Error('Could not mine block');
+    }
+    console.log(`Mined block`, ok);
+    return !!ok.length;
+}
+(async () => {
+    await rpc.init(Regtest_js_1.Regtest.config);
+    const utxoSetting = {
+        address: wallet.p2wpkh,
+        minAmount: 10000n,
+        requestedAmount: 100000n,
+    };
+    const utxos = await utxoManager.fetchUTXO(utxoSetting);
+    if (!utxos) {
+        throw new Error('No UTXOs found');
+    }
+    const interactionParameters = {
+        from: wallet.p2wpkh,
+        to: 'bcrt1qqvf4gprr05z248ph6gvx54rpg08p8ngq3zh8uh',
+        utxos: utxos,
+        signer: wallet.keypair,
+        network: network,
+        feeRate: 150,
+        priorityFee: 1000n,
+        childTransactionRequiredFees: 0n,
+    };
+    const fundingTransaction = new FundingTransaction_js_1.FundingTransaction(interactionParameters);
+    const fundingTx = fundingTransaction.signTransaction();
+    console.log(fundingTx.toHex());
+    const secondTxBroadcast = await rpc.sendRawTransaction({
+        hexstring: fundingTx.toHex(),
+    });
+    console.log(`Transaction broadcasted: ${secondTxBroadcast}`);
+    if (shouldMineBlock) {
+        await mineBlock();
+    }
+})();

package/cjs/tests/transfer.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const wBTC_js_1 = require("../metadata/contracts/wBTC.js");
+const Wallet_js_1 = require("../keypair/Wallet.js");
+const Regtest_js_1 = require("./Regtest.js");
+const UTXOManager_js_1 = require("../utxo/UTXOManager.js");
+const bitcoinjs_lib_1 = require("bitcoinjs-lib");
+const TransactionFactory_js_1 = require("../transaction/TransactionFactory.js");
+const bsi_bitcoin_rpc_1 = require("@btc-vision/bsi-bitcoin-rpc");
+const bsi_binary_1 = require("@btc-vision/bsi-binary");
+const network = bitcoinjs_lib_1.networks.testnet;
+const rpc = new bsi_bitcoin_rpc_1.BitcoinRPC();
+const wBtc = new wBTC_js_1.wBTC(network);
+const wallet = new Wallet_js_1.Wallet(Regtest_js_1.Testnet.wallet, network);
+const utxoManager = new UTXOManager_js_1.UTXOManager('https://testnet.opnet.org');
+const factory = new TransactionFactory_js_1.TransactionFactory();
+const abiCoder = new bsi_binary_1.ABICoder();
+const transferSelector = Number(`0x` + abiCoder.encodeSelector('transfer'));
+function getTransferToCalldata(to, amount) {
+    const addCalldata = new bsi_binary_1.BinaryWriter();
+    addCalldata.writeSelector(transferSelector);
+    addCalldata.writeAddress(to);
+    addCalldata.writeU256(amount);
+    return Buffer.from(addCalldata.getBuffer());
+}
+const shouldMineBlock = false;
+async function mineBlock() {
+    const ok = await rpc.generateToAddress(1, wallet.p2wpkh, 'default');
+    if (!ok) {
+        throw new Error('Could not mine block');
+    }
+    console.log(`Mined block`, ok);
+    return !!ok.length;
+}
+(async () => {
+    await rpc.init(Regtest_js_1.Testnet.config);
+    const utxoSetting = {
+        address: wallet.p2wpkh,
+        minAmount: 10000n,
+        requestedAmount: 100000n,
+    };
+    const utxos = await utxoManager.fetchUTXO(utxoSetting);
+    console.log(`UTXOs:`, utxos);
+    if (!utxos) {
+        throw new Error('No UTXOs found');
+    }
+    const calldata = getTransferToCalldata('tb1pt3ncc5ktfzpry2uvnag06v3jkv4quvmdydf09q8fx6rkgd7f5s8q3aenuk', 5000000n);
+    const interactionParameters = {
+        from: wallet.p2wpkh,
+        to: wBtc.getAddress(),
+        utxos: utxos,
+        signer: wallet.keypair,
+        network: network,
+        feeRate: 150,
+        priorityFee: 50000n,
+        calldata: calldata,
+    };
+    const finalTx = factory.signInteraction(interactionParameters);
+    const firstTxBroadcast = await rpc.sendRawTransaction({
+        hexstring: finalTx[0],
+    });
+    console.log(`First transaction broadcasted: ${firstTxBroadcast}`);
+    if (!firstTxBroadcast) {
+        throw new Error('Could not broadcast first transaction');
+    }
+    const secondTxBroadcast = await rpc.sendRawTransaction({
+        hexstring: finalTx[1],
+    });
+    console.log(`Second transaction broadcasted: ${secondTxBroadcast}`);
+    if (!secondTxBroadcast) {
+        throw new Error('Could not broadcast second transaction');
+    }
+    if (shouldMineBlock) {
+        await mineBlock();
+    }
+})();

package/cjs/transaction/TransactionFactory.js

@@ -8,7 +8,6 @@ class TransactionFactory {
         const preTransaction = new InteractionTransaction_js_1.InteractionTransaction(interactionParameters);
         preTransaction.signTransaction();
         const parameters = preTransaction.getFundingTransactionParameters();
-        console.log('funding transaction parameters:', parameters);
         const fundingTransaction = new FundingTransaction_js_1.FundingTransaction(parameters);
         const signedTransaction = fundingTransaction.signTransaction();
         if (!signedTransaction) {
@@ -20,12 +19,16 @@ class TransactionFactory {
             outputIndex: 0,
             scriptPubKey: {
                 hex: out.script.toString('hex'),
+                address: preTransaction.getScriptAddress(),
             },
             value: BigInt(out.value),
         };
-        interactionParameters.utxos = [newUtxo];
-        console.log(`new utxo`, newUtxo);
-        const finalTransaction = new InteractionTransaction_js_1.InteractionTransaction(interactionParameters);
+        const newParams = {
+            ...interactionParameters,
+            utxos: [newUtxo],
+            randomBytes: preTransaction.getRndBytes(),
+        };
+        const finalTransaction = new InteractionTransaction_js_1.InteractionTransaction(newParams);
         const outTx = finalTransaction.signTransaction();
         return [signedTransaction.toHex(), outTx.toHex()];
     }

package/cjs/transaction/builders/FundingTransaction.js

@@ -14,7 +14,7 @@ class FundingTransaction extends TransactionBuilder_js_1.TransactionBuilder {
     buildTransaction() {
         this.addInputsFromUTXO();
         const amountSpent = this.getTransactionOPNetFee() + this.childTransactionRequiredFees;
-        this.setFeeOutput({
+        this.addOutput({
             value: Number(amountSpent),
             address: this.to,
         });

package/cjs/transaction/builders/InteractionTransaction.d.ts

@@ -24,6 +24,8 @@ export declare class InteractionTransaction extends TransactionBuilder<Transacti
     protected readonly interactionPubKeys: Buffer[];
     protected readonly minimumSignatures: number;
     constructor(parameters: IInteractionParameters);
+    getContractSecret(): Buffer;
+    getRndBytes(): Buffer;
     protected generateSecret(): Buffer;
     protected tweakSigner(): void;
     protected scriptSignerXOnlyPubKey(): Buffer;

package/cjs/transaction/builders/InteractionTransaction.js

@@ -12,7 +12,7 @@ const bip371_js_1 = require("bitcoinjs-lib/src/psbt/bip371.js");
 const TweakedSigner_js_1 = require("../../signer/TweakedSigner.js");
 class InteractionTransaction extends TransactionBuilder_js_1.TransactionBuilder {
     type = TransactionType_js_1.TransactionType.INTERACTION;
-    randomBytes = BitcoinUtils_js_1.BitcoinUtils.rndBytes();
+    randomBytes;
     targetScriptRedeem = null;
     leftOverFundsScriptRedeem = null;
     compiledTargetScript;
@@ -22,7 +22,7 @@ class InteractionTransaction extends TransactionBuilder_js_1.TransactionBuilder
     calldata;
     contractSecret = this.generateSecret();
     tweakedSigner;
-    scriptSigner = this.generateKeyPairFromSeed();
+    scriptSigner;
     interactionPubKeys;
     minimumSignatures;
     constructor(parameters) {
@@ -33,11 +33,19 @@ class InteractionTransaction extends TransactionBuilder_js_1.TransactionBuilder
         this.calldata = Compressor_js_1.Compressor.compress(parameters.calldata);
         this.interactionPubKeys = parameters.pubKeys || [];
         this.minimumSignatures = parameters.minimumSignatures || 0;
+        this.randomBytes = parameters.randomBytes || BitcoinUtils_js_1.BitcoinUtils.rndBytes();
+        this.scriptSigner = this.generateKeyPairFromSeed();
         this.calldataGenerator = new CalldataGenerator_js_1.CalldataGenerator(this.internalPubKeyToXOnly(), this.scriptSignerXOnlyPubKey(), this.network);
         this.compiledTargetScript = this.calldataGenerator.compile(this.calldata, this.contractSecret, this.interactionPubKeys, this.minimumSignatures);
         this.scriptTree = this.getScriptTree();
         this.internalInit();
     }
+    getContractSecret() {
+        return this.contractSecret;
+    }
+    getRndBytes() {
+        return this.randomBytes;
+    }
     generateSecret() {
         return bitcoinjs_lib_1.address.fromBech32(this.to).data;
     }
@@ -62,6 +70,7 @@ class InteractionTransaction extends TransactionBuilder_js_1.TransactionBuilder
                     script: this.getTapOutput(),
                 },
                 tapLeafScript: [this.tapLeafScript],
+                sequence: 0xfffffffd,
             };
             this.addInput(input);
         }

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

@@ -7,8 +7,8 @@ import { Address } from '@btc-vision/bsi-binary';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { Logger } from '@btc-vision/logger';
 export declare abstract class TransactionBuilder<T extends TransactionType> extends Logger {
-    protected static readonly LOCK_LEAF_SCRIPT: Buffer;
-    protected static readonly MINIMUM_DUST: bigint;
+    static readonly LOCK_LEAF_SCRIPT: Buffer;
+    static readonly MINIMUM_DUST: bigint;
     abstract readonly type: T;
     readonly logColor: string;
     transactionFee: bigint;
@@ -36,6 +36,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     signTransaction(): Transaction;
     getTransaction(): Transaction;
     getScriptAddress(): string;
+    disableRBF(): void;
     getTapAddress(): string;
     addInput(input: PsbtInputExtended): void;
     addOutput(output: PsbtOutputExtended): void;