@btc-vision/transaction 1.3.4 → 1.3.5

package/browser/opnet.d.ts

@@ -1,3 +1,4 @@
+import { Unisat } from './transaction/browser/types/Unisat.js';
 export { version } from './_version.js';
 export * from './bytecode/Compressor.js';
 export * from './generators/builders/CalldataGenerator.js';
@@ -63,3 +64,9 @@ export * from './metadata/tokens.js';
 export * from './transaction/browser/Web3Provider.js';
 export * from './keypair/Secp256k1PointDeriver.js';
 export * from './transaction/ContractAddress.js';
+declare global {
+    interface Window {
+        unisat?: Unisat;
+        opnet?: Unisat;
+    }
+}

package/browser/transaction/TransactionFactory.d.ts

@@ -52,7 +52,9 @@ export declare class TransactionFactory {
     createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;
     createChallengeSolution(parameters: IChallengeSolutionTransactionParameters): Promise<ChallengeSolution>;
     getAllNewUTXOs(original: TransactionBuilder<TransactionType>, tx: Transaction, to: string): UTXO[];
+    private parseOptionalInputs;
     private detectInteractionOPWallet;
+    private detectDeploymentOPWallet;
     private _createChallengeSolution;
     private createFundTransaction;
     private writePSBTHeader;

package/browser/transaction/browser/extensions/UnisatSigner.d.ts

@@ -1,11 +1,9 @@
 import { Network, Psbt } from '@btc-vision/bitcoin';
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { SignatureType, Unisat } from '../types/Unisat.js';
-declare global {
-    interface Window {
-        unisat?: Unisat;
-        opnet?: Unisat;
-    }
+export interface WindowWithWallets {
+    unisat?: Unisat;
+    opnet?: Unisat;
 }
 export declare class UnisatSigner extends CustomKeypair {
     private isInitialized;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.3.3";
+export declare const version = "1.3.5";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.3.3';
+export const version = '1.3.5';

package/build/opnet.d.ts

@@ -1,3 +1,4 @@
+import { Unisat } from './transaction/browser/types/Unisat.js';
 export { version } from './_version.js';
 export * from './bytecode/Compressor.js';
 export * from './generators/builders/CalldataGenerator.js';
@@ -63,3 +64,9 @@ export * from './metadata/tokens.js';
 export * from './transaction/browser/Web3Provider.js';
 export * from './keypair/Secp256k1PointDeriver.js';
 export * from './transaction/ContractAddress.js';
+declare global {
+    interface Window {
+        unisat?: Unisat;
+        opnet?: Unisat;
+    }
+}

package/build/transaction/TransactionFactory.d.ts

@@ -52,7 +52,9 @@ export declare class TransactionFactory {
     createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;
     createChallengeSolution(parameters: IChallengeSolutionTransactionParameters): Promise<ChallengeSolution>;
     getAllNewUTXOs(original: TransactionBuilder<TransactionType>, tx: Transaction, to: string): UTXO[];
+    private parseOptionalInputs;
     private detectInteractionOPWallet;
+    private detectDeploymentOPWallet;
     private _createChallengeSolution;
     private createFundTransaction;
     private writePSBTHeader;

package/build/transaction/TransactionFactory.js

@@ -70,18 +70,7 @@ export class TransactionFactory {
         if (!('signer' in interactionParameters)) {
             throw new Error('Field "signer" not provided, OP_WALLET not detected.');
         }
-        const inputs = (interactionParameters.optionalInputs || []).map((input) => {
-            let nonWitness = input.nonWitnessUtxo;
-            if (nonWitness &&
-                !(nonWitness instanceof Uint8Array) &&
-                typeof nonWitness === 'object') {
-                nonWitness = Buffer.from(Uint8Array.from(Object.values(input.nonWitnessUtxo)));
-            }
-            return {
-                ...input,
-                nonWitnessUtxo: nonWitness,
-            };
-        });
+        const inputs = this.parseOptionalInputs(interactionParameters.optionalInputs);
         const preTransaction = new InteractionTransaction({
             ...interactionParameters,
             utxos: [interactionParameters.utxos[0]],
@@ -134,13 +123,35 @@ export class TransactionFactory {
         };
     }
     async signDeployment(deploymentParameters) {
-        const preTransaction = new DeploymentTransaction(deploymentParameters);
-        await preTransaction.signTransaction();
+        const opWalletDeployment = await this.detectDeploymentOPWallet(deploymentParameters);
+        if (opWalletDeployment) {
+            return opWalletDeployment;
+        }
+        if (!('signer' in deploymentParameters)) {
+            throw new Error('Field "signer" not provided, OP_WALLET not detected.');
+        }
+        const inputs = this.parseOptionalInputs(deploymentParameters.optionalInputs);
+        const preTransaction = new DeploymentTransaction({
+            ...deploymentParameters,
+            utxos: [deploymentParameters.utxos[0]],
+            optionalInputs: inputs,
+        });
+        await preTransaction.generateTransactionMinimalSignatures();
         const parameters = await preTransaction.getFundingTransactionParameters();
+        parameters.utxos = deploymentParameters.utxos;
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
                 this.getPriorityFee(deploymentParameters) +
                 preTransaction.getOptionalOutputValue();
+        const feeEstimationFundingTransaction = await this.createFundTransaction({
+            ...parameters,
+            optionalOutputs: [],
+            optionalInputs: [],
+        });
+        if (!feeEstimationFundingTransaction) {
+            throw new Error('Could not sign funding transaction.');
+        }
+        parameters.estimatedFees = feeEstimationFundingTransaction.estimatedFees;
         const fundingTransaction = new FundingTransaction({
             ...parameters,
             optionalInputs: [],
@@ -166,8 +177,8 @@ export class TransactionFactory {
             randomBytes: preTransaction.getRndBytes(),
             preimage: preTransaction.getPreimage(),
             nonWitnessUtxo: signedTransaction.toBuffer(),
-            optionalOutputs: [],
-            optionalInputs: [],
+            estimatedFees: preTransaction.estimatedFees,
+            optionalInputs: inputs,
         };
         const finalTransaction = new DeploymentTransaction(newParams);
         const outTx = await finalTransaction.signTransaction();
@@ -230,11 +241,29 @@ export class TransactionFactory {
         }
         return utxos;
     }
+    parseOptionalInputs(optionalInputs) {
+        return (optionalInputs || []).map((input) => {
+            let nonWitness = input.nonWitnessUtxo;
+            if (nonWitness &&
+                !(nonWitness instanceof Uint8Array) &&
+                typeof nonWitness === 'object') {
+                nonWitness = Buffer.from(Uint8Array.from(Object.values(input.nonWitnessUtxo)));
+            }
+            return {
+                ...input,
+                nonWitnessUtxo: nonWitness,
+            };
+        });
+    }
     async detectInteractionOPWallet(interactionParameters) {
-        if (typeof window === 'undefined' || !window || !window.opnet || !window.opnet.web3) {
+        if (typeof window === 'undefined') {
+            return null;
+        }
+        const _window = window;
+        if (!_window || !_window.opnet || !_window.opnet.web3) {
             return null;
         }
-        const opnet = window.opnet.web3;
+        const opnet = _window.opnet.web3;
         const interaction = await opnet.signInteraction({
             ...interactionParameters,
             signer: undefined,
@@ -244,6 +273,24 @@ export class TransactionFactory {
         }
         return interaction;
     }
+    async detectDeploymentOPWallet(deploymentParameters) {
+        if (typeof window === 'undefined') {
+            return null;
+        }
+        const _window = window;
+        if (!_window || !_window.opnet || !_window.opnet.web3) {
+            return null;
+        }
+        const opnet = _window.opnet.web3;
+        const deployment = await opnet.deployContract({
+            ...deploymentParameters,
+            signer: undefined,
+        });
+        if (!deployment) {
+            throw new Error('Could not sign interaction transaction.');
+        }
+        return deployment;
+    }
     async _createChallengeSolution(parameters) {
         if (!parameters.to)
             throw new Error('Field "to" not provided.');

package/build/transaction/browser/extensions/UnisatSigner.d.ts

@@ -1,11 +1,9 @@
 import { Network, Psbt } from '@btc-vision/bitcoin';
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { SignatureType, Unisat } from '../types/Unisat.js';
-declare global {
-    interface Window {
-        unisat?: Unisat;
-        opnet?: Unisat;
-    }
+export interface WindowWithWallets {
+    unisat?: Unisat;
+    opnet?: Unisat;
 }
 export declare class UnisatSigner extends CustomKeypair {
     private isInitialized;

package/build/transaction/builders/DeploymentTransaction.js

@@ -125,7 +125,12 @@ export class DeploymentTransaction extends TransactionBuilder {
                 transaction.finalizeInput(i, this.customFinalizer);
             }
             else {
-                transaction.finalizeInput(i);
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                }
+                catch (e) {
+                    transaction.finalizeInput(i);
+                }
             }
         }
     }
@@ -146,7 +151,12 @@ export class DeploymentTransaction extends TransactionBuilder {
             }
             else {
                 transaction.signInput(i, this.getSignerKey());
-                transaction.finalizeInput(i);
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                }
+                catch (e) {
+                    transaction.finalizeInput(i);
+                }
             }
         }
     }

package/build/transaction/shared/TweakedTransaction.js

@@ -428,9 +428,9 @@ export class TweakedTransaction extends Logger {
             if (this.tapLeafScript) {
                 input.tapLeafScript = [this.tapLeafScript];
             }
-        }
-        if (i === 0 && this.nonWitnessUtxo) {
-            input.nonWitnessUtxo = this.nonWitnessUtxo;
+            if (this.nonWitnessUtxo) {
+                input.nonWitnessUtxo = this.nonWitnessUtxo;
+            }
         }
         return input;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.3.3';
+export const version = '1.3.5';

package/src/opnet.ts

@@ -1,3 +1,5 @@
+import { Unisat } from './transaction/browser/types/Unisat.js';
+
 export { version } from './_version.js';
 
 /** Bytecode */
@@ -97,3 +99,10 @@ export * from './transaction/browser/Web3Provider.js';
 
 export * from './keypair/Secp256k1PointDeriver.js';
 export * from './transaction/ContractAddress.js';
+
+declare global {
+    interface Window {
+        unisat?: Unisat;
+        opnet?: Unisat;
+    }
+}

package/src/transaction/TransactionFactory.ts

@@ -19,7 +19,11 @@ import {
 } from './interfaces/ITransactionParameters.js';
 import { PSBTTypes } from './psbt/PSBTTypes.js';
 import { ChallengeSolutionTransaction } from './builders/ChallengeSolutionTransaction.js';
-import { InteractionParametersWithoutSigner } from './browser/Web3Provider.js';
+import {
+    IDeploymentParametersWithoutSigner,
+    InteractionParametersWithoutSigner,
+} from './browser/Web3Provider.js';
+import { WindowWithWallets } from './browser/extensions/UnisatSigner.js';
 
 export interface DeploymentResult {
     readonly transaction: [string, string];
@@ -174,26 +178,7 @@ export class TransactionFactory {
             throw new Error('Field "signer" not provided, OP_WALLET not detected.');
         }
 
-        const inputs = (interactionParameters.optionalInputs || []).map((input) => {
-            let nonWitness = input.nonWitnessUtxo;
-            if (
-                nonWitness &&
-                !(nonWitness instanceof Uint8Array) &&
-                typeof nonWitness === 'object'
-            ) {
-                nonWitness = Buffer.from(
-                    Uint8Array.from(
-                        Object.values(input.nonWitnessUtxo as unknown as Record<number, number>),
-                    ),
-                );
-            }
-
-            return {
-                ...input,
-                nonWitnessUtxo: nonWitness,
-            };
-        });
-
+        const inputs = this.parseOptionalInputs(interactionParameters.optionalInputs);
         const preTransaction: InteractionTransaction = new InteractionTransaction({
             ...interactionParameters,
             utxos: [interactionParameters.utxos[0]], // we simulate one input here.
@@ -277,21 +262,46 @@ export class TransactionFactory {
     public async signDeployment(
         deploymentParameters: IDeploymentParameters,
     ): Promise<DeploymentResult> {
-        const preTransaction: DeploymentTransaction = new DeploymentTransaction(
-            deploymentParameters,
-        );
+        const opWalletDeployment = await this.detectDeploymentOPWallet(deploymentParameters);
+        if (opWalletDeployment) {
+            return opWalletDeployment;
+        }
 
-        // Initial generation
-        await preTransaction.signTransaction();
+        if (!('signer' in deploymentParameters)) {
+            throw new Error('Field "signer" not provided, OP_WALLET not detected.');
+        }
+
+        const inputs = this.parseOptionalInputs(deploymentParameters.optionalInputs);
+        const preTransaction: DeploymentTransaction = new DeploymentTransaction({
+            ...deploymentParameters,
+            utxos: [deploymentParameters.utxos[0]], // we simulate one input here.
+            optionalInputs: inputs,
+        });
+
+        // we don't sign that transaction, we just need the parameters.
+        await preTransaction.generateTransactionMinimalSignatures();
 
         const parameters: IFundingTransactionParameters =
             await preTransaction.getFundingTransactionParameters();
 
+        parameters.utxos = deploymentParameters.utxos;
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
             this.getPriorityFee(deploymentParameters) +
             preTransaction.getOptionalOutputValue();
 
+        const feeEstimationFundingTransaction = await this.createFundTransaction({
+            ...parameters,
+            optionalOutputs: [],
+            optionalInputs: [],
+        });
+
+        if (!feeEstimationFundingTransaction) {
+            throw new Error('Could not sign funding transaction.');
+        }
+
+        parameters.estimatedFees = feeEstimationFundingTransaction.estimatedFees;
+
         const fundingTransaction: FundingTransaction = new FundingTransaction({
             ...parameters,
             optionalInputs: [],
@@ -316,12 +326,12 @@ export class TransactionFactory {
 
         const newParams: IDeploymentParameters = {
             ...deploymentParameters,
-            utxos: [newUtxo],
+            utxos: [newUtxo], // always 0
             randomBytes: preTransaction.getRndBytes(),
             preimage: preTransaction.getPreimage(),
             nonWitnessUtxo: signedTransaction.toBuffer(),
-            optionalOutputs: [],
-            optionalInputs: [],
+            estimatedFees: preTransaction.estimatedFees,
+            optionalInputs: inputs,
         };
 
         const finalTransaction: DeploymentTransaction = new DeploymentTransaction(newParams);
@@ -420,14 +430,41 @@ export class TransactionFactory {
         return utxos;
     }
 
+    private parseOptionalInputs(optionalInputs?: UTXO[]): UTXO[] {
+        return (optionalInputs || []).map((input) => {
+            let nonWitness = input.nonWitnessUtxo;
+            if (
+                nonWitness &&
+                !(nonWitness instanceof Uint8Array) &&
+                typeof nonWitness === 'object'
+            ) {
+                nonWitness = Buffer.from(
+                    Uint8Array.from(
+                        Object.values(input.nonWitnessUtxo as unknown as Record<number, number>),
+                    ),
+                );
+            }
+
+            return {
+                ...input,
+                nonWitnessUtxo: nonWitness,
+            };
+        });
+    }
+
     private async detectInteractionOPWallet(
         interactionParameters: IInteractionParameters | InteractionParametersWithoutSigner,
     ): Promise<InteractionResponse | null> {
-        if (typeof window === 'undefined' || !window || !window.opnet || !window.opnet.web3) {
+        if (typeof window === 'undefined') {
+            return null;
+        }
+
+        const _window = window as WindowWithWallets;
+        if (!_window || !_window.opnet || !_window.opnet.web3) {
             return null;
         }
 
-        const opnet = window.opnet.web3;
+        const opnet = _window.opnet.web3;
         const interaction = await opnet.signInteraction({
             ...interactionParameters,
 
@@ -442,6 +479,33 @@ export class TransactionFactory {
         return interaction;
     }
 
+    private async detectDeploymentOPWallet(
+        deploymentParameters: IDeploymentParameters | IDeploymentParametersWithoutSigner,
+    ): Promise<DeploymentResult | null> {
+        if (typeof window === 'undefined') {
+            return null;
+        }
+
+        const _window = window as WindowWithWallets;
+        if (!_window || !_window.opnet || !_window.opnet.web3) {
+            return null;
+        }
+
+        const opnet = _window.opnet.web3;
+        const deployment = await opnet.deployContract({
+            ...deploymentParameters,
+
+            // @ts-expect-error no, this is ok
+            signer: undefined,
+        });
+
+        if (!deployment) {
+            throw new Error('Could not sign interaction transaction.');
+        }
+
+        return deployment;
+    }
+
     private async _createChallengeSolution(
         parameters: IChallengeSolutionTransactionParameters,
     ): Promise<ChallengeSolutionResponse> {

package/src/transaction/browser/extensions/UnisatSigner.ts

@@ -14,11 +14,9 @@ import { canSignNonTaprootInput, isTaprootInput } from '../../../signer/SignerUt
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { PsbtSignatureOptions, SignatureType, Unisat, UnisatNetwork } from '../types/Unisat.js';
 
-declare global {
-    interface Window {
-        unisat?: Unisat;
-        opnet?: Unisat;
-    }
+export interface WindowWithWallets {
+    unisat?: Unisat;
+    opnet?: Unisat;
 }
 
 export class UnisatSigner extends CustomKeypair {
@@ -85,7 +83,7 @@ export class UnisatSigner extends CustomKeypair {
     public get unisat(): Unisat {
         if (!window) throw new Error('Window not found');
 
-        const module = window.unisat;
+        const module = (window as WindowWithWallets).unisat;
         if (!module) {
             throw new Error('Unisat extension not found');
         }

package/src/transaction/builders/DeploymentTransaction.ts

@@ -118,7 +118,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
             this.verifyCalldata();
         }
 
-        if(!parameters.preimage) throw new Error('Preimage is required');
+        if (!parameters.preimage) throw new Error('Preimage is required');
 
         this.randomBytes = parameters.randomBytes || BitcoinUtils.rndBytes();
         this.preimage = parameters.preimage;
@@ -274,7 +274,11 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
             if (i === 0) {
                 transaction.finalizeInput(i, this.customFinalizer);
             } else {
-                transaction.finalizeInput(i);
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                } catch (e) {
+                    transaction.finalizeInput(i);
+                }
             }
         }
     }
@@ -305,7 +309,12 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
                 transaction.finalizeInput(0, this.customFinalizer);
             } else {
                 transaction.signInput(i, this.getSignerKey());
-                transaction.finalizeInput(i);
+
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                } catch (e) {
+                    transaction.finalizeInput(i);
+                }
             }
         }
     }

package/src/transaction/shared/TweakedTransaction.ts

@@ -802,11 +802,10 @@ export abstract class TweakedTransaction extends Logger {
             if (this.tapLeafScript) {
                 input.tapLeafScript = [this.tapLeafScript];
             }
-        }
 
-        // If the first input and we have a global nonWitnessUtxo not yet set
-        if (i === 0 && this.nonWitnessUtxo) {
-            input.nonWitnessUtxo = this.nonWitnessUtxo;
+            if (this.nonWitnessUtxo) {
+                input.nonWitnessUtxo = this.nonWitnessUtxo;
+            }
         }
 
         /*if (utxo.nonWitnessUtxo && extra) {