@btc-vision/transaction 1.2.5 → 1.2.7

package/src/generators/builders/CalldataGenerator.ts

@@ -4,6 +4,7 @@ import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { FeatureOpCodes, Features } from '../Features.js';
 import { Generator } from '../Generator.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 
 /**
  * Class to generate bitcoin script for interaction transactions
@@ -57,6 +58,7 @@ export class CalldataGenerator extends Generator {
      * @param {Buffer} calldata - The calldata to use
      * @param {Buffer} contractSecret - The contract secret
      * @param preimage
+     * @param maxPriority - Amount of satoshis to spend max on priority fee
      * @param {number[]} [features=[]] - The features to use (optional)
      * @returns {Buffer} - The compiled script
      * @throws {Error} - If something goes wrong
@@ -65,6 +67,7 @@ export class CalldataGenerator extends Generator {
         calldata: Buffer,
         contractSecret: Buffer,
         preimage: Buffer,
+        maxPriority: bigint,
         features: Features[] = [],
     ): Buffer {
         if (!this.contractSaltPubKey) throw new Error('Contract salt public key not set');
@@ -73,7 +76,7 @@ export class CalldataGenerator extends Generator {
         if (!dataChunks.length) throw new Error('No data chunks found');
 
         let compiledData = [
-            this.senderFirstByte,
+            this.getHeader(maxPriority),
             opcodes.OP_TOALTSTACK,
 
             // CHALLENGE PREIMAGE FOR REWARD,

package/src/generators/builders/DeploymentGenerator.ts

@@ -15,6 +15,7 @@ export class DeploymentGenerator extends Generator {
      * @param {Buffer} contractBytecode - The contract bytecode
      * @param {Buffer} contractSalt - The contract salt
      * @param {Buffer} preimage - The preimage for reward
+     * @param {bigint} maxPriority - The maximum priority for the contract
      * @param {Buffer} [calldata] - The calldata to be passed to the contract
      * @returns {Buffer} - The compiled script
      */
@@ -22,9 +23,10 @@ export class DeploymentGenerator extends Generator {
         contractBytecode: Buffer,
         contractSalt: Buffer,
         preimage: Buffer,
+        maxPriority: bigint,
         calldata?: Buffer,
     ): Buffer {
-        const asm = this.getAsm(contractBytecode, contractSalt, preimage, calldata);
+        const asm = this.getAsm(contractBytecode, contractSalt, preimage, maxPriority, calldata);
         const compiled = script.compile(asm);
 
         /**
@@ -42,15 +44,16 @@ export class DeploymentGenerator extends Generator {
         contractBytecode: Buffer,
         contractSalt: Buffer,
         preimage: Buffer,
+        maxPriority: bigint,
         calldata?: Buffer,
     ): (number | Buffer)[] {
         if (!this.contractSaltPubKey) throw new Error('Contract salt public key not set');
 
         const dataChunks: Buffer[][] = this.splitBufferIntoChunks(contractBytecode);
         const calldataChunks: Buffer[][] = calldata ? this.splitBufferIntoChunks(calldata) : [];
-        
+
         const compiledData = [
-            this.senderFirstByte,
+            this.getHeader(maxPriority),
             opcodes.OP_TOALTSTACK,
 
             // CHALLENGE PREIMAGE FOR REWARD,

package/src/generators/builders/LegacyCalldataGenerator.ts

@@ -52,23 +52,30 @@ export class LegacyCalldataGenerator extends Generator {
      * Compile an interaction bitcoin script
      * @param {Buffer} calldata - The calldata to use
      * @param {Buffer} contractSecret - The contract secret
+     * @param {Buffer} preimage - The preimage to use
+     * @param {bigint} maxPriority - The maximum priority
      * @param {number[]} [features=[]] - The features to use (optional)
-     * @param {Buffer[]} [vaultPublicKeys=[]] - The public keys of the vault (optional)
-     * @param {number} [minimumSignatures=0] - The minimum number of signatures (optional)
      * @returns {Buffer} - The compiled script
      * @throws {Error} - If something goes wrong
      */
     public compile(
         calldata: Buffer,
         contractSecret: Buffer,
+        preimage: Buffer,
+        maxPriority: bigint,
         features: Features[] = [],
-        vaultPublicKeys: Buffer[] = [],
-        minimumSignatures: number = 0,
     ): Buffer {
         const dataChunks: Buffer[][] = this.splitBufferIntoChunks(calldata);
         if (!dataChunks.length) throw new Error('No data chunks found');
 
         let compiledData = [
+            this.getHeader(maxPriority),
+            opcodes.OP_TOALTSTACK,
+
+            // CHALLENGE PREIMAGE FOR REWARD,
+            preimage,
+            opcodes.OP_TOALTSTACK,
+
             this.senderPubKey,
             opcodes.OP_DUP,
             opcodes.OP_HASH256,
@@ -87,42 +94,6 @@ export class LegacyCalldataGenerator extends Generator {
             Generator.MAGIC,
         ];
 
-        // write pub keys, when requested.
-        if (vaultPublicKeys.length > 0) {
-            const pubKeyBuffer = LegacyCalldataGenerator.getPubKeyAsBuffer(
-                vaultPublicKeys,
-                this.network,
-            );
-            const pubKeyDataChunks: Buffer[][] = this.splitBufferIntoChunks(pubKeyBuffer);
-
-            compiledData = compiledData.concat(
-                ...[
-                    opcodes.OP_0, // provide opnet public keys
-                    ...pubKeyDataChunks,
-                ],
-            );
-
-            if (minimumSignatures) {
-                // verify that the minimum is not greater than 255
-                if (minimumSignatures > 255) {
-                    throw new Error('Minimum signatures cannot exceed 255');
-                }
-
-                // we use a 2 bytes buffer even if we limit to 255 so it does not use an opcode for the number
-                const minSigBuffer = Buffer.alloc(2);
-                minSigBuffer.writeUint16LE(minimumSignatures, 0);
-
-                compiledData = compiledData.concat(
-                    ...[
-                        opcodes.OP_1, // provide minimum signatures
-                        minSigBuffer,
-                    ],
-                );
-            } else {
-                throw new Error('Minimum signatures must be provided');
-            }
-        }
-
         const featureOpcodes = features.map((feature) => FeatureOpCodes[feature]); // Get the opcodes for the features
 
         // Write calldata

package/src/transaction/TransactionFactory.ts

@@ -397,7 +397,13 @@ export class TransactionFactory {
         }
 
         const opnet = window.opnet.web3;
-        const interaction = await opnet.signInteraction(interactionParameters);
+        const interaction = await opnet.signInteraction({
+            ...interactionParameters,
+
+            // @ts-expect-error no, this is ok
+            signer: undefined,
+        });
+
         if (!interaction) {
             throw new Error('Could not sign interaction transaction.');
         }
@@ -456,11 +462,12 @@ export class TransactionFactory {
     }
 
     private getPriorityFee(params: ITransactionParameters): bigint {
-        if (params.priorityFee < TransactionBuilder.MINIMUM_DUST) {
+        const totalFee = params.priorityFee + params.gasSatFee;
+        if (totalFee < TransactionBuilder.MINIMUM_DUST) {
             return TransactionBuilder.MINIMUM_DUST;
         }
 
-        return params.priorityFee;
+        return totalFee;
     }
 
     private getUTXOAsTransaction(tx: Transaction, to: string, index: number): UTXO[] {

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

@@ -1,9 +1,9 @@
 import {
     crypto as bitCrypto,
-    script as bitScript,
     Network,
     networks,
     Psbt,
+    script as bitScript,
     TapScriptSig,
     toXOnly,
 } from '@btc-vision/bitcoin';
@@ -12,7 +12,7 @@ import { ECPairInterface } from 'ecpair';
 import { EcKeyPair } from '../../../keypair/EcKeyPair.js';
 import { canSignNonTaprootInput, isTaprootInput } from '../../../signer/SignerUtils.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';
-import { PsbtSignatureOptions, Unisat, UnisatNetwork } from '../types/Unisat.js';
+import { PsbtSignatureOptions, SignatureType, Unisat, UnisatNetwork } from '../types/Unisat.js';
 
 declare global {
     interface Window {
@@ -91,6 +91,13 @@ export class UnisatSigner extends CustomKeypair {
         return module;
     }
 
+    public async signData(data: Buffer, type: SignatureType): Promise<Buffer> {
+        const str = data.toString('hex');
+        const signature = await this.unisat.signData(str, type);
+
+        return Buffer.from(signature, 'hex');
+    }
+
     public async init(): Promise<void> {
         if (this.isInitialized) {
             return;

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

@@ -9,7 +9,7 @@ import {
 } from '../../../signer/SignerUtils.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { PsbtSignatureOptions } from '../types/Unisat.js';
-import { Xverse } from '../types/Xverse.js';
+import { SigningProtocol, Xverse } from '../types/Xverse.js';
 
 declare global {
     interface Window {
@@ -123,6 +123,36 @@ export class XverseSigner extends CustomKeypair {
         this.isInitialized = true;
     }
 
+    public async signData(
+        data: Buffer,
+        address: string,
+        protocol: SigningProtocol,
+    ): Promise<Buffer> {
+        if (!this.isInitialized) {
+            throw new Error('UnisatSigner not initialized');
+        }
+
+        const callSign = await this.BitcoinProvider.request('signMessage', {
+            address,
+            message: data.toString(),
+            protocol,
+        });
+
+        if ('error' in callSign) throw new Error(callSign.error.message);
+
+        const res = callSign.result as {
+            signature: string;
+            messageHash: string;
+            address: string;
+        };
+
+        if (!res.signature) {
+            throw new Error('Signature not found');
+        }
+
+        return Buffer.from(res.signature, 'hex');
+    }
+
     public getPublicKey(): Buffer {
         if (!this.isInitialized) {
             throw new Error('UnisatSigner not initialized');

package/src/transaction/browser/types/Unisat.ts

@@ -33,6 +33,11 @@ export enum MessageType {
     bip322 = 'bip322-simple',
 }
 
+export enum SignatureType {
+    ecdsa = 'ecdsa',
+    schnorr = 'schnorr',
+}
+
 interface ToSignInputBase {
     readonly index: number;
     readonly sighashTypes?: number[];
@@ -56,7 +61,7 @@ export interface PsbtSignatureOptions {
 
 export interface Unisat {
     web3?: Web3Provider;
-    
+
     disconnect: () => void;
     connect: () => void;
 
@@ -82,6 +87,8 @@ export interface Unisat {
 
     signMessage(message: string, type?: MessageType): Promise<string>;
 
+    signData(hex: string, type?: SignatureType): Promise<string>;
+
     pushTx(options: { rawtx: string }): Promise<string>;
 
     signPsbt(psbtHex: string, psbtOptions: PsbtSignatureOptions): Promise<string>;

package/src/transaction/browser/types/Xverse.ts

@@ -93,26 +93,36 @@ interface SignedTransactionResult {
     raw: string;
 }
 
-export interface Xverse {
-    request(method: string, params: unknown): Promise<XverseRPCResponse>;
-    request(
-        method: 'wallet_connect' | 'wallet_getAccount',
-        params: null,
-    ): Promise<XverseRPCGetAccountResponse>;
-    request(method: 'wallet_disconnect', params: null): Promise<XverseRPCResponse<null>>;
-    request(method: 'getBalance', params: null): Promise<XverseRPCGetBalanceResponse>;
-    request(method: 'signPsbt', params: XVersePSBTInput): Promise<XverseRPCSignPsbtResponse>;
+export enum SigningProtocol {
+    ECDSA = 'ECDSA',
+    BIP322 = 'BIP322',
+}
 
+export interface Xverse {
     addListener: (event: string, callback: (...args: unknown[]) => void) => void;
-
     createInscription: (data: InscriptionData) => Promise<InscriptionResult>;
     createRepeatInscriptions: (data: RepeatInscriptionsData) => Promise<InscriptionResult[]>;
-
     sendBtcTransaction: (transaction: BtcTransaction) => Promise<TransactionResult>;
-
-    signMessage: (message: string) => Promise<SignedMessageResult>;
+    signMessage: (
+        address: string,
+        message: string,
+        protocol: SigningProtocol,
+    ) => Promise<SignedMessageResult>;
     signMultipleTransactions: (
         transactions: BtcTransaction[],
     ) => Promise<SignedTransactionResult[]>;
     signTransaction: (transaction: BtcTransaction) => Promise<SignedTransactionResult>;
+
+    request(method: string, params: unknown): Promise<XverseRPCResponse>;
+
+    request(
+        method: 'wallet_connect' | 'wallet_getAccount',
+        params: null,
+    ): Promise<XverseRPCGetAccountResponse>;
+
+    request(method: 'wallet_disconnect', params: null): Promise<XverseRPCResponse<null>>;
+
+    request(method: 'getBalance', params: null): Promise<XverseRPCGetBalanceResponse>;
+
+    request(method: 'signPsbt', params: XVersePSBTInput): Promise<XverseRPCSignPsbtResponse>;
 }

package/src/transaction/builders/DeploymentTransaction.ts

@@ -139,6 +139,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
             this.bytecode,
             this.randomBytes,
             this.preimage,
+            this.priorityFee,
             this.calldata,
         );
 

package/src/transaction/builders/InteractionTransaction.ts

@@ -31,6 +31,7 @@ export class InteractionTransaction extends SharedInteractionTransaction<Transac
             this.calldata,
             this.contractSecret,
             this.preimage,
+            this.priorityFee,
         );
 
         this.scriptTree = this.getScriptTree();

package/src/transaction/builders/MultiSignTransaction.ts

@@ -21,7 +21,7 @@ import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { ECPairInterface } from 'ecpair';
 
 export interface MultiSignParameters
-    extends Omit<ITransactionParameters, 'priorityFee' | 'signer'> {
+    extends Omit<ITransactionParameters, 'gasSatFee' | 'priorityFee' | 'signer'> {
     readonly pubkeys: Buffer[];
     readonly minimumSignatures: number;
     readonly from?: undefined;
@@ -97,6 +97,7 @@ export class MultiSignTransaction extends TransactionBuilder<TransactionType.MUL
                 bitcoinCrypto.sha256(Buffer.from('aaaaaaaa', 'utf-8')),
             ),
             priorityFee: 0n,
+            gasSatFee: 0n,
         });
 
         if (!parameters.pubkeys) {

package/src/transaction/builders/TransactionBuilder.ts

@@ -111,6 +111,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      * @description The opnet priority fee of the transaction
      */
     protected priorityFee: bigint;
+    protected gasSatFee: bigint;
 
     /**
      * @description The utxos used in the transaction
@@ -151,6 +152,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         this.network = parameters.network;
         this.feeRate = parameters.feeRate;
         this.priorityFee = parameters.priorityFee ?? 0n;
+        this.gasSatFee = parameters.gasSatFee ?? 0n;
         this.utxos = parameters.utxos;
         this.to = parameters.to || undefined;
 
@@ -230,6 +232,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
             network: this.network,
             feeRate: this.feeRate,
             priorityFee: this.priorityFee ?? 0n,
+            gasSatFee: this.gasSatFee ?? 0n,
             from: this.from,
             amount: this.estimatedFees,
             optionalOutputs: this.optionalOutputs,
@@ -530,8 +533,9 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      * @returns {bigint}
      */
     protected getTransactionOPNetFee(): bigint {
-        if (this.priorityFee > TransactionBuilder.MINIMUM_DUST) {
-            return this.priorityFee;
+        const totalFee = this.priorityFee + this.gasSatFee;
+        if (totalFee > TransactionBuilder.MINIMUM_DUST) {
+            return totalFee;
         }
 
         return TransactionBuilder.MINIMUM_DUST;

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -18,6 +18,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
 
     readonly feeRate: number;
     readonly priorityFee: bigint;
+    readonly gasSatFee: bigint;
 }
 
 export interface IFundingTransactionParameters extends ITransactionParameters {

package/src/utxo/OPNetLimitedProvider.ts

@@ -211,7 +211,8 @@ export class OPNetLimitedProvider {
             network,
             to: wallet.p2tr,
             splitInputsInto,
-            priorityFee: 330n,
+            priorityFee: 0n,
+            gasSatFee: 330n,
         };
 
         const transactionFactory = new TransactionFactory();

package/src/verification/TapscriptVerificator.ts

@@ -16,6 +16,7 @@ export interface ContractAddressVerificationParams {
     readonly originalSalt: Buffer;
     readonly bytecode: Buffer;
     readonly preimage: Buffer;
+    readonly priorityFee: bigint;
     readonly calldata?: Buffer;
     readonly network?: Network;
 }
@@ -37,6 +38,7 @@ export class TapscriptVerificator {
             params.bytecode,
             params.originalSalt,
             params.preimage,
+            params.priorityFee,
             params.calldata,
         );
 
@@ -69,6 +71,7 @@ export class TapscriptVerificator {
             params.bytecode,
             params.originalSalt,
             params.preimage,
+            params.priorityFee,
             params.calldata,
         );