@btc-vision/transaction 1.0.110 → 1.0.112

package/src/keypair/EcKeyPair.ts

@@ -181,6 +181,28 @@ export class EcKeyPair {
         return !!address.toOutputScript(contractAddress, network);
     }
 
+    /**
+     * Get the legacy segwit address from a keypair
+     * @param {ECPairInterface} keyPair - The keypair to get the address for
+     * @param {Network} network - The network to use
+     * @returns {Address} - The legacy address
+     */
+    public static getLegacySegwitAddress(
+        keyPair: ECPairInterface,
+        network: Network = networks.bitcoin,
+    ): Address {
+        const wallet = payments.p2sh({
+            redeem: payments.p2wpkh({ pubkey: keyPair.publicKey, network: network }),
+            network: network,
+        });
+
+        if (!wallet.address) {
+            throw new Error('Failed to generate wallet');
+        }
+
+        return wallet.address;
+    }
+
     /**
      * Get the legacy address from a keypair
      * @param {ECPairInterface} keyPair - The keypair to get the address for
@@ -192,7 +214,6 @@ export class EcKeyPair {
         network: Network = networks.bitcoin,
     ): Address {
         const wallet = payments.p2pkh({ pubkey: keyPair.publicKey, network: network });
-
         if (!wallet.address) {
             throw new Error('Failed to generate wallet');
         }
@@ -200,6 +221,24 @@ export class EcKeyPair {
         return wallet.address;
     }
 
+    /**
+     * Get the legacy address from a keypair
+     * @param {ECPairInterface} keyPair - The keypair to get the address for
+     * @param {Network} network - The network to use
+     * @returns {Address} - The legacy address
+     */
+    public static getP2PKAddress(
+        keyPair: ECPairInterface,
+        network: Network = networks.bitcoin,
+    ): Address {
+        const wallet = payments.p2pk({ pubkey: keyPair.publicKey, network: network });
+        if (!wallet.output) {
+            throw new Error('Failed to generate wallet');
+        }
+
+        return '0x' + wallet.output.toString('hex');
+    }
+
     /**
      * Generate a random keypair
      * @param {Network} network - The network to use

package/src/transaction/builders/DeploymentTransaction.ts

@@ -12,6 +12,7 @@ import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { AddressGenerator } from '../../generators/AddressGenerator.js';
 import { Address } from '@btc-vision/bsi-binary';
+import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 
 export class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
     public static readonly MAXIMUM_CONTRACT_SIZE = 128 * 1024;
@@ -64,6 +65,12 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      */
     private readonly bytecode: Buffer;
 
+    /**
+     * Constructor calldata
+     * @private
+     */
+    private readonly calldata?: Buffer;
+
     /**
      * The contract signer
      * @private
@@ -80,10 +87,12 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         super(parameters);
 
         this.bytecode = Compressor.compress(parameters.bytecode);
-        if (!this.bytecode) throw new Error('Bytecode is required');
+        this.verifyBytecode();
 
-        if (this.bytecode.length > DeploymentTransaction.MAXIMUM_CONTRACT_SIZE)
-            throw new Error('Contract size overflow.');
+        if (parameters.calldata) {
+            this.calldata = parameters.calldata;
+            this.verifyCalldata();
+        }
 
         this.randomBytes = parameters.randomBytes || BitcoinUtils.rndBytes();
 
@@ -91,7 +100,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         this.contractSigner = EcKeyPair.fromSeedKeyPair(this.contractSeed, this.network);
 
         this.deploymentGenerator = new DeploymentGenerator(
-            this.internalPubKeyToXOnly(),
+            this.signer.publicKey,
             this.contractSignerXOnlyPubKey(),
             this.network,
         );
@@ -99,6 +108,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         this.compiledTargetScript = this.deploymentGenerator.compile(
             this.bytecode,
             this.randomBytes,
+            this.calldata,
         );
 
         this.scriptTree = this.getScriptTree();
@@ -243,6 +253,23 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         };
     }
 
+    private verifyCalldata(): void {
+        if (
+            this.calldata &&
+            this.calldata.length > SharedInteractionTransaction.MAXIMUM_CALLDATA_SIZE
+        ) {
+            throw new Error('Calldata size overflow.');
+        }
+    }
+
+    private verifyBytecode(): void {
+        if (!this.bytecode) throw new Error('Bytecode is required');
+
+        if (this.bytecode.length > DeploymentTransaction.MAXIMUM_CONTRACT_SIZE) {
+            throw new Error('Contract size overflow.');
+        }
+    }
+
     /**
      * Generate the contract seed for the deployment
      * @private

package/src/transaction/builders/FundingTransaction.ts

@@ -27,6 +27,11 @@ export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDI
 
         if (this.splitInputsInto > 1) {
             this.splitInputs(this.amount);
+        } else if (this.isPubKeyDestination) {
+            this.addOutput({
+                value: Number(this.amount),
+                script: Buffer.from(this.to.slice(2), 'hex'),
+            });
         } else {
             this.addOutput({
                 value: Number(this.amount),
@@ -45,10 +50,17 @@ export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDI
         const splitAmount = amountSpent / BigInt(this.splitInputsInto);
 
         for (let i = 0; i < this.splitInputsInto; i++) {
-            this.addOutput({
-                value: Number(splitAmount),
-                address: this.to,
-            });
+            if (this.isPubKeyDestination) {
+                this.addOutput({
+                    value: Number(splitAmount),
+                    script: Buffer.from(this.to.slice(2), 'hex'),
+                });
+            } else {
+                this.addOutput({
+                    value: Number(splitAmount),
+                    address: this.to,
+                });
+            }
         }
     }
 

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -18,6 +18,8 @@ import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 export abstract class SharedInteractionTransaction<
     T extends TransactionType,
 > extends TransactionBuilder<T> {
+    public static readonly MAXIMUM_CALLDATA_SIZE = 1024 * 1024; // 1MB
+
     /**
      * Random salt for the interaction
      * @type {Buffer}
@@ -71,7 +73,7 @@ export abstract class SharedInteractionTransaction<
         this.scriptSigner = this.generateKeyPairFromSeed();
 
         this.calldataGenerator = new CalldataGenerator(
-            this.internalPubKeyToXOnly(),
+            this.signer.publicKey,
             this.scriptSignerXOnlyPubKey(),
             this.network,
         );

package/src/transaction/builders/TransactionBuilder.ts

@@ -107,6 +107,12 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      */
     protected _maximumFeeRate: number = 100000000;
 
+    /**
+     * @description Is the destionation P2PK
+     * @protected
+     */
+    protected isPubKeyDestination: boolean;
+
     protected constructor(parameters: ITransactionParameters) {
         super(parameters);
 
@@ -121,6 +127,8 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         this.utxos = parameters.utxos;
         this.to = parameters.to || undefined;
 
+        this.isPubKeyDestination = this.to ? this.to.startsWith('0x') : false;
+
         this.optionalOutputs = parameters.optionalOutputs;
 
         this.from = TransactionBuilder.getFrom(
@@ -231,7 +239,11 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
             throw new Error('No UTXOs specified');
         }
 
-        if (this.to && !EcKeyPair.verifyContractAddress(this.to, this.network)) {
+        if (
+            this.to &&
+            !this.isPubKeyDestination &&
+            !EcKeyPair.verifyContractAddress(this.to, this.network)
+        ) {
             throw new Error(
                 'Invalid contract address. The contract address must be a taproot address.',
             );
@@ -261,7 +273,11 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
     public async generateTransactionMinimalSignatures(
         checkPartialSigs: boolean = false,
     ): Promise<void> {
-        if (this.to && !EcKeyPair.verifyContractAddress(this.to, this.network)) {
+        if (
+            this.to &&
+            !this.isPubKeyDestination &&
+            !EcKeyPair.verifyContractAddress(this.to, this.network)
+        ) {
             throw new Error(
                 'Invalid contract address. The contract address must be a taproot address.',
             );

package/src/transaction/builders/UnwrapTransaction.ts

@@ -109,7 +109,7 @@ export class UnwrapTransaction extends SharedInteractionTransaction<TransactionT
         this.contractSecret = this.generateSecret();
 
         this.calldataGenerator = new CalldataGenerator(
-            toXOnly(this.signer.publicKey),
+            this.signer.publicKey,
             this.scriptSignerXOnlyPubKey(),
             this.network,
         );

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -5,6 +5,7 @@ import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { ChainId } from '../../network/ChainId.js';
 import { PsbtOutputExtended } from './Tap.js';
+
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: Address;
     readonly to?: Address;
@@ -58,6 +59,7 @@ export interface IUnwrapParameters extends Omit<SharedInteractionParameters, 'op
 
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;
+    readonly calldata?: Buffer;
 
     readonly randomBytes?: Buffer;
 }

package/src/verification/TapscriptVerificator.ts

@@ -6,10 +6,11 @@ import { TransactionBuilder } from '../transaction/builders/TransactionBuilder.j
 import { AddressGenerator } from '../generators/AddressGenerator.js';
 
 export interface ContractAddressVerificationParams {
-    readonly deployerPubKeyXOnly: Buffer;
+    readonly deployerPubKey: Buffer;
     readonly contractSaltPubKey: Buffer;
     readonly originalSalt: Buffer;
     readonly bytecode: Buffer;
+    readonly calldata?: Buffer;
     readonly network?: Network;
 }
 
@@ -21,7 +22,7 @@ export class TapscriptVerificator {
     ): string | undefined {
         const network = params.network || networks.bitcoin;
         const scriptBuilder: DeploymentGenerator = new DeploymentGenerator(
-            params.deployerPubKeyXOnly,
+            params.deployerPubKey,
             toXOnly(params.contractSaltPubKey),
             network,
         );
@@ -29,6 +30,7 @@ export class TapscriptVerificator {
         const compiledTargetScript: Buffer = scriptBuilder.compile(
             params.bytecode,
             params.originalSalt,
+            params.calldata,
         );
 
         const scriptTree: Taptree = [
@@ -78,7 +80,7 @@ export class TapscriptVerificator {
         const network = params.network || networks.bitcoin;
 
         const transactionData: Payment = {
-            internalPubkey: params.deployerPubKeyXOnly,
+            internalPubkey: toXOnly(params.deployerPubKey),
             network: network,
             scriptTree: scriptTree,
         };