@btc-vision/transaction 1.0.110 → 1.0.112

package/browser/keypair/EcKeyPair.d.ts

@@ -14,7 +14,9 @@ export declare class EcKeyPair {
     static getP2WPKHAddress(keyPair: ECPairInterface, network?: Network): Address;
     static generateWallet(network?: Network): IWallet;
     static verifyContractAddress(contractAddress: Address, network?: Network): boolean;
+    static getLegacySegwitAddress(keyPair: ECPairInterface, network?: Network): Address;
     static getLegacyAddress(keyPair: ECPairInterface, network?: Network): Address;
+    static getP2PKAddress(keyPair: ECPairInterface, network?: Network): Address;
     static generateRandomKeyPair(network?: Network): ECPairInterface;
     static fromSeed(seed: Buffer, network?: Network): BIP32Interface;
     static getTaprootAddress(keyPair: ECPairInterface, network?: Network): Address;

package/browser/transaction/builders/DeploymentTransaction.d.ts

@@ -16,6 +16,7 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     private deploymentGenerator;
     private readonly contractSeed;
     private readonly bytecode;
+    private readonly calldata?;
     private readonly contractSigner;
     private readonly randomBytes;
     constructor(parameters: IDeploymentParameters);
@@ -27,6 +28,8 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     protected signInputs(transaction: Psbt): Promise<void>;
     protected generateScriptAddress(): Payment;
     protected generateTapData(): Payment;
+    private verifyCalldata;
+    private verifyBytecode;
     private getContractSeed;
     private customFinalizer;
     private getPubKeys;

package/browser/transaction/builders/SharedInteractionTransaction.d.ts

@@ -7,6 +7,7 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
 export declare abstract class SharedInteractionTransaction<T extends TransactionType> extends TransactionBuilder<T> {
+    static readonly MAXIMUM_CALLDATA_SIZE: number;
     readonly randomBytes: Buffer;
     protected targetScriptRedeem: Payment | null;
     protected leftOverFundsScriptRedeem: Payment | null;

package/browser/transaction/builders/TransactionBuilder.d.ts

@@ -28,6 +28,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected to: Address | undefined;
     protected from: Address;
     protected _maximumFeeRate: number;
+    protected isPubKeyDestination: boolean;
     protected constructor(parameters: ITransactionParameters);
     static getFrom(from: string | undefined, keypair: ECPairInterface, network: Network): Address;
     static witnessStackToScriptWitness(witness: Buffer[]): Buffer;

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

@@ -42,5 +42,6 @@ export interface IUnwrapParameters extends Omit<SharedInteractionParameters, 'op
 }
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;
+    readonly calldata?: Buffer;
     readonly randomBytes?: Buffer;
 }

package/browser/verification/TapscriptVerificator.d.ts

@@ -1,10 +1,11 @@
 import { Network } from 'bitcoinjs-lib';
 import { Taptree } from 'bitcoinjs-lib/src/types.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;
 }
 export declare class TapscriptVerificator {

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.108";
+export declare const version = "1.0.111";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.108';
+export const version = '1.0.111';

package/build/generators/Generator.d.ts

@@ -3,9 +3,11 @@ export declare abstract class Generator {
     static readonly DATA_CHUNK_SIZE: number;
     static readonly MAGIC: Buffer;
     protected readonly senderPubKey: Buffer;
+    protected readonly xSenderPubKey: Buffer;
     protected readonly contractSaltPubKey?: Buffer;
     protected readonly network: Network;
     protected constructor(senderPubKey: Buffer, contractSaltPubKey?: Buffer, network?: Network);
+    get senderFirstByte(): Buffer;
     abstract compile(...args: unknown[]): Buffer;
     protected splitBufferIntoChunks(buffer: Buffer, chunkSize?: number): Array<Buffer[]>;
 }

package/build/generators/Generator.js

@@ -1,10 +1,15 @@
 import { networks } from 'bitcoinjs-lib';
+import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 export class Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
         this.network = networks.bitcoin;
         this.senderPubKey = senderPubKey;
         this.contractSaltPubKey = contractSaltPubKey;
         this.network = network;
+        this.xSenderPubKey = toXOnly(senderPubKey);
+    }
+    get senderFirstByte() {
+        return Buffer.from([this.senderPubKey[0], 0, 0, 0]);
     }
     splitBufferIntoChunks(buffer, chunkSize = Generator.DATA_CHUNK_SIZE) {
         const chunks = [];

package/build/generators/builders/CalldataGenerator.js

@@ -32,12 +32,14 @@ export class CalldataGenerator extends Generator {
         if (!dataChunks.length)
             throw new Error('No data chunks found');
         let compiledData = [
-            this.senderPubKey,
+            this.senderFirstByte,
+            opcodes.OP_TOALTSTACK,
+            this.xSenderPubKey,
             opcodes.OP_CHECKSIGVERIFY,
             this.contractSaltPubKey,
             opcodes.OP_CHECKSIGVERIFY,
             opcodes.OP_HASH160,
-            crypto.hash160(this.senderPubKey),
+            crypto.hash160(this.xSenderPubKey),
             opcodes.OP_EQUALVERIFY,
             opcodes.OP_HASH160,
             crypto.hash160(contractSecret),

package/build/generators/builders/DeploymentGenerator.d.ts

@@ -2,6 +2,6 @@ import { Network } from 'bitcoinjs-lib';
 import { Generator } from '../Generator.js';
 export declare class DeploymentGenerator extends Generator {
     constructor(senderPubKey: Buffer, contractSaltPubKey: Buffer, network?: Network);
-    compile(contractBytecode: Buffer, contractSalt: Buffer): Buffer;
+    compile(contractBytecode: Buffer, contractSalt: Buffer, calldata?: Buffer): Buffer;
     private getAsm;
 }

package/build/generators/builders/DeploymentGenerator.js

@@ -4,8 +4,8 @@ export class DeploymentGenerator extends Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
         super(senderPubKey, contractSaltPubKey, network);
     }
-    compile(contractBytecode, contractSalt) {
-        const asm = this.getAsm(contractBytecode, contractSalt);
+    compile(contractBytecode, contractSalt, calldata) {
+        const asm = this.getAsm(contractBytecode, contractSalt, calldata);
         const compiled = script.compile(asm);
         const decompiled = script.decompile(compiled);
         if (!decompiled) {
@@ -13,17 +13,20 @@ export class DeploymentGenerator extends Generator {
         }
         return compiled;
     }
-    getAsm(contractBytecode, contractSalt) {
+    getAsm(contractBytecode, contractSalt, calldata) {
         if (!this.contractSaltPubKey)
             throw new Error('Contract salt public key not set');
         const dataChunks = this.splitBufferIntoChunks(contractBytecode);
-        return [
-            this.senderPubKey,
+        const calldataChunks = calldata ? this.splitBufferIntoChunks(calldata) : [];
+        const compiledData = [
+            this.senderFirstByte,
+            opcodes.OP_TOALTSTACK,
+            this.xSenderPubKey,
             opcodes.OP_CHECKSIGVERIFY,
             this.contractSaltPubKey,
             opcodes.OP_CHECKSIGVERIFY,
             opcodes.OP_HASH160,
-            crypto.hash160(this.senderPubKey),
+            crypto.hash160(this.xSenderPubKey),
             opcodes.OP_EQUALVERIFY,
             opcodes.OP_HASH256,
             crypto.hash256(contractSalt),
@@ -33,11 +36,14 @@ export class DeploymentGenerator extends Generator {
             opcodes.OP_NUMEQUAL,
             opcodes.OP_IF,
             Generator.MAGIC,
+            opcodes.OP_0,
+            ...calldataChunks,
             opcodes.OP_1NEGATE,
             ...dataChunks,
             opcodes.OP_ELSE,
             opcodes.OP_1,
             opcodes.OP_ENDIF,
-        ].flat();
+        ];
+        return compiledData.flat();
     }
 }

package/build/keypair/EcKeyPair.d.ts

@@ -14,7 +14,9 @@ export declare class EcKeyPair {
     static getP2WPKHAddress(keyPair: ECPairInterface, network?: Network): Address;
     static generateWallet(network?: Network): IWallet;
     static verifyContractAddress(contractAddress: Address, network?: Network): boolean;
+    static getLegacySegwitAddress(keyPair: ECPairInterface, network?: Network): Address;
     static getLegacyAddress(keyPair: ECPairInterface, network?: Network): Address;
+    static getP2PKAddress(keyPair: ECPairInterface, network?: Network): Address;
     static generateRandomKeyPair(network?: Network): ECPairInterface;
     static fromSeed(seed: Buffer, network?: Network): BIP32Interface;
     static getTaprootAddress(keyPair: ECPairInterface, network?: Network): Address;

package/build/keypair/EcKeyPair.js

@@ -67,6 +67,16 @@ export class EcKeyPair {
     static verifyContractAddress(contractAddress, network = networks.bitcoin) {
         return !!address.toOutputScript(contractAddress, network);
     }
+    static getLegacySegwitAddress(keyPair, network = networks.bitcoin) {
+        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;
+    }
     static getLegacyAddress(keyPair, network = networks.bitcoin) {
         const wallet = payments.p2pkh({ pubkey: keyPair.publicKey, network: network });
         if (!wallet.address) {
@@ -74,6 +84,13 @@ export class EcKeyPair {
         }
         return wallet.address;
     }
+    static getP2PKAddress(keyPair, network = networks.bitcoin) {
+        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');
+    }
     static generateRandomKeyPair(network = networks.bitcoin) {
         return this.ECPair.makeRandom({
             network: network,

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

@@ -16,6 +16,7 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     private deploymentGenerator;
     private readonly contractSeed;
     private readonly bytecode;
+    private readonly calldata?;
     private readonly contractSigner;
     private readonly randomBytes;
     constructor(parameters: IDeploymentParameters);
@@ -27,6 +28,8 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     protected signInputs(transaction: Psbt): Promise<void>;
     protected generateScriptAddress(): Payment;
     protected generateTapData(): Payment;
+    private verifyCalldata;
+    private verifyBytecode;
     private getContractSeed;
     private customFinalizer;
     private getPubKeys;

package/build/transaction/builders/DeploymentTransaction.js

@@ -7,6 +7,7 @@ import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { AddressGenerator } from '../../generators/AddressGenerator.js';
+import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 export class DeploymentTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);
@@ -35,15 +36,16 @@ export class DeploymentTransaction extends TransactionBuilder {
             };
         };
         this.bytecode = Compressor.compress(parameters.bytecode);
-        if (!this.bytecode)
-            throw new Error('Bytecode is required');
-        if (this.bytecode.length > DeploymentTransaction.MAXIMUM_CONTRACT_SIZE)
-            throw new Error('Contract size overflow.');
+        this.verifyBytecode();
+        if (parameters.calldata) {
+            this.calldata = parameters.calldata;
+            this.verifyCalldata();
+        }
         this.randomBytes = parameters.randomBytes || BitcoinUtils.rndBytes();
         this.contractSeed = this.getContractSeed();
         this.contractSigner = EcKeyPair.fromSeedKeyPair(this.contractSeed, this.network);
-        this.deploymentGenerator = new DeploymentGenerator(this.internalPubKeyToXOnly(), this.contractSignerXOnlyPubKey(), this.network);
-        this.compiledTargetScript = this.deploymentGenerator.compile(this.bytecode, this.randomBytes);
+        this.deploymentGenerator = new DeploymentGenerator(this.signer.publicKey, this.contractSignerXOnlyPubKey(), this.network);
+        this.compiledTargetScript = this.deploymentGenerator.compile(this.bytecode, this.randomBytes, this.calldata);
         this.scriptTree = this.getScriptTree();
         this.internalInit();
         this._contractAddress = AddressGenerator.generatePKSH(this.contractSeed, this.network);
@@ -130,6 +132,19 @@ export class DeploymentTransaction extends TransactionBuilder {
             redeem: selectedRedeem,
         };
     }
+    verifyCalldata() {
+        if (this.calldata &&
+            this.calldata.length > SharedInteractionTransaction.MAXIMUM_CALLDATA_SIZE) {
+            throw new Error('Calldata size overflow.');
+        }
+    }
+    verifyBytecode() {
+        if (!this.bytecode)
+            throw new Error('Bytecode is required');
+        if (this.bytecode.length > DeploymentTransaction.MAXIMUM_CONTRACT_SIZE) {
+            throw new Error('Contract size overflow.');
+        }
+    }
     getContractSeed() {
         if (!this.bytecode) {
             throw new Error('Bytecode is required');

package/build/transaction/builders/FundingTransaction.js

@@ -16,6 +16,12 @@ export class FundingTransaction extends TransactionBuilder {
         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),
@@ -30,10 +36,18 @@ export class FundingTransaction extends TransactionBuilder {
         }
         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,
+                });
+            }
         }
     }
     getSignerKey() {

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

@@ -7,6 +7,7 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
 export declare abstract class SharedInteractionTransaction<T extends TransactionType> extends TransactionBuilder<T> {
+    static readonly MAXIMUM_CALLDATA_SIZE: number;
     readonly randomBytes: Buffer;
     protected targetScriptRedeem: Payment | null;
     protected leftOverFundsScriptRedeem: Payment | null;

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -32,7 +32,7 @@ export class SharedInteractionTransaction extends TransactionBuilder {
         this.calldata = Compressor.compress(parameters.calldata);
         this.randomBytes = parameters.randomBytes || BitcoinUtils.rndBytes();
         this.scriptSigner = this.generateKeyPairFromSeed();
-        this.calldataGenerator = new CalldataGenerator(this.internalPubKeyToXOnly(), this.scriptSignerXOnlyPubKey(), this.network);
+        this.calldataGenerator = new CalldataGenerator(this.signer.publicKey, this.scriptSignerXOnlyPubKey(), this.network);
     }
     getContractSecret() {
         return this.contractSecret;
@@ -205,3 +205,4 @@ export class SharedInteractionTransaction extends TransactionBuilder {
         };
     }
 }
+SharedInteractionTransaction.MAXIMUM_CALLDATA_SIZE = 1024 * 1024;

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

@@ -28,6 +28,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected to: Address | undefined;
     protected from: Address;
     protected _maximumFeeRate: number;
+    protected isPubKeyDestination: boolean;
     protected constructor(parameters: ITransactionParameters);
     static getFrom(from: string | undefined, keypair: ECPairInterface, network: Network): Address;
     static witnessStackToScriptWitness(witness: Buffer[]): Buffer;

package/build/transaction/builders/TransactionBuilder.js

@@ -25,6 +25,7 @@ export class TransactionBuilder extends TweakedTransaction {
         this.priorityFee = parameters.priorityFee ?? 0n;
         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(parameters.from, this.signer, this.network);
         this.totalInputAmount = this.calculateTotalUTXOAmount();
@@ -87,7 +88,9 @@ export class TransactionBuilder extends TweakedTransaction {
         if (!this.utxos.length) {
             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.');
         }
         if (this.signed)
@@ -104,7 +107,9 @@ export class TransactionBuilder extends TweakedTransaction {
         throw new Error('Could not sign transaction');
     }
     async generateTransactionMinimalSignatures(checkPartialSigs = false) {
-        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.');
         }
         await this.buildTransaction();

package/build/transaction/builders/UnwrapTransaction.js

@@ -33,7 +33,7 @@ export class UnwrapTransaction extends SharedInteractionTransaction {
         this.estimatedFeeLoss = UnwrapTransaction.preEstimateTaprootTransactionFees(BigInt(this.feeRate), this.calculateNumInputs(this.vaultUTXOs), 2n, this.calculateNumSignatures(this.vaultUTXOs), 65n, this.calculateNumEmptyWitnesses(this.vaultUTXOs));
         this.amount = parameters.amount;
         this.contractSecret = this.generateSecret();
-        this.calldataGenerator = new CalldataGenerator(toXOnly(this.signer.publicKey), this.scriptSignerXOnlyPubKey(), this.network);
+        this.calldataGenerator = new CalldataGenerator(this.signer.publicKey, this.scriptSignerXOnlyPubKey(), this.network);
         this.compiledTargetScript = this.calldataGenerator.compile(this.calldata, this.contractSecret, [Features.UNWRAP]);
         this.scriptTree = this.getScriptTree();
         this.internalInit();

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

@@ -42,5 +42,6 @@ export interface IUnwrapParameters extends Omit<SharedInteractionParameters, 'op
 }
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;
+    readonly calldata?: Buffer;
     readonly randomBytes?: Buffer;
 }

package/build/verification/TapscriptVerificator.d.ts

@@ -1,10 +1,11 @@
 import { Network } from 'bitcoinjs-lib';
 import { Taptree } from 'bitcoinjs-lib/src/types.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;
 }
 export declare class TapscriptVerificator {

package/build/verification/TapscriptVerificator.js

@@ -6,8 +6,8 @@ import { AddressGenerator } from '../generators/AddressGenerator.js';
 export class TapscriptVerificator {
     static getContractAddress(params) {
         const network = params.network || networks.bitcoin;
-        const scriptBuilder = new DeploymentGenerator(params.deployerPubKeyXOnly, toXOnly(params.contractSaltPubKey), network);
-        const compiledTargetScript = scriptBuilder.compile(params.bytecode, params.originalSalt);
+        const scriptBuilder = new DeploymentGenerator(params.deployerPubKey, toXOnly(params.contractSaltPubKey), network);
+        const compiledTargetScript = scriptBuilder.compile(params.bytecode, params.originalSalt, params.calldata);
         const scriptTree = [
             {
                 output: compiledTargetScript,
@@ -32,7 +32,7 @@ export class TapscriptVerificator {
     static generateAddressFromScript(params, scriptTree) {
         const network = params.network || networks.bitcoin;
         const transactionData = {
-            internalPubkey: params.deployerPubKeyXOnly,
+            internalPubkey: toXOnly(params.deployerPubKey),
             network: network,
             scriptTree: scriptTree,
         };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.0.110",
+    "version": "1.0.112",
     "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.0.108';
+export const version = '1.0.111';

package/src/generators/Generator.ts

@@ -1,4 +1,5 @@
 import { Network, networks } from 'bitcoinjs-lib';
+import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
 
 /** Bitcoin Script Generator */
 export abstract class Generator {
@@ -18,6 +19,12 @@ export abstract class Generator {
      */
     protected readonly senderPubKey: Buffer;
 
+    /**
+     * The public key of the sender
+     * @protected
+     */
+    protected readonly xSenderPubKey: Buffer;
+
     /**
      * The public key of the contract salt
      * @protected
@@ -38,6 +45,11 @@ export abstract class Generator {
         this.senderPubKey = senderPubKey;
         this.contractSaltPubKey = contractSaltPubKey;
         this.network = network;
+        this.xSenderPubKey = toXOnly(senderPubKey);
+    }
+
+    public get senderFirstByte(): Buffer {
+        return Buffer.from([this.senderPubKey[0], 0, 0, 0]);
     }
 
     /**

package/src/generators/builders/CalldataGenerator.ts

@@ -75,14 +75,17 @@ export class CalldataGenerator extends Generator {
         if (!dataChunks.length) throw new Error('No data chunks found');
 
         let compiledData = [
-            this.senderPubKey,
+            this.senderFirstByte,
+            opcodes.OP_TOALTSTACK,
+
+            this.xSenderPubKey,
             opcodes.OP_CHECKSIGVERIFY,
 
             this.contractSaltPubKey,
             opcodes.OP_CHECKSIGVERIFY,
 
             opcodes.OP_HASH160,
-            crypto.hash160(this.senderPubKey),
+            crypto.hash160(this.xSenderPubKey),
             opcodes.OP_EQUALVERIFY,
 
             opcodes.OP_HASH160,
@@ -96,7 +99,7 @@ export class CalldataGenerator extends Generator {
 
             Generator.MAGIC,
         ];
-
+        
         // write pub keys, when requested.
         if (vaultPublicKeys.length > 0) {
             const pubKeyBuffer = CalldataGenerator.getPubKeyAsBuffer(vaultPublicKeys, this.network);

package/src/generators/builders/DeploymentGenerator.ts

@@ -14,10 +14,11 @@ export class DeploymentGenerator extends Generator {
      * Compile a bitcoin script representing a contract deployment
      * @param {Buffer} contractBytecode - The contract bytecode
      * @param {Buffer} contractSalt - The contract salt
+     * @param {Buffer} [calldata] - The calldata to be passed to the contract
      * @returns {Buffer} - The compiled script
      */
-    public compile(contractBytecode: Buffer, contractSalt: Buffer): Buffer {
-        const asm = this.getAsm(contractBytecode, contractSalt);
+    public compile(contractBytecode: Buffer, contractSalt: Buffer, calldata?: Buffer): Buffer {
+        const asm = this.getAsm(contractBytecode, contractSalt, calldata);
         const compiled = script.compile(asm);
 
         /**
@@ -31,20 +32,28 @@ export class DeploymentGenerator extends Generator {
         return compiled;
     }
 
-    private getAsm(contractBytecode: Buffer, contractSalt: Buffer): (number | Buffer)[] {
+    private getAsm(
+        contractBytecode: Buffer,
+        contractSalt: Buffer,
+        calldata?: Buffer,
+    ): (number | Buffer)[] {
         if (!this.contractSaltPubKey) throw new Error('Contract salt public key not set');
 
-        const dataChunks = this.splitBufferIntoChunks(contractBytecode);
+        const dataChunks: Buffer[][] = this.splitBufferIntoChunks(contractBytecode);
+        const calldataChunks: Buffer[][] = calldata ? this.splitBufferIntoChunks(calldata) : [];
 
-        return [
-            this.senderPubKey,
+        const compiledData = [
+            this.senderFirstByte,
+            opcodes.OP_TOALTSTACK,
+
+            this.xSenderPubKey,
             opcodes.OP_CHECKSIGVERIFY,
 
             this.contractSaltPubKey,
             opcodes.OP_CHECKSIGVERIFY,
 
             opcodes.OP_HASH160,
-            crypto.hash160(this.senderPubKey),
+            crypto.hash160(this.xSenderPubKey),
             opcodes.OP_EQUALVERIFY,
 
             opcodes.OP_HASH256,
@@ -57,12 +66,16 @@ export class DeploymentGenerator extends Generator {
             opcodes.OP_IF,
 
             Generator.MAGIC,
+            opcodes.OP_0,
+            ...calldataChunks,
             opcodes.OP_1NEGATE,
             ...dataChunks,
 
             opcodes.OP_ELSE,
             opcodes.OP_1,
             opcodes.OP_ENDIF,
-        ].flat();
+        ];
+
+        return compiledData.flat();
     }
 }