@btc-vision/transaction 1.5.4 → 1.6.0

package/build/generators/Generator.d.ts

@@ -14,4 +14,5 @@ export declare abstract class Generator {
     protected splitBufferIntoChunks(buffer: Buffer, chunkSize?: number): Array<Buffer[]>;
     protected encodeFeature(feature: Feature<Features>): Buffer[][];
     private encodeAccessListFeature;
+    private encodeChallengeSubmission;
 }

package/build/generators/Generator.js

@@ -40,8 +40,12 @@ export class Generator {
     }
     encodeFeature(feature) {
         switch (feature.opcode) {
-            case Features.ACCESS_LIST:
+            case Features.ACCESS_LIST: {
                 return this.splitBufferIntoChunks(this.encodeAccessListFeature(feature));
+            }
+            case Features.EPOCH_SUBMISSION: {
+                return this.splitBufferIntoChunks(this.encodeChallengeSubmission(feature));
+            }
             default:
                 throw new Error(`Unknown feature type: ${feature.opcode}`);
         }
@@ -64,6 +68,18 @@ export class Generator {
         }
         return Compressor.compress(Buffer.from(writer.getBuffer()));
     }
+    encodeChallengeSubmission(feature) {
+        if ('verifySignature' in feature.data && !feature.data.verifySignature()) {
+            throw new Error('Invalid signature in challenge submission feature');
+        }
+        const writer = new BinaryWriter();
+        writer.writeBytes(feature.data.publicKey.originalPublicKeyBuffer());
+        writer.writeBytes(feature.data.solution);
+        if (feature.data.graffiti) {
+            writer.writeBytesWithLength(feature.data.graffiti);
+        }
+        return Buffer.from(writer.getBuffer());
+    }
 }
 Generator.DATA_CHUNK_SIZE = 512;
 Generator.MAGIC = Buffer.from('op', 'utf-8');

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

@@ -1,8 +1,9 @@
 import { Network } from '@btc-vision/bitcoin';
 import { Feature, Features } from '../Features.js';
 import { Generator } from '../Generator.js';
+import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
 export declare class CalldataGenerator extends Generator {
     constructor(senderPubKey: Buffer, contractSaltPubKey: Buffer, network?: Network);
     static getPubKeyAsBuffer(witnessKeys: Buffer[], network: Network): Buffer;
-    compile(calldata: Buffer, contractSecret: Buffer, preimage: Buffer, maxPriority: bigint, features?: Feature<Features>[]): Buffer;
+    compile(calldata: Buffer, contractSecret: Buffer, challenge: ChallengeSolution, maxPriority: bigint, features?: Feature<Features>[]): Buffer;
 }

package/build/generators/builders/CalldataGenerator.js

@@ -24,7 +24,7 @@ export class CalldataGenerator extends Generator {
         }
         return compressed;
     }
-    compile(calldata, contractSecret, preimage, maxPriority, features = []) {
+    compile(calldata, contractSecret, challenge, maxPriority, features = []) {
         if (!this.contractSaltPubKey)
             throw new Error('Contract salt public key not set');
         const dataChunks = this.splitBufferIntoChunks(calldata);
@@ -41,7 +41,9 @@ export class CalldataGenerator extends Generator {
         let compiledData = [
             this.getHeader(maxPriority, featuresList),
             opcodes.OP_TOALTSTACK,
-            preimage,
+            challenge.publicKey.originalPublicKeyBuffer(),
+            opcodes.OP_TOALTSTACK,
+            challenge.solution,
             opcodes.OP_TOALTSTACK,
             this.xSenderPubKey,
             opcodes.OP_DUP,

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

@@ -1,9 +1,11 @@
 import { Network } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
+import { Feature, Features } from '../Features.js';
+import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
 export declare const OPNET_DEPLOYMENT_VERSION = 0;
 export declare const versionBuffer: Buffer<ArrayBuffer>;
 export declare class DeploymentGenerator extends Generator {
     constructor(senderPubKey: Buffer, contractSaltPubKey: Buffer, network?: Network);
-    compile(contractBytecode: Buffer, contractSalt: Buffer, preimage: Buffer, maxPriority: bigint, calldata?: Buffer): Buffer;
+    compile(contractBytecode: Buffer, contractSalt: Buffer, preimage: ChallengeSolution, maxPriority: bigint, calldata?: Buffer, features?: Feature<Features>[]): Buffer;
     private getAsm;
 }

package/build/generators/builders/DeploymentGenerator.js

@@ -6,8 +6,8 @@ export class DeploymentGenerator extends Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
         super(senderPubKey, contractSaltPubKey, network);
     }
-    compile(contractBytecode, contractSalt, preimage, maxPriority, calldata) {
-        const asm = this.getAsm(contractBytecode, contractSalt, preimage, maxPriority, calldata);
+    compile(contractBytecode, contractSalt, preimage, maxPriority, calldata, features) {
+        const asm = this.getAsm(contractBytecode, contractSalt, preimage, maxPriority, calldata, features);
         const compiled = script.compile(asm);
         const decompiled = script.decompile(compiled);
         if (!decompiled) {
@@ -33,7 +33,9 @@ export class DeploymentGenerator extends Generator {
         const compiledData = [
             this.getHeader(maxPriority, featuresList),
             opcodes.OP_TOALTSTACK,
-            preimage,
+            preimage.publicKey.originalPublicKeyBuffer(),
+            opcodes.OP_TOALTSTACK,
+            preimage.solution,
             opcodes.OP_TOALTSTACK,
             this.xSenderPubKey,
             opcodes.OP_DUP,

package/build/keypair/Address.d.ts

@@ -1,4 +1,5 @@
 import { Network } from '@btc-vision/bitcoin';
+import { ITimeLockOutput } from '../transaction/mineable/TimelockGenerator.js';
 export declare class Address extends Uint8Array {
     #private;
     constructor(bytes?: ArrayLike<number>);
@@ -28,6 +29,7 @@ export declare class Address extends Uint8Array {
     toString(): string;
     toJSON(): string;
     p2tr(network: Network): string;
+    toCSV(duration: bigint | number | string, network: Network): ITimeLockOutput;
     p2op(network: Network): string;
     toTweakedHybridPublicKeyHex(): string;
     toTweakedHybridPublicKeyBuffer(): Buffer;

package/build/keypair/Address.js

@@ -16,6 +16,7 @@ import { AddressVerificator } from './AddressVerificator.js';
 import { EcKeyPair } from './EcKeyPair.js';
 import { ContractAddress } from '../transaction/ContractAddress.js';
 import { BitcoinUtils } from '../utils/BitcoinUtils.js';
+import { TimeLockGenerator } from '../transaction/mineable/TimelockGenerator.js';
 export class Address extends Uint8Array {
     constructor(bytes) {
         super(ADDRESS_BYTE_LENGTH);
@@ -194,6 +195,17 @@ export class Address extends Uint8Array {
         }
         throw new Error('Public key not set');
     }
+    toCSV(duration, network) {
+        const n = Number(duration);
+        if (n < 1 || n > 65535) {
+            throw new Error('CSV block number must be between 1 and 65535');
+        }
+        if (!__classPrivateFieldGet(this, _Address_originalPublicKey, "f")) {
+            throw new Error('Cannot create CSV address: public key not set');
+        }
+        const publicKeyBuffer = Buffer.from(__classPrivateFieldGet(this, _Address_originalPublicKey, "f"));
+        return TimeLockGenerator.generateTimeLockAddress(publicKeyBuffer, network, n);
+    }
     p2op(network) {
         if (__classPrivateFieldGet(this, _Address_p2op, "f") && __classPrivateFieldGet(this, _Address_network, "f") === network) {
             return __classPrivateFieldGet(this, _Address_p2op, "f");

package/build/keypair/EcKeyPair.js

@@ -11,8 +11,8 @@ const BIP32factory = typeof bip32 === 'function' ? bip32 : BIP32Factory;
 if (!BIP32factory) {
     throw new Error('Failed to load BIP32 library');
 }
-secp256k1.utils.precompute(8);
-const { Point, CURVE } = secp256k1;
+const Point = secp256k1.Point;
+const CURVE_N = Point.Fn.ORDER;
 const TAP_TAG = utf8ToBytes('TapTweak');
 const TAP_TAG_HASH = sha256(TAP_TAG);
 function tapTweakHash(x) {
@@ -115,7 +115,7 @@ export class EcKeyPair {
         const Peven = (P.y & 1n) === 0n ? P : P.negate();
         const xBytes = Peven.toBytes(true).subarray(1);
         const tBytes = tapTweakHash(xBytes);
-        const t = mod(bytesToNumberBE(tBytes), CURVE.n);
+        const t = mod(bytesToNumberBE(tBytes), CURVE_N);
         const Q = Peven.add(Point.BASE.multiply(t));
         return Buffer.from(Q.toBytes(true));
     }
@@ -214,3 +214,6 @@ export class EcKeyPair {
 }
 EcKeyPair.BIP32 = BIP32factory(ecc);
 EcKeyPair.ECPair = ECPairFactory(ecc);
+(() => {
+    Point.BASE.precompute(8);
+})();

package/build/opnet.d.ts

@@ -5,11 +5,10 @@ export * from './generators/builders/CalldataGenerator.js';
 export * from './generators/builders/CustomGenerator.js';
 export * from './generators/builders/DeploymentGenerator.js';
 export * from './generators/builders/LegacyCalldataGenerator.js';
-export * from './generators/builders/MineableReward.js';
 export * from './generators/builders/MultiSignGenerator.js';
 export * from './generators/Features.js';
 export * from './generators/Generator.js';
-export * from './transaction/mineable/ChallengeGenerator.js';
+export * from './transaction/mineable/TimelockGenerator.js';
 export * from './generators/AddressGenerator.js';
 export * from './verification/TapscriptVerificator.js';
 export * from './keypair/AddressVerificator.js';
@@ -24,7 +23,6 @@ export * from './transaction/enums/TransactionType.js';
 export * from './transaction/interfaces/ITransactionParameters.js';
 export * from './transaction/interfaces/Tap.js';
 export * from './transaction/TransactionFactory.js';
-export * from './transaction/builders/ChallengeSolutionTransaction.js';
 export * from './transaction/builders/CustomScriptTransaction.js';
 export * from './transaction/builders/DeploymentTransaction.js';
 export * from './transaction/builders/FundingTransaction.js';
@@ -32,6 +30,9 @@ export * from './transaction/builders/InteractionTransaction.js';
 export * from './transaction/builders/MultiSignTransaction.js';
 export * from './transaction/builders/SharedInteractionTransaction.js';
 export * from './transaction/builders/TransactionBuilder.js';
+export * from './epoch/interfaces/IChallengeSolution.js';
+export * from './epoch/validator/EpochValidator.js';
+export * from './epoch/ChallengeSolution.js';
 export * from './utils/BitcoinUtils.js';
 export * from './utils/lengths.js';
 export * from './utxo/interfaces/IUTXO.js';

package/build/opnet.js

@@ -4,11 +4,10 @@ export * from './generators/builders/CalldataGenerator.js';
 export * from './generators/builders/CustomGenerator.js';
 export * from './generators/builders/DeploymentGenerator.js';
 export * from './generators/builders/LegacyCalldataGenerator.js';
-export * from './generators/builders/MineableReward.js';
 export * from './generators/builders/MultiSignGenerator.js';
 export * from './generators/Features.js';
 export * from './generators/Generator.js';
-export * from './transaction/mineable/ChallengeGenerator.js';
+export * from './transaction/mineable/TimelockGenerator.js';
 export * from './generators/AddressGenerator.js';
 export * from './verification/TapscriptVerificator.js';
 export * from './keypair/AddressVerificator.js';
@@ -23,7 +22,6 @@ export * from './transaction/enums/TransactionType.js';
 export * from './transaction/interfaces/ITransactionParameters.js';
 export * from './transaction/interfaces/Tap.js';
 export * from './transaction/TransactionFactory.js';
-export * from './transaction/builders/ChallengeSolutionTransaction.js';
 export * from './transaction/builders/CustomScriptTransaction.js';
 export * from './transaction/builders/DeploymentTransaction.js';
 export * from './transaction/builders/FundingTransaction.js';
@@ -31,6 +29,9 @@ export * from './transaction/builders/InteractionTransaction.js';
 export * from './transaction/builders/MultiSignTransaction.js';
 export * from './transaction/builders/SharedInteractionTransaction.js';
 export * from './transaction/builders/TransactionBuilder.js';
+export * from './epoch/interfaces/IChallengeSolution.js';
+export * from './epoch/validator/EpochValidator.js';
+export * from './epoch/ChallengeSolution.js';
 export * from './utils/BitcoinUtils.js';
 export * from './utils/lengths.js';
 export * from './utxo/interfaces/IUTXO.js';

package/build/transaction/TransactionFactory.d.ts

@@ -4,14 +4,14 @@ import { ICustomTransactionParameters } from './builders/CustomScriptTransaction
 import { FundingTransaction } from './builders/FundingTransaction.js';
 import { TransactionBuilder } from './builders/TransactionBuilder.js';
 import { TransactionType } from './enums/TransactionType.js';
-import { IChallengeSolutionTransactionParameters, IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters } from './interfaces/ITransactionParameters.js';
-import { ChallengeSolutionTransaction } from './builders/ChallengeSolutionTransaction.js';
+import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters } from './interfaces/ITransactionParameters.js';
 import { InteractionParametersWithoutSigner } from './browser/Web3Provider.js';
+import { RawChallenge } from '../epoch/interfaces/IChallengeSolution.js';
 export interface DeploymentResult {
     readonly transaction: [string, string];
     readonly contractAddress: string;
     readonly contractPubKey: string;
-    readonly preimage: string;
+    readonly preimage: RawChallenge;
     readonly utxos: UTXO[];
 }
 export interface FundingTransactionResponse {
@@ -20,12 +20,6 @@ export interface FundingTransactionResponse {
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
 }
-export interface ChallengeSolutionResponse {
-    readonly tx: Transaction;
-    readonly original: ChallengeSolutionTransaction;
-    readonly estimatedFees: bigint;
-    readonly nextUTXOs: UTXO[];
-}
 export interface BitcoinTransferBase {
     readonly tx: string;
     readonly estimatedFees: bigint;
@@ -36,10 +30,7 @@ export interface InteractionResponse {
     readonly interactionTransaction: string;
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
-    readonly preimage: string;
-}
-export interface ChallengeSolution extends BitcoinTransferBase {
-    readonly original: ChallengeSolutionTransaction;
+    readonly preimage: RawChallenge;
 }
 export interface BitcoinTransferResponse extends BitcoinTransferBase {
     readonly original: FundingTransaction;
@@ -49,12 +40,10 @@ export declare class TransactionFactory {
     signInteraction(interactionParameters: IInteractionParameters | InteractionParametersWithoutSigner): Promise<InteractionResponse>;
     signDeployment(deploymentParameters: IDeploymentParameters): Promise<DeploymentResult>;
     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;
     private getPriorityFee;

package/build/transaction/TransactionFactory.js

@@ -4,7 +4,6 @@ import { DeploymentTransaction } from './builders/DeploymentTransaction.js';
 import { FundingTransaction } from './builders/FundingTransaction.js';
 import { InteractionTransaction } from './builders/InteractionTransaction.js';
 import { TransactionBuilder } from './builders/TransactionBuilder.js';
-import { ChallengeSolutionTransaction } from './builders/ChallengeSolutionTransaction.js';
 export class TransactionFactory {
     async createCustomScriptTransaction(interactionParameters) {
         if (!interactionParameters.to) {
@@ -122,7 +121,7 @@ export class TransactionFactory {
                 ...this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0),
             ],
             randomBytes: preTransaction.getRndBytes(),
-            preimage: preTransaction.getPreimage(),
+            challenge: preTransaction.getPreimage(),
             nonWitnessUtxo: signedTransaction.tx.toBuffer(),
             estimatedFees: preTransaction.estimatedFees,
             optionalInputs: inputs,
@@ -134,7 +133,7 @@ export class TransactionFactory {
             interactionTransaction: outTx.toHex(),
             estimatedFees: preTransaction.estimatedFees,
             nextUTXOs: this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.from, 1),
-            preimage: preTransaction.getPreimage().toString('hex'),
+            preimage: preTransaction.getPreimage().toRaw(),
         };
     }
     async signDeployment(deploymentParameters) {
@@ -190,7 +189,7 @@ export class TransactionFactory {
             ...deploymentParameters,
             utxos: [newUtxo],
             randomBytes: preTransaction.getRndBytes(),
-            preimage: preTransaction.getPreimage(),
+            challenge: preTransaction.getPreimage(),
             nonWitnessUtxo: signedTransaction.toBuffer(),
             estimatedFees: preTransaction.estimatedFees,
             optionalInputs: inputs,
@@ -212,7 +211,7 @@ export class TransactionFactory {
             contractAddress: finalTransaction.getContractAddress(),
             contractPubKey: finalTransaction.contractPubKey,
             utxos: [refundUTXO],
-            preimage: preTransaction.getPreimage().toString('hex'),
+            preimage: preTransaction.getPreimage().toRaw(),
         };
     }
     async createBTCTransfer(parameters) {
@@ -227,18 +226,6 @@ export class TransactionFactory {
             nextUTXOs: this.getAllNewUTXOs(resp.original, resp.tx, parameters.from),
         };
     }
-    async createChallengeSolution(parameters) {
-        if (!parameters.from) {
-            throw new Error('Field "from" not provided.');
-        }
-        const resp = await this._createChallengeSolution(parameters);
-        return {
-            estimatedFees: resp.estimatedFees,
-            original: resp.original,
-            tx: resp.tx.toHex(),
-            nextUTXOs: this.getAllNewUTXOs(resp.original, resp.tx, parameters.from),
-        };
-    }
     getAllNewUTXOs(original, tx, to) {
         const outputs = original.getOutputs();
         const utxos = [];
@@ -305,21 +292,6 @@ export class TransactionFactory {
         }
         return deployment;
     }
-    async _createChallengeSolution(parameters) {
-        if (!parameters.to)
-            throw new Error('Field "to" not provided.');
-        const challengeTransaction = new ChallengeSolutionTransaction(parameters);
-        const signedTransaction = await challengeTransaction.signTransaction();
-        if (!signedTransaction) {
-            throw new Error('Could not sign funding transaction.');
-        }
-        return {
-            tx: signedTransaction,
-            original: challengeTransaction,
-            estimatedFees: challengeTransaction.estimatedFees,
-            nextUTXOs: this.getUTXOAsTransaction(signedTransaction, parameters.to, 0),
-        };
-    }
     async createFundTransaction(parameters) {
         if (!parameters.to)
             throw new Error('Field "to" not provided.');

package/build/transaction/browser/Web3Provider.d.ts

@@ -2,9 +2,9 @@ import { IDeploymentParameters, IInteractionParameters } from '../interfaces/ITr
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { DeploymentResult, InteractionResponse } from '../TransactionFactory';
 import { ICustomTransactionParameters } from '../builders/CustomScriptTransaction.js';
-export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer' | 'preimage'>;
-export type IDeploymentParametersWithoutSigner = Omit<IDeploymentParameters, 'signer' | 'network' | 'preimage'>;
-export type CustomTransactionWithoutSigner = Omit<ICustomTransactionParameters, 'signer' | 'preimage'>;
+export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer' | 'challenge'>;
+export type IDeploymentParametersWithoutSigner = Omit<IDeploymentParameters, 'signer' | 'network' | 'challenge'>;
+export type CustomTransactionWithoutSigner = Omit<ICustomTransactionParameters, 'signer' | 'challenge'>;
 export interface BroadcastTransactionOptions {
     raw: string;
     psbt: boolean;

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

@@ -1,18 +0,0 @@
-import { TransactionType } from '../enums/TransactionType.js';
-import { IChallengeSolutionTransactionParameters } from '../interfaces/ITransactionParameters.js';
-import { Psbt, PsbtInput, Signer } from '@btc-vision/bitcoin';
-import { TransactionBuilder } from './TransactionBuilder.js';
-import { ECPairInterface } from 'ecpair';
-export declare class ChallengeSolutionTransaction extends TransactionBuilder<TransactionType.CHALLENGE_SOLUTION> {
-    readonly type: TransactionType.CHALLENGE_SOLUTION;
-    protected amount: bigint;
-    protected readonly challengeSolution: Buffer;
-    constructor(parameters: IChallengeSolutionTransactionParameters);
-    protected buildTransaction(): Promise<void>;
-    protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer: Signer | ECPairInterface, reverse?: boolean, errored?: boolean): Promise<void>;
-    protected customFinalizerP2SH: (inputIndex: number, input: PsbtInput, scriptA: Buffer, isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean) => {
-        finalScriptSig: Buffer | undefined;
-        finalScriptWitness: Buffer | undefined;
-    };
-    protected getSignerKey(): Signer | ECPairInterface;
-}

package/build/transaction/builders/ChallengeSolutionTransaction.js

@@ -1,51 +1 @@
-import { TransactionType } from '../enums/TransactionType.js';
-import { getFinalScripts, opcodes, script } from '@btc-vision/bitcoin';
-import { TransactionBuilder } from './TransactionBuilder.js';
-export class ChallengeSolutionTransaction extends TransactionBuilder {
-    constructor(parameters) {
-        super(parameters);
-        this.type = TransactionType.CHALLENGE_SOLUTION;
-        this.customFinalizerP2SH = (inputIndex, input, scriptA, isSegwit, isP2SH, isP2WSH) => {
-            const inputDecoded = this.inputs[inputIndex];
-            if (isP2SH && inputDecoded && inputDecoded.redeemScript) {
-                const scriptSig = script.compile([this.challengeSolution, inputDecoded.redeemScript]);
-                return {
-                    finalScriptSig: scriptSig,
-                    finalScriptWitness: undefined,
-                };
-            }
-            return getFinalScripts(inputIndex, input, scriptA, isSegwit, isP2SH, isP2WSH, false);
-        };
-        this.amount = parameters.amount;
-        this.challengeSolution = parameters.challengeSolution;
-        this.internalInit();
-    }
-    async buildTransaction() {
-        if (!this.to) {
-            throw new Error('Recipient address is required');
-        }
-        this.addInputsFromUTXO();
-        if (this.isPubKeyDestination) {
-            const pubKeyScript = script.compile([
-                Buffer.from(this.to.replace('0x', ''), 'hex'),
-                opcodes.OP_CHECKSIG,
-            ]);
-            this.addOutput({
-                value: Number(this.amount),
-                script: pubKeyScript,
-            });
-        }
-        else {
-            this.addOutput({
-                value: Number(this.amount),
-                address: this.to,
-            });
-        }
-        await this.addRefundOutput(this.amount + this.addOptionalOutputsAndGetAmount());
-    }
-    async signInput(transaction, input, i, signer, reverse = false, errored = false) {
-    }
-    getSignerKey() {
-        return this.signer;
-    }
-}
+"use strict";

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

@@ -3,7 +3,7 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
-export interface ICustomTransactionParameters extends SharedInteractionParameters {
+export interface ICustomTransactionParameters extends Omit<SharedInteractionParameters, 'challenge'> {
     script: (Buffer | Stack)[];
     witnesses: Buffer[];
     annex?: Buffer;

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

@@ -4,12 +4,13 @@ import { P2TRPayment, Psbt } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { Address } from '../../keypair/Address.js';
-import { IMineableReward } from '../mineable/ChallengeGenerator.js';
+import { ITimeLockOutput } from '../mineable/TimelockGenerator.js';
+import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
 export declare class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
     static readonly MAXIMUM_CONTRACT_SIZE: number;
     type: TransactionType.DEPLOYMENT;
-    protected readonly preimage: Buffer;
-    protected readonly rewardChallenge: IMineableReward;
+    protected readonly preimage: ChallengeSolution;
+    protected readonly epochChallenge: ITimeLockOutput;
     protected readonly _contractAddress: Address;
     protected tapLeafScript: TapLeafScript | null;
     private readonly deploymentVersion;
@@ -30,7 +31,7 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     get contractAddress(): Address;
     get p2trAddress(): string;
     getRndBytes(): Buffer;
-    getPreimage(): Buffer;
+    getPreimage(): ChallengeSolution;
     getContractAddress(): string;
     protected contractSignerXOnlyPubKey(): Buffer;
     protected buildTransaction(): Promise<void>;
@@ -38,6 +39,7 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     protected signInputs(transaction: Psbt): Promise<void>;
     protected generateScriptAddress(): P2TRPayment;
     protected generateTapData(): P2TRPayment;
+    private generateFeatures;
     private verifyCalldata;
     private verifyBytecode;
     private getContractSeed;

package/build/transaction/builders/DeploymentTransaction.js

@@ -7,7 +7,8 @@ import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { Address } from '../../keypair/Address.js';
-import { ChallengeGenerator } from '../mineable/ChallengeGenerator.js';
+import { TimeLockGenerator } from '../mineable/TimelockGenerator.js';
+import { Features } from '../../generators/Features.js';
 export class DeploymentTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);
@@ -41,15 +42,15 @@ export class DeploymentTransaction extends TransactionBuilder {
             this.calldata = parameters.calldata;
             this.verifyCalldata();
         }
-        if (!parameters.preimage)
-            throw new Error('Preimage is required');
+        if (!parameters.challenge)
+            throw new Error('Challenge solution is required');
         this.randomBytes = parameters.randomBytes || BitcoinUtils.rndBytes();
-        this.preimage = parameters.preimage;
-        this.rewardChallenge = ChallengeGenerator.generateMineableReward(this.preimage, this.network);
+        this.preimage = parameters.challenge;
+        this.epochChallenge = TimeLockGenerator.generateTimeLockAddress(this.preimage.publicKey.originalPublicKeyBuffer(), this.network);
         this.contractSeed = this.getContractSeed();
         this.contractSigner = EcKeyPair.fromSeedKeyPair(this.contractSeed, this.network);
         this.deploymentGenerator = new DeploymentGenerator(Buffer.from(this.signer.publicKey), this.contractSignerXOnlyPubKey(), this.network);
-        this.compiledTargetScript = this.deploymentGenerator.compile(this.bytecode, this.randomBytes, this.preimage, this.priorityFee, this.calldata);
+        this.compiledTargetScript = this.deploymentGenerator.compile(this.bytecode, this.randomBytes, this.preimage, this.priorityFee, this.calldata, this.generateFeatures(parameters));
         this.scriptTree = this.getScriptTree();
         this.internalInit();
         this._contractPubKey = '0x' + this.contractSeed.toString('hex');
@@ -118,7 +119,7 @@ export class DeploymentTransaction extends TransactionBuilder {
             amountSpent - MINIMUM_AMOUNT_CA > MINIMUM_AMOUNT_REWARD) {
             this.addOutput({
                 value: Number(amountSpent - amountToCA),
-                address: this.rewardChallenge.address,
+                address: this.epochChallenge.address,
             });
         }
         await this.addRefundOutput(amountSpent + this.addOptionalOutputsAndGetAmount());
@@ -193,6 +194,17 @@ export class DeploymentTransaction extends TransactionBuilder {
             redeem: selectedRedeem,
         };
     }
+    generateFeatures(parameters) {
+        const features = [];
+        const submission = parameters.challenge.getSubmission();
+        if (submission) {
+            features.push({
+                opcode: Features.EPOCH_SUBMISSION,
+                data: submission,
+            });
+        }
+        return features;
+    }
     verifyCalldata() {
         if (this.calldata &&
             this.calldata.length > SharedInteractionTransaction.MAXIMUM_CALLDATA_SIZE) {

package/build/transaction/builders/InteractionTransaction.js

@@ -13,7 +13,7 @@ export class InteractionTransaction extends SharedInteractionTransaction {
         if (this.contractSecret.length !== 32) {
             throw new Error('Invalid contract secret length. Expected 32 bytes.');
         }
-        this.compiledTargetScript = this.calldataGenerator.compile(this.calldata, this.contractSecret, this.preimage, this.priorityFee, this.generateFeatures(parameters));
+        this.compiledTargetScript = this.calldataGenerator.compile(this.calldata, this.contractSecret, this.challenge, this.priorityFee, this.generateFeatures(parameters));
         this.scriptTree = this.getScriptTree();
         this.internalInit();
     }
@@ -25,6 +25,13 @@ export class InteractionTransaction extends SharedInteractionTransaction {
                 data: parameters.loadedStorage,
             });
         }
+        const submission = parameters.challenge.getSubmission();
+        if (submission) {
+            features.push({
+                opcode: Features.EPOCH_SUBMISSION,
+                data: submission,
+            });
+        }
         return features;
     }
 }

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

@@ -4,7 +4,8 @@ import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
-import { IMineableReward } from '../mineable/ChallengeGenerator.js';
+import { ITimeLockOutput } from '../mineable/TimelockGenerator.js';
+import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
 export declare abstract class SharedInteractionTransaction<T extends TransactionType> extends TransactionBuilder<T> {
     static readonly MAXIMUM_CALLDATA_SIZE: number;
     readonly randomBytes: Buffer;
@@ -12,8 +13,8 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected leftOverFundsScriptRedeem: P2TRPayment | null;
     protected abstract readonly compiledTargetScript: Buffer;
     protected abstract readonly scriptTree: Taptree;
-    protected readonly preimage: Buffer;
-    protected readonly rewardChallenge: IMineableReward;
+    protected readonly challenge: ChallengeSolution;
+    protected readonly epochChallenge: ITimeLockOutput;
     protected calldataGenerator: CalldataGenerator;
     protected readonly calldata: Buffer;
     protected abstract readonly contractSecret: Buffer;
@@ -22,7 +23,7 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected constructor(parameters: SharedInteractionParameters);
     getContractSecret(): Buffer;
     getRndBytes(): Buffer;
-    getPreimage(): Buffer;
+    getPreimage(): ChallengeSolution;
     protected scriptSignerXOnlyPubKey(): Buffer;
     protected generateKeyPairFromSeed(): ECPairInterface;
     protected buildTransaction(): Promise<void>;