@btc-vision/transaction 1.0.94 → 1.0.96

package/browser/opnet.d.ts

@@ -12,7 +12,6 @@ export * from './keypair/interfaces/IWallet.js';
 export * from './keypair/AddressVerificator.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';

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

@@ -3,7 +3,7 @@ import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { DeploymentResult, UnwrapResult, WrapResult } from '../TransactionFactory';
 export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer'>;
 export type IWrapParametersWithoutSigner = Omit<IWrapParameters, 'signer'>;
-export type IUnwrapParametersSigner = Omit<IUnwrapParameters, 'signer'>;
+export type IUnwrapParametersWithoutSigner = Omit<IUnwrapParameters, 'signer'>;
 export type IDeploymentParametersWithoutSigner = Omit<IDeploymentParameters, 'signer' | 'network'>;
 export interface BroadcastTransactionOptions {
     raw: string;
@@ -22,5 +22,5 @@ export interface Web3Provider {
     deployContract(params: IDeploymentParametersWithoutSigner): Promise<DeploymentResult>;
     broadcast(transactions: BroadcastTransactionOptions[]): Promise<BroadcastedTransaction[]>;
     wrap(wrapParameters: IWrapParametersWithoutSigner): Promise<WrapResult>;
-    unwrap(unwrapParameters: IUnwrapParametersSigner): Promise<UnwrapResult>;
+    unwrap(unwrapParameters: IUnwrapParametersWithoutSigner): Promise<UnwrapResult>;
 }

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

@@ -7,6 +7,7 @@ import { TapLeafScript } from '../interfaces/Tap.js';
 import { Address } from '@btc-vision/bsi-binary';
 export declare class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
     type: TransactionType.DEPLOYMENT;
+    static readonly MAXIMUM_CONTRACT_SIZE: number;
     protected readonly _contractAddress: Address;
     protected tapLeafScript: TapLeafScript | null;
     private targetScriptRedeem;

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

@@ -36,7 +36,6 @@ export declare class PsbtTransaction extends TweakedTransaction {
     toHex(): string;
     addInput(input: PsbtInputExtended): void;
     addOutput(output: PsbtOutputExtended): void;
-    attemptSignAllInputs(): Promise<boolean>;
     attemptFinalizeInputs(n?: number): boolean;
     getPSBT(): Psbt;
     private getTotalOutputAmount;

package/browser/utils/BitcoinUtils.d.ts

@@ -3,7 +3,7 @@ import { VaultUTXOs } from '../transaction/processor/PsbtTransaction.js';
 export declare class BitcoinUtils {
     static btcToSatoshi(btc: number): BigInt;
     static rndBytes(): Buffer;
-    static getRandomValues(length: number): Buffer;
+    static getUnsafeRandomValues(length: number): Buffer;
     static opnetHash(data: Buffer): string;
     static orderVaultsByAddress(vaults: VaultUTXOs[]): VaultUTXOs[];
     static findVaultWithMostPublicKeys(vaults: VaultUTXOs[]): VaultUTXOs;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.94";
+export declare const version = "1.0.96";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.94';
+export const version = '1.0.96';

package/build/generators/builders/MultisignGenerator.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
 export declare class MultiSignGenerator {
+    static readonly MAXIMUM_SUPPORTED_SIGNATURE = 255;
     static compile(vaultPublicKeys: Buffer[], minimumSignatures?: number, internal?: Buffer): Buffer;
 }

package/build/generators/builders/MultisignGenerator.js

@@ -1,6 +1,7 @@
 import { opcodes, script } from 'bitcoinjs-lib';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 export class MultiSignGenerator {
+    static MAXIMUM_SUPPORTED_SIGNATURE = 255;
     static compile(vaultPublicKeys, minimumSignatures = 0, internal) {
         if (minimumSignatures < 2) {
             throw new Error('Minimum signatures must be greater than 1');
@@ -8,11 +9,12 @@ export class MultiSignGenerator {
         if (vaultPublicKeys.length < minimumSignatures) {
             throw new Error('The amount of public keys is lower than the minimum required');
         }
-        if (minimumSignatures > 255) {
-            throw new Error('The maximum amount of signatures is 255');
+        if (minimumSignatures > MultiSignGenerator.MAXIMUM_SUPPORTED_SIGNATURE) {
+            throw new Error(`The maximum amount of signatures is ${MultiSignGenerator.MAXIMUM_SUPPORTED_SIGNATURE}`);
         }
         const minimumRequired = Buffer.alloc(1);
         minimumRequired.writeUInt8(minimumSignatures);
+        vaultPublicKeys = vaultPublicKeys.filter((buf, index, self) => index === self.findIndex(otherBuf => buf.equals(otherBuf)));
         vaultPublicKeys = vaultPublicKeys.sort((a, b) => a.compare(b));
         let included = false;
         const data = vaultPublicKeys.map((key) => {

package/build/opnet.d.ts

@@ -12,7 +12,6 @@ export * from './keypair/interfaces/IWallet.js';
 export * from './keypair/AddressVerificator.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';

package/build/opnet.js

@@ -12,7 +12,6 @@ export * from './keypair/interfaces/IWallet.js';
 export * from './keypair/AddressVerificator.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';

package/build/transaction/TransactionFactory.js

@@ -23,7 +23,8 @@ export class TransactionFactory {
         await preTransaction.generateTransactionMinimalSignatures();
         const parameters = await preTransaction.getFundingTransactionParameters();
         parameters.utxos = interactionParameters.utxos;
-        parameters.amount = await preTransaction.estimateTransactionFees();
+        parameters.amount =
+            (await preTransaction.estimateTransactionFees()) + interactionParameters.priorityFee;
         const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
         if (!feeEstimationFundingTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -112,6 +113,7 @@ export class TransactionFactory {
         const preTransaction = new WrapTransaction(wrapParameters);
         await preTransaction.signTransaction();
         const parameters = await preTransaction.getFundingTransactionParameters();
+        console.log('wrap parameters', parameters);
         parameters.amount += childTransactionRequiredValue;
         parameters.utxos = fundingParameters.utxos;
         const signedTransaction = await this.createFundTransaction(parameters);
@@ -143,6 +145,7 @@ export class TransactionFactory {
             throw new Error('To address is required');
         const estimatedGas = await transaction.estimateTransactionFees();
         const estimatedFees = transaction.preEstimateTransactionFees(BigInt(unwrapParameters.feeRate), this.calculateNumInputs(unwrapParameters.unwrapUTXOs), 2n, this.calculateNumSignatures(unwrapParameters.unwrapUTXOs), this.maxPubKeySize(unwrapParameters.unwrapUTXOs));
+        console.log('estimatedFees', estimatedFees, 'estimatedGas', estimatedGas, 'priority', unwrapParameters.priorityFee);
         const fundingParameters = {
             ...unwrapParameters,
             amount: estimatedGas + estimatedFees,
@@ -203,7 +206,9 @@ export class TransactionFactory {
         await preTransaction.signTransaction();
         const parameters = await preTransaction.getFundingTransactionParameters();
         parameters.utxos = fundingParameters.utxos;
-        parameters.amount = await preTransaction.estimateTransactionFees();
+        parameters.amount =
+            (await preTransaction.estimateTransactionFees()) + unwrapParameters.priorityFee;
+        console.log('parameters', parameters);
         const signedTransaction = await this.createFundTransaction(parameters);
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');

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

@@ -3,7 +3,7 @@ import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { DeploymentResult, UnwrapResult, WrapResult } from '../TransactionFactory';
 export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer'>;
 export type IWrapParametersWithoutSigner = Omit<IWrapParameters, 'signer'>;
-export type IUnwrapParametersSigner = Omit<IUnwrapParameters, 'signer'>;
+export type IUnwrapParametersWithoutSigner = Omit<IUnwrapParameters, 'signer'>;
 export type IDeploymentParametersWithoutSigner = Omit<IDeploymentParameters, 'signer' | 'network'>;
 export interface BroadcastTransactionOptions {
     raw: string;
@@ -22,5 +22,5 @@ export interface Web3Provider {
     deployContract(params: IDeploymentParametersWithoutSigner): Promise<DeploymentResult>;
     broadcast(transactions: BroadcastTransactionOptions[]): Promise<BroadcastedTransaction[]>;
     wrap(wrapParameters: IWrapParametersWithoutSigner): Promise<WrapResult>;
-    unwrap(unwrapParameters: IUnwrapParametersSigner): Promise<UnwrapResult>;
+    unwrap(unwrapParameters: IUnwrapParametersWithoutSigner): Promise<UnwrapResult>;
 }

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

@@ -7,6 +7,7 @@ import { TapLeafScript } from '../interfaces/Tap.js';
 import { Address } from '@btc-vision/bsi-binary';
 export declare class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
     type: TransactionType.DEPLOYMENT;
+    static readonly MAXIMUM_CONTRACT_SIZE: number;
     protected readonly _contractAddress: Address;
     protected tapLeafScript: TapLeafScript | null;
     private targetScriptRedeem;

package/build/transaction/builders/DeploymentTransaction.js

@@ -9,6 +9,7 @@ import { Compressor } from '../../bytecode/Compressor.js';
 import { AddressGenerator } from '../../generators/AddressGenerator.js';
 export class DeploymentTransaction extends TransactionBuilder {
     type = TransactionType.DEPLOYMENT;
+    static MAXIMUM_CONTRACT_SIZE = 128 * 1024;
     _contractAddress;
     tapLeafScript = null;
     targetScriptRedeem = null;
@@ -25,6 +26,8 @@ export class DeploymentTransaction extends TransactionBuilder {
         this.bytecode = Compressor.compress(parameters.bytecode);
         if (!this.bytecode)
             throw new Error('Bytecode is required');
+        if (this.bytecode.length > DeploymentTransaction.MAXIMUM_CONTRACT_SIZE)
+            throw new Error('Contract size overflow.');
         this.randomBytes = parameters.randomBytes || BitcoinUtils.rndBytes();
         this.contractSeed = this.getContractSeed();
         this.contractSigner = EcKeyPair.fromSeedKeyPair(this.contractSeed, this.network);

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

@@ -36,7 +36,6 @@ export declare class PsbtTransaction extends TweakedTransaction {
     toHex(): string;
     addInput(input: PsbtInputExtended): void;
     addOutput(output: PsbtOutputExtended): void;
-    attemptSignAllInputs(): Promise<boolean>;
     attemptFinalizeInputs(n?: number): boolean;
     getPSBT(): Psbt;
     private getTotalOutputAmount;

package/build/transaction/processor/PsbtTransaction.js

@@ -56,20 +56,6 @@ export class PsbtTransaction extends TweakedTransaction {
             return;
         this.transaction.addOutput(output);
     }
-    async attemptSignAllInputs() {
-        let signed = false;
-        for (let i = 0; i < this.transaction.data.inputs.length; i++) {
-            const input = this.transaction.data.inputs[i];
-            try {
-                await this.signInput(this.transaction, input, i, this.signer);
-                signed = true;
-            }
-            catch (e) {
-                console.log(`can not sign. input ${i}`, e);
-            }
-        }
-        return signed;
-    }
     attemptFinalizeInputs(n = 1) {
         try {
             const inputs = this.transaction.data.inputs;

package/build/utils/BitcoinUtils.d.ts

@@ -3,7 +3,7 @@ import { VaultUTXOs } from '../transaction/processor/PsbtTransaction.js';
 export declare class BitcoinUtils {
     static btcToSatoshi(btc: number): BigInt;
     static rndBytes(): Buffer;
-    static getRandomValues(length: number): Buffer;
+    static getUnsafeRandomValues(length: number): Buffer;
     static opnetHash(data: Buffer): string;
     static orderVaultsByAddress(vaults: VaultUTXOs[]): VaultUTXOs[];
     static findVaultWithMostPublicKeys(vaults: VaultUTXOs[]): VaultUTXOs;

package/build/utils/BitcoinUtils.js

@@ -4,10 +4,10 @@ export class BitcoinUtils {
         return BigInt(btc * 100000000);
     }
     static rndBytes() {
-        const buf = BitcoinUtils.getRandomValues(64);
+        const buf = BitcoinUtils.getUnsafeRandomValues(64);
         return Buffer.from(buf);
     }
-    static getRandomValues(length) {
+    static getUnsafeRandomValues(length) {
         if (typeof window !== 'undefined' && window.crypto && window.crypto.getRandomValues) {
             const array = new Uint8Array(length);
             window.crypto.getRandomValues(array);

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.94",
+    "version": "1.0.96",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -87,10 +87,9 @@
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bsi-binary": "^1.0.37",
-        "@btc-vision/bsi-bitcoin-rpc": "^1.0.22",
-        "@btc-vision/bsi-common": "^1.0.16",
-        "@btc-vision/logger": "^1.0.2",
+        "@btc-vision/bsi-binary": "^1.0.38",
+        "@btc-vision/bsi-bitcoin-rpc": "^1.0.25",
+        "@btc-vision/logger": "^1.0.3",
         "assert": "^2.1.0",
         "babel-loader": "^9.1.3",
         "babel-plugin-transform-import-meta": "^2.2.1",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.94';
+export const version = '1.0.96';

package/src/generators/builders/MultiSignGenerator.ts

@@ -5,6 +5,8 @@ import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
  * Generate a bitcoin script for a multisign interaction
  */
 export class MultiSignGenerator {
+    public static readonly MAXIMUM_SUPPORTED_SIGNATURE = 255;
+
     public static compile(
         vaultPublicKeys: Buffer[],
         minimumSignatures: number = 0,
@@ -18,13 +20,18 @@ export class MultiSignGenerator {
             throw new Error('The amount of public keys is lower than the minimum required');
         }
 
-        if (minimumSignatures > 255) {
-            throw new Error('The maximum amount of signatures is 255');
+        if (minimumSignatures > MultiSignGenerator.MAXIMUM_SUPPORTED_SIGNATURE) {
+            throw new Error(`The maximum amount of signatures is ${MultiSignGenerator.MAXIMUM_SUPPORTED_SIGNATURE}`);
         }
 
         const minimumRequired = Buffer.alloc(1);
         minimumRequired.writeUInt8(minimumSignatures);
 
+        /** Remove duplicates **/
+        vaultPublicKeys = vaultPublicKeys.filter((buf, index, self) =>
+            index === self.findIndex(otherBuf => buf.equals(otherBuf))
+        );
+
         /** We must order the pub keys. */
         vaultPublicKeys = vaultPublicKeys.sort((a, b) => a.compare(b));
 

package/src/opnet.ts

@@ -23,9 +23,6 @@ export * from './keypair/AddressVerificator.js';
 export * from './metadata/contracts/wBTC.js';
 export * from './metadata/ContractBaseMetadata.js';
 
-/** Network */
-export * from './network/NetworkInformation.js';
-
 /** Signer */
 export * from './signer/TweakedSigner.js';