@btc-vision/transaction 1.0.41 → 1.0.44

package/build/transaction/builders/UnwrapSegwitTransaction.js

@@ -43,7 +43,7 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction {
         bufWriter.writeU256(amount);
         return Buffer.from(bufWriter.getBuffer());
     }
-    signPSBT() {
+    async signPSBT() {
         if (this.to && !EcKeyPair.verifyContractAddress(this.to, this.network)) {
             throw new Error('Invalid contract address. The contract address must be a taproot address.');
         }
@@ -53,16 +53,16 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction {
         if (this.signed)
             throw new Error('Transaction is already signed');
         this.signed = true;
-        this.buildTransaction();
+        await this.buildTransaction();
         this.ignoreSignatureError();
-        this.mergeVaults(this.vaultUTXOs);
-        const builtTx = this.internalBuildTransaction(this.transaction);
+        await this.mergeVaults(this.vaultUTXOs);
+        const builtTx = await this.internalBuildTransaction(this.transaction);
         if (builtTx) {
             return this.transaction;
         }
         throw new Error('Could not sign transaction');
     }
-    mergeVaults(input) {
+    async mergeVaults(input) {
         const firstVault = input[0];
         if (!firstVault) {
             throw new Error('No vaults provided');
@@ -85,10 +85,10 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction {
             value: Number(this.amount),
         });
         for (const vault of input) {
-            this.addVaultInputs(vault);
+            await this.addVaultInputs(vault);
         }
     }
-    internalBuildTransaction(transaction) {
+    async internalBuildTransaction(transaction) {
         if (transaction.data.inputs.length === 0) {
             const inputs = this.getInputs();
             const outputs = this.getOutputs();
@@ -100,7 +100,7 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction {
             transaction.addOutputs(outputs);
         }
         try {
-            this.signInputs(transaction);
+            await this.signInputs(transaction);
             if (this.finalized) {
                 this.transactionFee = BigInt(transaction.getFee());
             }
@@ -150,7 +150,7 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction {
         }
         this.addInput(input);
     }
-    addVaultInputs(vault, firstSigner = this.signer) {
+    async addVaultInputs(vault, firstSigner = this.signer) {
         const p2wshOutput = this.generateMultiSignRedeemScript(vault.publicKeys, vault.minimum);
         for (const utxo of vault.utxos) {
             const inputIndex = this.transaction.inputCount;
@@ -158,7 +158,7 @@ export class UnwrapSegwitTransaction extends SharedInteractionTransaction {
             if (firstSigner) {
                 this.log(`Signing input ${inputIndex} with ${firstSigner.publicKey.toString('hex')}`);
                 try {
-                    this.signInput(this.transaction, this.transaction.data.inputs[inputIndex], inputIndex, this.signer);
+                    await this.signInput(this.transaction, this.transaction.data.inputs[inputIndex], inputIndex, this.signer);
                     this.log(`Signed input ${inputIndex} with ${firstSigner.publicKey.toString('hex')}`);
                 }
                 catch (e) {

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

@@ -20,7 +20,7 @@ export declare class UnwrapTransaction extends SharedInteractionTransaction<Tran
     private readonly calculatedSignHash;
     constructor(parameters: IUnwrapParameters);
     static generateBurnCalldata(amount: bigint): Buffer;
-    signPSBT(): Psbt;
+    signPSBT(): Promise<Psbt>;
     getRefund(): bigint;
     getFeeLossOrRefund(): bigint;
     protected mergeVaults(): void;
@@ -35,7 +35,7 @@ export declare class UnwrapTransaction extends SharedInteractionTransaction<Tran
         redeem: Payment;
     };
     protected getScriptSolution(input: PsbtInput): Buffer[];
-    protected internalBuildTransaction(transaction: Psbt): boolean;
+    protected internalBuildTransaction(transaction: Psbt): Promise<boolean>;
     private addVaultUTXO;
     private addVaultInputs;
     private calculateOutputLeftAmountFromVaults;

package/build/transaction/builders/UnwrapTransaction.js

@@ -53,17 +53,17 @@ export class UnwrapTransaction extends SharedInteractionTransaction {
         bufWriter.writeU256(amount);
         return Buffer.from(bufWriter.getBuffer());
     }
-    signPSBT() {
+    async signPSBT() {
         if (this.to && !EcKeyPair.verifyContractAddress(this.to, this.network)) {
             throw new Error('Invalid contract address. The contract address must be a taproot address.');
         }
         if (!this.vaultUTXOs.length) {
             throw new Error('No vault UTXOs provided');
         }
-        this.buildTransaction();
+        await this.buildTransaction();
         this.ignoreSignatureError();
         this.mergeVaults();
-        const builtTx = this.internalBuildTransaction(this.transaction);
+        const builtTx = await this.internalBuildTransaction(this.transaction);
         if (builtTx) {
             return this.transaction;
         }
@@ -91,7 +91,10 @@ export class UnwrapTransaction extends SharedInteractionTransaction {
         if (!bestVault) {
             throw new Error('No vaults provided');
         }
-        let hasConsolidation = outputLeftAmount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT &&
+        if (outputLeftAmount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT) {
+            throw new Error('Output left amount is below the minimum amount');
+        }
+        let hasConsolidation = outputLeftAmount > currentConsensusConfig.VAULT_MINIMUM_AMOUNT &&
             outputLeftAmount - currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT !== 0n;
         if (hasConsolidation) {
             this.success(`Consolidating output with ${outputLeftAmount} sat.`);
@@ -179,7 +182,7 @@ export class UnwrapTransaction extends SharedInteractionTransaction {
             input.tapScriptSig[1].signature,
         ];
     }
-    internalBuildTransaction(transaction) {
+    async internalBuildTransaction(transaction) {
         if (transaction.data.inputs.length === 0) {
             const inputs = this.getInputs();
             const outputs = this.getOutputs();
@@ -192,7 +195,7 @@ export class UnwrapTransaction extends SharedInteractionTransaction {
         }
         try {
             try {
-                this.signInputs(transaction);
+                await this.signInputs(transaction);
             }
             catch (e) {
                 console.log(e);

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

@@ -22,7 +22,7 @@ export declare class WrapTransaction extends SharedInteractionTransaction<Transa
     constructor(parameters: IWrapParameters);
     private static generateMintCalldata;
     verifyPublicKeysConstraints(generation: WrappedGeneration): boolean;
-    protected buildTransaction(): void;
+    protected buildTransaction(): Promise<void>;
     private verifyRequiredValue;
     private addVaultOutput;
     private generateVaultAddress;

package/build/transaction/builders/WrapTransaction.js

@@ -81,7 +81,7 @@ export class WrapTransaction extends SharedInteractionTransaction {
         }
         return true;
     }
-    buildTransaction() {
+    async buildTransaction() {
         if (!this.to)
             throw new Error('To address is required');
         const selectedRedeem = !!this.scriptSigner
@@ -108,7 +108,7 @@ export class WrapTransaction extends SharedInteractionTransaction {
             address: this.to,
         });
         this.addVaultOutput();
-        this.addRefundOutput(amountSpent +
+        await this.addRefundOutput(amountSpent +
             this.amount +
             currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT);
     }

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

@@ -9,6 +9,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     readonly to?: Address | undefined;
     utxos: UTXO[];
     nonWitnessUtxo?: Buffer | undefined;
+    estimatedFees?: bigint;
     readonly feeRate: number;
     readonly priorityFee: bigint;
 }

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

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

package/build/transaction/processor/PsbtTransaction.js

@@ -56,12 +56,12 @@ export class PsbtTransaction extends TweakedTransaction {
             return;
         this.transaction.addOutput(output);
     }
-    attemptSignAllInputs() {
+    async attemptSignAllInputs() {
         let signed = false;
         for (let i = 0; i < this.transaction.data.inputs.length; i++) {
             const input = this.transaction.data.inputs[i];
             try {
-                this.signInput(this.transaction, input, i, this.signer);
+                await this.signInput(this.transaction, input, i, this.signer);
                 signed = true;
             }
             catch (e) {

package/build/transaction/shared/TweakedTransaction.d.ts

@@ -28,10 +28,12 @@ export declare abstract class TweakedTransaction extends Logger {
     protected sequence: number;
     protected tapLeafScript: TapLeafScript | null;
     protected nonWitnessUtxo?: Buffer;
+    protected readonly isBrowser: boolean;
     protected regenerated: boolean;
     protected ignoreSignatureErrors: boolean;
     protected constructor(data: ITweakedTransactionData);
     static readScriptWitnessToWitnessStack(buffer: Buffer): Buffer[];
+    static preEstimateTaprootTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numWitnessElements: bigint, witnessElementSize: bigint, emptyWitness: bigint, taprootControlWitnessSize?: bigint, taprootScriptSize?: bigint): bigint;
     protected static signInput(transaction: Psbt, input: PsbtInput, i: number, signer: Signer, sighashTypes: number[]): void;
     protected static calculateSignHash(sighashTypes: number[]): number;
     ignoreSignatureError(): void;
@@ -41,15 +43,14 @@ export declare abstract class TweakedTransaction extends Logger {
     disableRBF(): void;
     getTweakerHash(): Buffer | undefined;
     preEstimateTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numSignatures: bigint, numPubkeys: bigint): bigint;
-    static preEstimateTaprootTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numWitnessElements: bigint, witnessElementSize: bigint, emptyWitness: bigint, taprootControlWitnessSize?: bigint, taprootScriptSize?: bigint): bigint;
     protected generateTapData(): Payment;
     protected generateScriptAddress(): Payment;
     protected getSignerKey(): Signer;
-    protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer?: Signer): void;
-    protected signInputs(transaction: Psbt): void;
+    protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer?: Signer): Promise<void>;
+    protected signInputs(transaction: Psbt): Promise<void>;
     protected internalPubKeyToXOnly(): Buffer;
     protected internalInit(): void;
     protected tweakSigner(): void;
-    protected getTweakedSigner(useTweakedHash?: boolean, signer?: Signer): Signer;
+    protected getTweakedSigner(useTweakedHash?: boolean, signer?: Signer): Signer | undefined;
     protected generatePsbtInputExtended(utxo: UTXO, i: number): PsbtInputExtended;
 }

package/build/transaction/shared/TweakedTransaction.js

@@ -23,6 +23,7 @@ export class TweakedTransaction extends Logger {
     sequence = TransactionSequence.REPLACE_BY_FEE;
     tapLeafScript = null;
     nonWitnessUtxo;
+    isBrowser = false;
     regenerated = false;
     ignoreSignatureErrors = false;
     constructor(data) {
@@ -30,6 +31,7 @@ export class TweakedTransaction extends Logger {
         this.signer = data.signer;
         this.network = data.network;
         this.nonWitnessUtxo = data.nonWitnessUtxo;
+        this.isBrowser = typeof window !== 'undefined';
     }
     static readScriptWitnessToWitnessStack(buffer) {
         let offset = 0;
@@ -57,6 +59,21 @@ export class TweakedTransaction extends Logger {
         }
         return readVector();
     }
+    static preEstimateTaprootTransactionFees(feeRate, numInputs, numOutputs, numWitnessElements, witnessElementSize, emptyWitness, taprootControlWitnessSize = 32n, taprootScriptSize = 139n) {
+        const txHeaderSize = 10n;
+        const inputBaseSize = 41n;
+        const outputSize = 68n;
+        const taprootWitnessBaseSize = 1n;
+        const baseTxSize = txHeaderSize + inputBaseSize * numInputs + outputSize * numOutputs;
+        const witnessSize = numInputs * taprootWitnessBaseSize +
+            numWitnessElements * witnessElementSize +
+            taprootControlWitnessSize * numInputs +
+            taprootScriptSize * numInputs +
+            emptyWitness;
+        const weight = baseTxSize * 3n + (baseTxSize + witnessSize);
+        const vSize = weight / 4n;
+        return vSize * feeRate;
+    }
     static signInput(transaction, input, i, signer, sighashTypes) {
         if (sighashTypes && sighashTypes[0])
             input.sighashType = sighashTypes[0];
@@ -114,21 +131,6 @@ export class TweakedTransaction extends Logger {
         const vSize = weight / 4n;
         return vSize * feeRate;
     }
-    static preEstimateTaprootTransactionFees(feeRate, numInputs, numOutputs, numWitnessElements, witnessElementSize, emptyWitness, taprootControlWitnessSize = 32n, taprootScriptSize = 139n) {
-        const txHeaderSize = 10n;
-        const inputBaseSize = 41n;
-        const outputSize = 68n;
-        const taprootWitnessBaseSize = 1n;
-        const baseTxSize = txHeaderSize + inputBaseSize * numInputs + outputSize * numOutputs;
-        const witnessSize = numInputs * taprootWitnessBaseSize +
-            numWitnessElements * witnessElementSize +
-            taprootControlWitnessSize * numInputs +
-            taprootScriptSize * numInputs +
-            emptyWitness;
-        const weight = baseTxSize * 3n + (baseTxSize + witnessSize);
-        const vSize = weight / 4n;
-        return vSize * feeRate;
-    }
     generateTapData() {
         return {
             internalPubkey: this.internalPubKeyToXOnly(),
@@ -144,15 +146,15 @@ export class TweakedTransaction extends Logger {
     getSignerKey() {
         return this.signer;
     }
-    signInput(transaction, input, i, signer) {
+    async signInput(transaction, input, i, signer) {
         const signHash = this.sighashTypes && this.sighashTypes.length
             ? [TweakedTransaction.calculateSignHash(this.sighashTypes)]
             : undefined;
+        signer = signer || this.getSignerKey();
+        let testedTap = false;
         if (input.tapInternalKey) {
             if (!this.tweakedSigner)
                 this.tweakSigner();
-            if (!this.tweakedSigner)
-                throw new Error('Tweaked signer is required');
             let tweakedSigner;
             if (signer !== this.signer) {
                 tweakedSigner = this.getTweakedSigner(true, signer);
@@ -160,19 +162,50 @@ export class TweakedTransaction extends Logger {
             else {
                 tweakedSigner = this.tweakedSigner;
             }
-            transaction.signTaprootInput(i, tweakedSigner, undefined, signHash);
+            if (tweakedSigner) {
+                testedTap = true;
+                try {
+                    if ('signTaprootInput' in signer) {
+                        return await signer.signTaprootInput(transaction, i, signHash);
+                    }
+                    else {
+                        transaction.signTaprootInput(i, tweakedSigner, undefined, signHash);
+                    }
+                    return;
+                }
+                catch (e) { }
+            }
+        }
+        try {
+            if ('signInput' in signer) {
+                return await signer.signInput(transaction, i, signHash);
+            }
+            else {
+                transaction.signInput(i, signer, signHash);
+            }
         }
-        else {
-            transaction.signInput(i, signer || this.getSignerKey(), signHash);
+        catch (e) {
+            if (!testedTap) {
+                if ('signTaprootInput' in signer) {
+                    return await signer.signTaprootInput(transaction, i, signHash);
+                }
+                else if (this.tweakedSigner) {
+                    transaction.signTaprootInput(i, this.tweakedSigner, undefined, signHash);
+                }
+                else {
+                    throw e;
+                }
+            }
         }
     }
-    signInputs(transaction) {
+    async signInputs(transaction) {
         for (let i = 0; i < transaction.data.inputs.length; i++) {
             let input = transaction.data.inputs[i];
             try {
-                this.signInput(transaction, input, i);
+                await this.signInput(transaction, input, i);
             }
             catch (e) {
+                console.log(e);
                 this.log(`Failed to sign input ${i}: ${e.stack}`);
             }
         }
@@ -203,6 +236,9 @@ export class TweakedTransaction extends Logger {
         if (useTweakedHash) {
             settings.tweakHash = this.getTweakerHash();
         }
+        if (!('privateKey' in signer)) {
+            return;
+        }
         return TweakedSigner.tweakSigner(signer, settings);
     }
     generatePsbtInputExtended(utxo, i) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.41",
+    "version": "1.0.44",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -91,7 +91,7 @@
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bsi-binary": "^1.0.25",
+        "@btc-vision/bsi-binary": "^1.0.26",
         "@btc-vision/bsi-bitcoin-rpc": "^1.0.20",
         "@btc-vision/bsi-common": "^1.0.14",
         "@btc-vision/logger": "^1.0.2",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.41';
+export const version = '1.0.44';

package/src/metadata/contracts/wBTC.ts

@@ -34,7 +34,7 @@ export class wBTC extends ContractBaseMetadata {
             case networks.bitcoin.bech32:
                 return 'unknown';
             case networks.regtest.bech32:
-                return 'bcrt1qxeyh0pacdtkqmlna9n254fztp3ptadkkfu6efl';
+                return 'bcrt1q99qtptumw027cw8w274tqzd564q66u537vn0lh';
             case networks.testnet.bech32:
                 return 'tb1qj58a6yf4pez426nqvf8wyu6ssggcajw8kr44vy';
             default:

package/src/opnet.ts

@@ -1,76 +1,81 @@
-export { version } from './_version.js';
-
-/** Bytecode */
-export * from './bytecode/Compressor.js';
-
-/** Generators */
-export * from './generators/Generator.js';
-export * from './generators/builders/CalldataGenerator.js';
-export * from './generators/builders/DeploymentGenerator.js';
-export * from './generators/Features.js';
-
-/** Address */
-export * from './generators/AddressGenerator.js';
-export * from './verification/TapscriptVerificator.js';
-
-/** Key Pair */
-export * from './keypair/EcKeyPair.js';
-export * from './keypair/Wallet.js';
-export * from './keypair/interfaces/IWallet.js';
-export * from './keypair/AddressVerificator.js';
-
-/** Metadata */
-export * from './metadata/contracts/wBTC.js';
-export * from './metadata/ContractBaseMetadata.js';
-
-/** Network */
-export * from './network/NetworkInformation.js';
-
-/** Signer */
-export * from './signer/TweakedSigner.js';
-
-/** Transaction */
-export * from './transaction/TransactionFactory.js';
-export * from './transaction/interfaces/ITransactionParameters.js';
-export * from './transaction/interfaces/Tap.js';
-export * from './transaction/enums/TransactionType.js';
-
-/** Builders */
-export * from './transaction/builders/InteractionTransaction.js';
-export * from './transaction/builders/FundingTransaction.js';
-export * from './transaction/builders/TransactionBuilder.js';
-export * from './transaction/builders/WrapTransaction.js';
-export * from './transaction/builders/SharedInteractionTransaction.js';
-export * from './transaction/builders/DeploymentTransaction.js';
-
-/** wBTC */
-export * from './wbtc/WrappedGenerationParameters.js';
-export * from './wbtc/Generate.js';
-
-/** Utils */
-export * from './utils/BitcoinUtils.js';
-
-/** UTXO */
-export * from './utxo/interfaces/IUTXO.js';
-export * from './utxo/OPNetLimitedProvider.js';
-
-/** Processor */
-export * from './transaction/processor/PsbtTransaction.js';
-
-/** Shared */
-export * from './transaction/shared/TweakedTransaction.js';
-export * from './utxo/interfaces/BroadcastResponse.js';
-export * from './transaction/psbt/PSBTTypes.js';
-
-export * from './transaction/builders/MultiSignTransaction.js';
-export * from './generators/builders/MultiSignGenerator.js';
-
-export * from './transaction/shared/P2TR_MS.js';
-export * from './transaction/builders/UnwrapTransaction.js';
-
-export * from './wbtc/UnwrapGeneration.js';
-
-/** Consensus */
-export * from './consensus/ConsensusConfig.js';
-export * from './consensus/Consensus.js';
-export * from './consensus/metadata/RoswellConsensus.js';
+export { version } from './_version.js';
+
+/** Bytecode */
+export * from './bytecode/Compressor.js';
+
+/** Generators */
+export * from './generators/Generator.js';
+export * from './generators/builders/CalldataGenerator.js';
+export * from './generators/builders/DeploymentGenerator.js';
+export * from './generators/Features.js';
+
+/** Address */
+export * from './generators/AddressGenerator.js';
+export * from './verification/TapscriptVerificator.js';
+
+/** Key Pair */
+export * from './keypair/EcKeyPair.js';
+export * from './keypair/Wallet.js';
+export * from './keypair/interfaces/IWallet.js';
+export * from './keypair/AddressVerificator.js';
+
+/** Metadata */
+export * from './metadata/contracts/wBTC.js';
+export * from './metadata/ContractBaseMetadata.js';
+
+/** Network */
+export * from './network/NetworkInformation.js';
+
+/** Signer */
+export * from './signer/TweakedSigner.js';
+
+/** Transaction */
+export * from './transaction/TransactionFactory.js';
+export * from './transaction/interfaces/ITransactionParameters.js';
+export * from './transaction/interfaces/Tap.js';
+export * from './transaction/enums/TransactionType.js';
+
+/** Builders */
+export * from './transaction/builders/InteractionTransaction.js';
+export * from './transaction/builders/FundingTransaction.js';
+export * from './transaction/builders/TransactionBuilder.js';
+export * from './transaction/builders/WrapTransaction.js';
+export * from './transaction/builders/SharedInteractionTransaction.js';
+export * from './transaction/builders/DeploymentTransaction.js';
+
+/** wBTC */
+export * from './wbtc/WrappedGenerationParameters.js';
+export * from './wbtc/Generate.js';
+
+/** Utils */
+export * from './utils/BitcoinUtils.js';
+
+/** UTXO */
+export * from './utxo/interfaces/IUTXO.js';
+export * from './utxo/OPNetLimitedProvider.js';
+
+/** Processor */
+export * from './transaction/processor/PsbtTransaction.js';
+
+/** Shared */
+export * from './transaction/shared/TweakedTransaction.js';
+export * from './utxo/interfaces/BroadcastResponse.js';
+export * from './transaction/psbt/PSBTTypes.js';
+
+export * from './transaction/builders/MultiSignTransaction.js';
+export * from './generators/builders/MultiSignGenerator.js';
+
+export * from './transaction/shared/P2TR_MS.js';
+export * from './transaction/builders/UnwrapTransaction.js';
+
+export * from './wbtc/UnwrapGeneration.js';
+
+/** Consensus */
+export * from './consensus/ConsensusConfig.js';
+export * from './consensus/Consensus.js';
+export * from './consensus/metadata/RoswellConsensus.js';
+
+/** Custom signers */
+export * from './transaction/browser/BrowserSignerBase.js';
+export * from './transaction/browser/extensions/UnisatSigner.js';
+export * from './transaction/browser/types/Unisat.js';