@btc-vision/transaction 1.3.3 → 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/browser/transaction/builders/SharedInteractionTransaction.d.ts

@@ -36,8 +36,8 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
         finalScriptWitness: Buffer<ArrayBufferLike>;
     };
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
+    protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
     private createMineableRewardOutputs;
-    private signInputsNonWalletBased;
     private getPubKeys;
     private generateRedeemScripts;
 }

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

@@ -51,6 +51,7 @@ export declare abstract class TweakedTransaction extends Logger {
     protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer: Signer | ECPairInterface, reverse?: boolean, errored?: boolean): Promise<void>;
     protected splitArray<T>(arr: T[], chunkSize: number): T[][];
     protected signInputs(transaction: Psbt): Promise<void>;
+    protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
     protected internalPubKeyToXOnly(): Buffer;
     protected internalInit(): void;
     protected tweakSigner(): void;
@@ -64,7 +65,7 @@ export declare abstract class TweakedTransaction extends Logger {
         redeemScript: Buffer;
         outputScript: Buffer;
     } | undefined;
-    protected generatePsbtInputExtended(utxo: UTXO, i: number): PsbtInputExtended;
+    protected generatePsbtInputExtended(utxo: UTXO, i: number, extra?: boolean): PsbtInputExtended;
     protected customFinalizerP2SH: (inputIndex: number, input: PsbtInput, scriptA: Buffer, isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean) => {
         finalScriptSig: Buffer | undefined;
         finalScriptWitness: Buffer | undefined;

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,9 +70,11 @@ export class TransactionFactory {
         if (!('signer' in interactionParameters)) {
             throw new Error('Field "signer" not provided, OP_WALLET not detected.');
         }
+        const inputs = this.parseOptionalInputs(interactionParameters.optionalInputs);
         const preTransaction = new InteractionTransaction({
             ...interactionParameters,
             utxos: [interactionParameters.utxos[0]],
+            optionalInputs: inputs,
         });
         await preTransaction.generateTransactionMinimalSignatures();
         const parameters = await preTransaction.getFundingTransactionParameters();
@@ -101,11 +103,14 @@ export class TransactionFactory {
         interactionParameters.utxos = this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0);
         const newParams = {
             ...interactionParameters,
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0),
+            utxos: [
+                ...this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0),
+            ],
             randomBytes: preTransaction.getRndBytes(),
             preimage: preTransaction.getPreimage(),
             nonWitnessUtxo: signedTransaction.tx.toBuffer(),
             estimatedFees: preTransaction.estimatedFees,
+            optionalInputs: inputs,
         };
         const finalTransaction = new InteractionTransaction(newParams);
         const outTx = await finalTransaction.signTransaction();
@@ -118,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: [],
@@ -150,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();
@@ -214,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.opnet || !window.opnet.web3) {
+        if (typeof window === 'undefined') {
             return null;
         }
-        const opnet = window.opnet.web3;
+        const _window = window;
+        if (!_window || !_window.opnet || !_window.opnet.web3) {
+            return null;
+        }
+        const opnet = _window.opnet.web3;
         const interaction = await opnet.signInteraction({
             ...interactionParameters,
             signer: undefined,
@@ -228,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/browser/extensions/UnisatSigner.js

@@ -42,6 +42,8 @@ export class UnisatSigner extends CustomKeypair {
         return this._network;
     }
     get unisat() {
+        if (!window)
+            throw new Error('Window not found');
         const module = window.unisat;
         if (!module) {
             throw new Error('Unisat extension not found');

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/builders/SharedInteractionTransaction.d.ts

@@ -36,8 +36,8 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
         finalScriptWitness: Buffer<ArrayBufferLike>;
     };
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
+    protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
     private createMineableRewardOutputs;
-    private signInputsNonWalletBased;
     private getPubKeys;
     private generateRedeemScripts;
 }

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -156,7 +156,30 @@ export class SharedInteractionTransaction extends TransactionBuilder {
                 transaction.finalizeInput(i, this.customFinalizer);
             }
             else {
-                transaction.finalizeInput(i);
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                }
+                catch (e) {
+                    transaction.finalizeInput(i);
+                }
+            }
+        }
+    }
+    async signInputsNonWalletBased(transaction) {
+        for (let i = 0; i < transaction.data.inputs.length; i++) {
+            if (i === 0) {
+                await this.signInput(transaction, transaction.data.inputs[i], i, this.scriptSigner);
+                await this.signInput(transaction, transaction.data.inputs[i], i, this.getSignerKey());
+                transaction.finalizeInput(0, this.customFinalizer);
+            }
+            else {
+                await this.signInput(transaction, transaction.data.inputs[i], i, this.signer);
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                }
+                catch (e) {
+                    transaction.finalizeInput(i);
+                }
             }
         }
     }
@@ -187,19 +210,6 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             await this.addRefundOutput(amountSpent + amount);
         }
     }
-    async signInputsNonWalletBased(transaction) {
-        for (let i = 0; i < transaction.data.inputs.length; i++) {
-            if (i === 0) {
-                await this.signInput(transaction, transaction.data.inputs[i], i, this.scriptSigner);
-                await this.signInput(transaction, transaction.data.inputs[i], i, this.getSignerKey());
-                transaction.finalizeInput(i, this.customFinalizer);
-            }
-            else {
-                await this.signInput(transaction, transaction.data.inputs[i], i, this.getSignerKey());
-                transaction.finalizeInput(i);
-            }
-        }
-    }
     getPubKeys() {
         const pubKeys = [Buffer.from(this.signer.publicKey)];
         if (this.scriptSigner) {

package/build/transaction/builders/TransactionBuilder.js

@@ -293,9 +293,9 @@ export class TransactionBuilder extends TweakedTransaction {
             }
         }
         if (this.optionalInputs) {
-            for (let i = 0; i < this.optionalInputs.length; i++) {
-                const utxo = this.optionalInputs[i];
-                const input = this.generatePsbtInputExtended(utxo, i);
+            for (let i = this.utxos.length; i < this.optionalInputs.length + this.utxos.length; i++) {
+                const utxo = this.optionalInputs[i - this.utxos.length];
+                const input = this.generatePsbtInputExtended(utxo, i, true);
                 this.addInput(input);
             }
         }

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

@@ -51,6 +51,7 @@ export declare abstract class TweakedTransaction extends Logger {
     protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer: Signer | ECPairInterface, reverse?: boolean, errored?: boolean): Promise<void>;
     protected splitArray<T>(arr: T[], chunkSize: number): T[][];
     protected signInputs(transaction: Psbt): Promise<void>;
+    protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
     protected internalPubKeyToXOnly(): Buffer;
     protected internalInit(): void;
     protected tweakSigner(): void;
@@ -64,7 +65,7 @@ export declare abstract class TweakedTransaction extends Logger {
         redeemScript: Buffer;
         outputScript: Buffer;
     } | undefined;
-    protected generatePsbtInputExtended(utxo: UTXO, i: number): PsbtInputExtended;
+    protected generatePsbtInputExtended(utxo: UTXO, i: number, extra?: boolean): PsbtInputExtended;
     protected customFinalizerP2SH: (inputIndex: number, input: PsbtInput, scriptA: Buffer, isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean) => {
         finalScriptSig: Buffer | undefined;
         finalScriptWitness: Buffer | undefined;

package/build/transaction/shared/TweakedTransaction.js

@@ -208,6 +208,9 @@ export class TweakedTransaction extends Logger {
             await this.signInputsWalletBased(transaction);
             return;
         }
+        await this.signInputsNonWalletBased(transaction);
+    }
+    async signInputsNonWalletBased(transaction) {
         const txs = transaction.data.inputs;
         const batchSize = 20;
         const batches = this.splitArray(txs, batchSize);
@@ -324,7 +327,7 @@ export class TweakedTransaction extends Logger {
         }
         return;
     }
-    generatePsbtInputExtended(utxo, i) {
+    generatePsbtInputExtended(utxo, i, extra = false) {
         const script = Buffer.from(utxo.scriptPubKey.hex, 'hex');
         const input = {
             hash: utxo.transactionId,
@@ -421,11 +424,13 @@ export class TweakedTransaction extends Logger {
         else {
             this.error(`Unknown or unsupported script type for output: ${utxo.scriptPubKey.hex}`);
         }
-        if (this.tapLeafScript) {
-            input.tapLeafScript = [this.tapLeafScript];
-        }
-        if (i === 0 && this.nonWitnessUtxo) {
-            input.nonWitnessUtxo = this.nonWitnessUtxo;
+        if (i === 0) {
+            if (this.tapLeafScript) {
+                input.tapLeafScript = [this.tapLeafScript];
+            }
+            if (this.nonWitnessUtxo) {
+                input.nonWitnessUtxo = this.nonWitnessUtxo;
+            }
         }
         return input;
     }
@@ -453,7 +458,16 @@ export class TweakedTransaction extends Logger {
                 tweakedSigner = this.tweakedSigner;
             }
             if (tweakedSigner) {
-                await this.signTaprootInput(tweakedSigner, transaction, i);
+                try {
+                    await this.signTaprootInput(tweakedSigner, transaction, i);
+                }
+                catch (e) {
+                    tweakedSigner = this.getTweakedSigner(false, this.signer);
+                    if (!tweakedSigner) {
+                        throw new Error(`Failed to obtain tweaked signer for input ${i}.`);
+                    }
+                    await this.signTaprootInput(tweakedSigner, transaction, i);
+                }
             }
             else {
                 this.error(`Failed to obtain tweaked signer for input ${i}.`);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.3.3",
+    "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;
+    }
+}