@btc-vision/transaction 1.0.110 → 1.0.111

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/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

@@ -5,6 +5,7 @@ export interface ContractAddressVerificationParams {
     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/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,10 +13,11 @@ 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);
+        const calldataChunks = calldata ? this.splitBufferIntoChunks(calldata) : [];
         return [
             this.senderPubKey,
             opcodes.OP_CHECKSIGVERIFY,
@@ -33,6 +34,8 @@ export class DeploymentGenerator extends Generator {
             opcodes.OP_NUMEQUAL,
             opcodes.OP_IF,
             Generator.MAGIC,
+            opcodes.OP_0,
+            ...calldataChunks,
             opcodes.OP_1NEGATE,
             ...dataChunks,
             opcodes.OP_ELSE,

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.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/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

@@ -205,3 +205,4 @@ export class SharedInteractionTransaction extends TransactionBuilder {
         };
     }
 }
+SharedInteractionTransaction.MAXIMUM_CALLDATA_SIZE = 1024 * 1024;

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

@@ -5,6 +5,7 @@ export interface ContractAddressVerificationParams {
     readonly contractSaltPubKey: Buffer;
     readonly originalSalt: Buffer;
     readonly bytecode: Buffer;
+    readonly calldata?: Buffer;
     readonly network?: Network;
 }
 export declare class TapscriptVerificator {

package/build/verification/TapscriptVerificator.js

@@ -7,7 +7,7 @@ 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 compiledTargetScript = scriptBuilder.compile(params.bytecode, params.originalSalt, params.calldata);
         const scriptTree = [
             {
                 output: compiledTargetScript,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.0.110",
+    "version": "1.0.111",
     "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/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,10 +32,15 @@ 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,
@@ -57,6 +63,8 @@ export class DeploymentGenerator extends Generator {
             opcodes.OP_IF,
 
             Generator.MAGIC,
+            opcodes.OP_0,
+            ...calldataChunks,
             opcodes.OP_1NEGATE,
             ...dataChunks,
 

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();
 
@@ -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/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}

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

@@ -10,6 +10,7 @@ export interface ContractAddressVerificationParams {
     readonly contractSaltPubKey: Buffer;
     readonly originalSalt: Buffer;
     readonly bytecode: Buffer;
+    readonly calldata?: Buffer;
     readonly network?: Network;
 }
 
@@ -29,6 +30,7 @@ export class TapscriptVerificator {
         const compiledTargetScript: Buffer = scriptBuilder.compile(
             params.bytecode,
             params.originalSalt,
+            params.calldata,
         );
 
         const scriptTree: Taptree = [