@btc-vision/transaction 1.0.5 → 1.0.7

package/cjs/transaction/builders/TransactionBuilder.js

@@ -31,7 +31,9 @@ const ecc = __importStar(require("tiny-secp256k1"));
 const EcKeyPair_js_1 = require("../../keypair/EcKeyPair.js");
 const logger_1 = require("@btc-vision/logger");
 class TransactionBuilder extends logger_1.Logger {
-    static LOCK_LEAF_SCRIPT = bitcoinjs_lib_1.script.compile([bitcoinjs_lib_1.opcodes.OP_0]);
+    static LOCK_LEAF_SCRIPT = bitcoinjs_lib_1.script.compile([
+        bitcoinjs_lib_1.opcodes.OP_0,
+    ]);
     static MINIMUM_DUST = 330n;
     logColor = '#785def';
     transactionFee = 0n;
@@ -118,6 +120,13 @@ class TransactionBuilder extends logger_1.Logger {
         }
         return this.scriptData.address;
     }
+    disableRBF() {
+        if (this.signed)
+            throw new Error('Transaction is already signed');
+        for (let input of this.inputs) {
+            input.sequence = 0xffffffff;
+        }
+    }
     getTapAddress() {
         if (!this.tapData || !this.tapData.address) {
             throw new Error('Tap data is required');
@@ -128,6 +137,9 @@ class TransactionBuilder extends logger_1.Logger {
         this.inputs.push(input);
     }
     addOutput(output) {
+        if (output.value < TransactionBuilder.MINIMUM_DUST) {
+            throw new Error(`Output value is less than the minimum dust ${output.value} < ${TransactionBuilder.MINIMUM_DUST}`);
+        }
         this.outputs.push(output);
     }
     addRefundOutput(amountSpent) {
@@ -170,6 +182,7 @@ class TransactionBuilder extends logger_1.Logger {
                     value: Number(utxo.value),
                     script: Buffer.from(utxo.scriptPubKey.hex, 'hex'),
                 },
+                sequence: 0xfffffffd,
             };
             this.addInput(input);
         }
@@ -235,10 +248,9 @@ class TransactionBuilder extends logger_1.Logger {
         return this.inputs;
     }
     getOutputs() {
-        if (!this.feeOutput)
-            throw new Error('Fee output is required');
         const outputs = [...this.outputs];
-        outputs.push(this.feeOutput);
+        if (this.feeOutput)
+            outputs.push(this.feeOutput);
         return outputs;
     }
     verifyUTXOValidity() {
@@ -249,12 +261,16 @@ class TransactionBuilder extends logger_1.Logger {
         }
     }
     setFeeOutput(output) {
+        const initialValue = output.value;
         this.feeOutput = output;
         const fee = this.estimateTransactionFees();
-        if (fee > BigInt(output.value)) {
+        if (fee > BigInt(initialValue)) {
             throw new Error('Insufficient funds');
         }
-        this.feeOutput.value = this.feeOutput.value - Number(fee);
+        this.feeOutput.value = initialValue - Number(fee);
+        if (this.feeOutput.value < TransactionBuilder.MINIMUM_DUST) {
+            this.feeOutput = null;
+        }
     }
     internalPubKeyToXOnly() {
         return (0, bip371_js_1.toXOnly)(this.signer.publicKey);
@@ -292,7 +308,6 @@ class TransactionBuilder extends logger_1.Logger {
             const tx = fakeTx.extractTransaction(false);
             const size = tx.virtualSize();
             const fee = this.feeRate * size + 1;
-            this.log(`Transaction fee estimated to: ${fee} - ${fakeTx.getFeeRate()}`);
             return BigInt(Math.ceil(fee));
         }
         else {

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

@@ -19,6 +19,7 @@ export interface IInteractionParameters extends ITransactionParameters {
     readonly calldata: Buffer;
     readonly pubKeys?: Buffer[];
     readonly minimumSignatures?: number;
+    readonly randomBytes?: Buffer;
 }
 export interface ITransactionDataContractInteractionWrap extends IInteractionParameters {
     readonly amount: bigint;

package/cjs/verification/TapscriptVerificator.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" />
+import { Network } from 'bitcoinjs-lib';
+import { Taptree } from 'bitcoinjs-lib/src/types.js';
+export interface ContractAddressVerificationParams {
+    readonly deployerPubKeyXOnly: Buffer;
+    readonly contractSaltPubKey: Buffer;
+    readonly originalSalt: Buffer;
+    readonly bytecode: Buffer;
+    readonly network?: Network;
+}
+export declare class TapscriptVerificator {
+    private static readonly TAP_SCRIPT_VERSION;
+    static getContractAddress(params: ContractAddressVerificationParams): string | undefined;
+    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/cjs/verification/TapscriptVerificator.js

@@ -0,0 +1,70 @@
+"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.TapscriptVerificator = void 0;
+const bitcoinjs_lib_1 = __importStar(require("bitcoinjs-lib"));
+const bip371_js_1 = require("bitcoinjs-lib/src/psbt/bip371.js");
+const DeploymentGenerator_js_1 = require("../generators/builders/DeploymentGenerator.js");
+const TransactionBuilder_js_1 = require("../transaction/builders/TransactionBuilder.js");
+const AddressGenerator_js_1 = require("../generators/AddressGenerator.js");
+class TapscriptVerificator {
+    static TAP_SCRIPT_VERSION = 192;
+    static getContractAddress(params) {
+        const network = params.network || bitcoinjs_lib_1.networks.bitcoin;
+        const scriptBuilder = new DeploymentGenerator_js_1.DeploymentGenerator(params.deployerPubKeyXOnly, (0, bip371_js_1.toXOnly)(params.contractSaltPubKey), network);
+        const compiledTargetScript = scriptBuilder.compile(params.bytecode, params.originalSalt);
+        const scriptTree = [
+            {
+                output: compiledTargetScript,
+                version: TapscriptVerificator.TAP_SCRIPT_VERSION,
+            },
+            {
+                output: TransactionBuilder_js_1.TransactionBuilder.LOCK_LEAF_SCRIPT,
+                version: TapscriptVerificator.TAP_SCRIPT_VERSION,
+            },
+        ];
+        return TapscriptVerificator.generateAddressFromScript(params, scriptTree);
+    }
+    static getContractSeed(deployerPubKey, bytecode, saltHash) {
+        const sha256OfBytecode = bitcoinjs_lib_1.default.crypto.hash256(bytecode);
+        const buf = Buffer.concat([deployerPubKey, saltHash, sha256OfBytecode]);
+        return bitcoinjs_lib_1.default.crypto.hash256(buf);
+    }
+    static generateContractVirtualAddress(deployerPubKey, bytecode, saltHash, network = bitcoinjs_lib_1.networks.bitcoin) {
+        const virtualAddress = TapscriptVerificator.getContractSeed(deployerPubKey, bytecode, saltHash);
+        return AddressGenerator_js_1.AddressGenerator.generatePKSH(virtualAddress, network);
+    }
+    static generateAddressFromScript(params, scriptTree) {
+        const network = params.network || bitcoinjs_lib_1.networks.bitcoin;
+        const transactionData = {
+            internalPubkey: params.deployerPubKeyXOnly,
+            network: network,
+            scriptTree: scriptTree,
+        };
+        const tx = bitcoinjs_lib_1.payments.p2tr(transactionData);
+        return tx.address;
+    }
+}
+exports.TapscriptVerificator = TapscriptVerificator;

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.5",
+    "version": "1.0.7",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -110,7 +110,6 @@
         "gulp-logger": "^0.0.2",
         "gulp-typescript": "^6.0.0-alpha.1",
         "gulplog": "^2.2.0",
-        "tiny-secp256k1": "^2.2.3",
         "ts-loader": "^9.5.1",
         "ts-node": "^10.9.2"
     }

package/src/_version.ts

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

package/src/bytecode/Compressor.ts

@@ -1,27 +1,27 @@
-import zlib, { ZlibOptions } from 'zlib';
-
-/** Compressor class for compressing and decompressing data. */
-export class Compressor {
-    private static readonly zlibOptions: ZlibOptions = {
-        level: 9,
-        maxOutputLength: 1024 * 1024 * 16, // 16mb, limit it to 16mb.
-    };
-
-    /**
-     * Compresses the data using gzip.
-     * @param {Uint8Array | Buffer} data The data to compress.
-     * @returns {Buffer} The compressed data.
-     */
-    public static compress(data: Uint8Array | Buffer): Buffer {
-        return zlib.gzipSync(data, Compressor.zlibOptions);
-    }
-
-    /**
-     * Decompresses the data using gunzip.
-     * @param {Uint8Array | Buffer} data The data to decompress.
-     * @returns {Buffer} The decompressed data.
-     */
-    public static decompress(data: Uint8Array | Buffer): Buffer {
-        return zlib.gunzipSync(data, Compressor.zlibOptions);
-    }
-}
+import zlib, { ZlibOptions } from 'zlib';
+
+/** Compressor class for compressing and decompressing data. */
+export class Compressor {
+    private static readonly zlibOptions: ZlibOptions = {
+        level: 9,
+        maxOutputLength: 1024 * 1024 * 16, // 16mb, limit it to 16mb.
+    };
+
+    /**
+     * Compresses the data using gzip.
+     * @param {Uint8Array | Buffer} data The data to compress.
+     * @returns {Buffer} The compressed data.
+     */
+    public static compress(data: Uint8Array | Buffer): Buffer {
+        return zlib.gzipSync(data, Compressor.zlibOptions);
+    }
+
+    /**
+     * Decompresses the data using gunzip.
+     * @param {Uint8Array | Buffer} data The data to decompress.
+     * @returns {Buffer} The decompressed data.
+     */
+    public static decompress(data: Uint8Array | Buffer): Buffer {
+        return zlib.gunzipSync(data, Compressor.zlibOptions);
+    }
+}

package/src/generators/AddressGenerator.ts

@@ -1,7 +1,7 @@
 import { createHash } from 'crypto';
 import { bech32 } from 'bech32';
 import { initEccLib, Network } from 'bitcoinjs-lib';
-import * as ecc from 'tiny-secp256k1';
+import * as ecc from '@bitcoinerlab/secp256k1';
 
 initEccLib(ecc);
 

package/src/keypair/EcKeyPair.ts

@@ -1,7 +1,7 @@
 import bip32, { BIP32Interface } from 'bip32';
 import { address, initEccLib, Network, networks, payments } from 'bitcoinjs-lib';
 import { ECPairFactory, ECPairInterface } from 'ecpair';
-import * as ecc from 'tiny-secp256k1';
+import * as ecc from '@bitcoinerlab/secp256k1';
 import { Address } from '@btc-vision/bsi-binary';
 import { IWallet } from './interfaces/IWallet.js';
 

package/src/signer/TweakedSigner.ts

@@ -1,7 +1,7 @@
 import { initEccLib, Network, Signer } 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);

package/src/transaction/builders/TransactionBuilder.ts

@@ -1,7 +1,7 @@
 import { initEccLib, Network, opcodes, Payment, payments, Psbt, script, Signer, Transaction } 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 { PsbtInputExtended, PsbtOutputExtended, UpdateInput } from '../interfaces/Tap.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IFundingTransactionParameters, ITransactionParameters } from '../interfaces/ITransactionParameters.js';

package/webpack.config.js

@@ -18,7 +18,7 @@ export default {
     },
     experiments: {
         outputModule: true,
-        asyncWebAssembly: true,
+        asyncWebAssembly: false,
         syncWebAssembly: true,
     },
     resolve: {
@@ -72,6 +72,7 @@ export default {
             process: 'process/browser',
             stream: 'stream-browserify',
             zlib: 'browserify-zlib',
+            bitcoin: 'bitcoinjs-lib',
         }),
     ],
 };