@btc-vision/transaction 1.7.13 → 1.7.15

package/browser/keypair/Address.d.ts

@@ -44,6 +44,7 @@ export declare class Address extends Uint8Array {
     p2tr(network: Network): string;
     p2wda(network: Network): IP2WSHAddress;
     toCSV(duration: bigint | number | string, network: Network): IP2WSHAddress;
+    toCSVTweaked(duration: bigint | number | string, network: Network): string;
     p2op(network: Network): string;
     toTweakedHybridPublicKeyHex(): string;
     toTweakedHybridPublicKeyBuffer(): Buffer;

package/browser/transaction/mineable/TimelockGenerator.d.ts

@@ -1,6 +1,9 @@
 import { Network } from '@btc-vision/bitcoin';
 import { IP2WSHAddress } from './IP2WSHAddress.js';
 export declare class TimeLockGenerator {
+    private static readonly UNSPENDABLE_INTERNAL_KEY;
     private static readonly CSV_BLOCKS;
     static generateTimeLockAddress(publicKey: Buffer, network?: Network, csvBlocks?: number): IP2WSHAddress;
+    static generateTimeLockAddressP2TR(publicKey: Buffer, network?: Network, csvBlocks?: number): string;
+    private static generateTimeLockScript;
 }

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.7.13";
+export declare const version = "1.7.15";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.7.13';
+export const version = '1.7.15';

package/build/epoch/ChallengeSolution.js

@@ -31,7 +31,7 @@ export class ChallengeSubmission {
             signatureDataWriter.writeBytes(this.graffiti);
         }
         const buffer = signatureDataWriter.getBuffer();
-        return MessageSigner.verifySignature(this.publicKey, buffer, this.signature);
+        return MessageSigner.verifySignature(this.publicKey.tweakedPublicKeyToBuffer(), buffer, this.signature);
     }
 }
 export class ChallengeSolution {

package/build/generators/Features.d.ts

@@ -6,9 +6,15 @@ export declare enum Features {
     EPOCH_SUBMISSION = 2,
     MLDSA_LINK_PUBKEY = 4
 }
+export declare enum FeaturePriority {
+    ACCESS_LIST = 1,
+    EPOCH_SUBMISSION = 2,
+    MLDSA_LINK_PUBKEY = 3
+}
 export interface Feature<T extends Features> {
     opcode: T;
     data: unknown;
+    priority: number;
 }
 export interface AccessListFeature extends Feature<Features.ACCESS_LIST> {
     data: LoadedStorage;

package/build/generators/Features.js

@@ -4,3 +4,9 @@ export var Features;
     Features[Features["EPOCH_SUBMISSION"] = 2] = "EPOCH_SUBMISSION";
     Features[Features["MLDSA_LINK_PUBKEY"] = 4] = "MLDSA_LINK_PUBKEY";
 })(Features || (Features = {}));
+export var FeaturePriority;
+(function (FeaturePriority) {
+    FeaturePriority[FeaturePriority["ACCESS_LIST"] = 1] = "ACCESS_LIST";
+    FeaturePriority[FeaturePriority["EPOCH_SUBMISSION"] = 2] = "EPOCH_SUBMISSION";
+    FeaturePriority[FeaturePriority["MLDSA_LINK_PUBKEY"] = 3] = "MLDSA_LINK_PUBKEY";
+})(FeaturePriority || (FeaturePriority = {}));

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

@@ -5,5 +5,5 @@ 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, challenge: ChallengeSolution, maxPriority: bigint, features?: Feature<Features>[]): Buffer;
+    compile(calldata: Buffer, contractSecret: Buffer, challenge: ChallengeSolution, maxPriority: bigint, featuresRaw?: Feature<Features>[]): Buffer;
 }

package/build/generators/builders/CalldataGenerator.js

@@ -24,7 +24,7 @@ export class CalldataGenerator extends Generator {
         }
         return compressed;
     }
-    compile(calldata, contractSecret, challenge, maxPriority, features = []) {
+    compile(calldata, contractSecret, challenge, maxPriority, featuresRaw = []) {
         if (!this.contractSaltPubKey)
             throw new Error('Contract salt public key not set');
         const dataChunks = this.splitBufferIntoChunks(calldata);
@@ -32,11 +32,14 @@ export class CalldataGenerator extends Generator {
             throw new Error('No data chunks found');
         const featuresList = [];
         const featureData = [];
-        for (let i = 0; i < features.length; i++) {
-            const feature = features[i];
-            featuresList.push(feature.opcode);
-            const data = this.encodeFeature(feature);
-            featureData.push(...data);
+        const features = featuresRaw.sort((a, b) => a.priority - b.priority);
+        if (features.length) {
+            for (let i = 0; i < features.length; i++) {
+                const feature = features[i];
+                featuresList.push(feature.opcode);
+                const data = this.encodeFeature(feature);
+                featureData.push(...data);
+            }
         }
         let compiledData = [
             this.getHeader(maxPriority, featuresList),

package/build/generators/builders/DeploymentGenerator.js

@@ -15,14 +15,15 @@ export class DeploymentGenerator extends Generator {
         }
         return compiled;
     }
-    getAsm(contractBytecode, contractSalt, challenge, maxPriority, calldata, features) {
+    getAsm(contractBytecode, contractSalt, challenge, maxPriority, calldata, featuresRaw) {
         if (!this.contractSaltPubKey)
             throw new Error('Contract salt public key not set');
         const dataChunks = this.splitBufferIntoChunks(contractBytecode);
         const calldataChunks = calldata ? this.splitBufferIntoChunks(calldata) : [];
         const featuresList = [];
         const featureData = [];
-        if (features) {
+        if (featuresRaw) {
+            const features = featuresRaw.sort((a, b) => a.priority - b.priority);
             for (let i = 0; i < features.length; i++) {
                 const feature = features[i];
                 featuresList.push(feature.opcode);

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

@@ -4,5 +4,5 @@ import { Feature, Features } from '../Features.js';
 export declare class LegacyCalldataGenerator extends Generator {
     constructor(senderPubKey: Buffer, network?: Network);
     static getPubKeyAsBuffer(witnessKeys: Buffer[], network: Network): Buffer;
-    compile(calldata: Buffer, contractSecret: Buffer, challenge: Buffer, maxPriority: bigint, features?: Feature<Features>[]): Buffer;
+    compile(calldata: Buffer, contractSecret: Buffer, challenge: Buffer, maxPriority: bigint, featuresRaw?: Feature<Features>[]): Buffer;
 }

package/build/generators/builders/LegacyCalldataGenerator.js

@@ -24,17 +24,20 @@ export class LegacyCalldataGenerator extends Generator {
         }
         return compressed;
     }
-    compile(calldata, contractSecret, challenge, maxPriority, features = []) {
+    compile(calldata, contractSecret, challenge, maxPriority, featuresRaw = []) {
         const dataChunks = this.splitBufferIntoChunks(calldata);
         if (!dataChunks.length)
             throw new Error('No data chunks found');
         const featuresList = [];
         const featureData = [];
-        for (let i = 0; i < features.length; i++) {
-            const feature = features[i];
-            featuresList.push(feature.opcode);
-            const data = this.encodeFeature(feature);
-            featureData.push(...data);
+        const features = featuresRaw.sort((a, b) => a.priority - b.priority);
+        if (features.length) {
+            for (let i = 0; i < features.length; i++) {
+                const feature = features[i];
+                featuresList.push(feature.opcode);
+                const data = this.encodeFeature(feature);
+                featureData.push(...data);
+            }
         }
         let compiledData = [
             this.getHeader(maxPriority, featuresList),

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

@@ -6,7 +6,7 @@ export declare class P2WDAGenerator extends Generator {
     private static readonly P2WDA_VERSION;
     constructor(senderPubKey: Buffer, contractSaltPubKey: Buffer, network?: Network);
     static validateWitnessSize(dataSize: number, maxWitnessFields?: number, maxBytesPerWitness?: number): boolean;
-    compile(calldata: Buffer, contractSecret: Buffer, challenge: ChallengeSolution, maxPriority: bigint, features?: Feature<Features>[]): Buffer;
+    compile(calldata: Buffer, contractSecret: Buffer, challenge: ChallengeSolution, maxPriority: bigint, featuresRaw?: Feature<Features>[]): Buffer;
     getHeader(maxPriority: bigint, features?: Features[]): Buffer;
     private writeFeatures;
     private encodeFeatureData;

package/build/generators/builders/P2WDAGenerator.js

@@ -14,7 +14,7 @@ export class P2WDAGenerator extends Generator {
         const requiredFields = Math.ceil(compressedSize / maxBytesPerWitness);
         return requiredFields <= maxWitnessFields;
     }
-    compile(calldata, contractSecret, challenge, maxPriority, features = []) {
+    compile(calldata, contractSecret, challenge, maxPriority, featuresRaw = []) {
         if (!this.contractSaltPubKey) {
             throw new Error('Contract salt public key not set');
         }
@@ -23,6 +23,7 @@ export class P2WDAGenerator extends Generator {
         }
         const writer = new BinaryWriter();
         writer.writeU8(P2WDAGenerator.P2WDA_VERSION);
+        const features = featuresRaw.sort((a, b) => a.priority - b.priority);
         writer.writeBytes(this.getHeader(maxPriority, features.map((f) => f.opcode)));
         writer.writeBytes(contractSecret);
         writer.writeBytes(challenge.publicKey.toBuffer());

package/build/keypair/Address.d.ts

@@ -44,6 +44,7 @@ export declare class Address extends Uint8Array {
     p2tr(network: Network): string;
     p2wda(network: Network): IP2WSHAddress;
     toCSV(duration: bigint | number | string, network: Network): IP2WSHAddress;
+    toCSVTweaked(duration: bigint | number | string, network: Network): string;
     p2op(network: Network): string;
     toTweakedHybridPublicKeyHex(): string;
     toTweakedHybridPublicKeyBuffer(): Buffer;

package/build/keypair/Address.js

@@ -351,6 +351,16 @@ export class Address extends Uint8Array {
         const publicKeyBuffer = Buffer.from(__classPrivateFieldGet(this, _Address_originalPublicKey, "f"));
         return TimeLockGenerator.generateTimeLockAddress(publicKeyBuffer, network, n);
     }
+    toCSVTweaked(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');
+        }
+        return TimeLockGenerator.generateTimeLockAddressP2TR(this.tweakedPublicKeyToBuffer(), network, n);
+    }
     p2op(network) {
         if (__classPrivateFieldGet(this, _Address_p2op, "f") && __classPrivateFieldGet(this, _Address_network, "f") === network) {
             return __classPrivateFieldGet(this, _Address_p2op, "f");

package/build/transaction/builders/DeploymentTransaction.js

@@ -8,7 +8,7 @@ import { Compressor } from '../../bytecode/Compressor.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { Address } from '../../keypair/Address.js';
 import { TimeLockGenerator } from '../mineable/TimelockGenerator.js';
-import { Features } from '../../generators/Features.js';
+import { FeaturePriority, Features } from '../../generators/Features.js';
 export class DeploymentTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);
@@ -202,6 +202,7 @@ export class DeploymentTransaction extends TransactionBuilder {
         const submission = parameters.challenge.getSubmission();
         if (submission) {
             features.push({
+                priority: FeaturePriority.MLDSA_LINK_PUBKEY,
                 opcode: Features.EPOCH_SUBMISSION,
                 data: submission,
             });

package/build/transaction/builders/InteractionTransaction.js

@@ -1,6 +1,6 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
-import { Features } from '../../generators/Features.js';
+import { FeaturePriority, Features } from '../../generators/Features.js';
 export class InteractionTransaction extends SharedInteractionTransaction {
     constructor(parameters) {
         super(parameters);
@@ -34,6 +34,7 @@ export class InteractionTransaction extends SharedInteractionTransaction {
         const features = [];
         if (parameters.loadedStorage) {
             features.push({
+                priority: FeaturePriority.ACCESS_LIST,
                 opcode: Features.ACCESS_LIST,
                 data: parameters.loadedStorage,
             });
@@ -41,6 +42,7 @@ export class InteractionTransaction extends SharedInteractionTransaction {
         const submission = parameters.challenge.getSubmission();
         if (submission) {
             features.push({
+                priority: FeaturePriority.EPOCH_SUBMISSION,
                 opcode: Features.EPOCH_SUBMISSION,
                 data: submission,
             });

package/build/transaction/builders/InteractionTransactionP2WDA.js

@@ -5,7 +5,7 @@ import { TransactionBuilder } from './TransactionBuilder.js';
 import { MessageSigner } from '../../keypair/MessageSigner.js';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { P2WDAGenerator } from '../../generators/builders/P2WDAGenerator.js';
-import { Features } from '../../generators/Features.js';
+import { FeaturePriority, Features } from '../../generators/Features.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { P2WDADetector } from '../../p2wda/P2WDADetector.js';
@@ -106,6 +106,7 @@ export class InteractionTransactionP2WDA extends TransactionBuilder {
         const features = [];
         if (parameters.loadedStorage) {
             features.push({
+                priority: FeaturePriority.ACCESS_LIST,
                 opcode: Features.ACCESS_LIST,
                 data: parameters.loadedStorage,
             });
@@ -113,6 +114,7 @@ export class InteractionTransactionP2WDA extends TransactionBuilder {
         const submission = parameters.challenge.getSubmission();
         if (submission) {
             features.push({
+                priority: FeaturePriority.EPOCH_SUBMISSION,
                 opcode: Features.EPOCH_SUBMISSION,
                 data: submission,
             });

package/build/transaction/builders/TransactionBuilder.js

@@ -4,7 +4,7 @@ import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressVerificator } from '../../keypair/AddressVerificator.js';
 import { TweakedTransaction } from '../shared/TweakedTransaction.js';
 import { P2WDADetector } from '../../p2wda/P2WDADetector.js';
-import { Features } from '../../generators/Features.js';
+import { FeaturePriority, Features } from '../../generators/Features.js';
 import { BITCOIN_PROTOCOL_ID, getChainId } from '../../chain/ChainData.js';
 import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 import { MLDSASecurityLevel } from '@btc-vision/bip32';
@@ -500,11 +500,16 @@ export class TransactionBuilder extends TweakedTransaction {
             throw new Error('Tweaked signer is not defined');
         }
         const tweakedKey = toXOnly(this.tweakedSigner.publicKey);
+        const originalKey = this.signer.publicKey;
+        if (originalKey.length !== 33) {
+            throw new Error('Original public key must be compressed (33 bytes)');
+        }
         const chainId = getChainId(this.network);
         const writer = new BinaryWriter();
         writer.writeU8(MLDSASecurityLevel.LEVEL2);
         writer.writeBytes(this.hashedPublicKey);
         writer.writeBytes(tweakedKey);
+        writer.writeBytes(originalKey);
         writer.writeBytes(BITCOIN_PROTOCOL_ID);
         writer.writeBytes(chainId);
         const message = writer.getBuffer();
@@ -524,6 +529,10 @@ export class TransactionBuilder extends TweakedTransaction {
             throw new Error('Tweaked signer is not defined');
         }
         const tweakedKey = toXOnly(this.tweakedSigner.publicKey);
+        const originalKey = this.signer.publicKey;
+        if (originalKey.length !== 33) {
+            throw new Error('Original public key must be compressed (33 bytes)');
+        }
         const chainId = getChainId(this.network);
         const level = getLevelFromPublicKeyLength(this.mldsaSigner.publicKey.length);
         if (level !== MLDSASecurityLevel.LEVEL2) {
@@ -534,6 +543,7 @@ export class TransactionBuilder extends TweakedTransaction {
         writer.writeBytes(this.hashedPublicKey);
         writer.writeBytes(this.mldsaSigner.publicKey);
         writer.writeBytes(tweakedKey);
+        writer.writeBytes(originalKey);
         writer.writeBytes(BITCOIN_PROTOCOL_ID);
         writer.writeBytes(chainId);
         const message = writer.getBuffer();
@@ -552,6 +562,7 @@ export class TransactionBuilder extends TweakedTransaction {
             mldsaSignature = this.generateMLDSASignature();
         }
         const mldsaRequest = {
+            priority: FeaturePriority.MLDSA_LINK_PUBKEY,
             opcode: Features.MLDSA_LINK_PUBKEY,
             data: {
                 verifyRequest: !!parameters.revealMLDSAPublicKey,

package/build/transaction/mineable/TimelockGenerator.d.ts

@@ -1,6 +1,9 @@
 import { Network } from '@btc-vision/bitcoin';
 import { IP2WSHAddress } from './IP2WSHAddress.js';
 export declare class TimeLockGenerator {
+    private static readonly UNSPENDABLE_INTERNAL_KEY;
     private static readonly CSV_BLOCKS;
     static generateTimeLockAddress(publicKey: Buffer, network?: Network, csvBlocks?: number): IP2WSHAddress;
+    static generateTimeLockAddressP2TR(publicKey: Buffer, network?: Network, csvBlocks?: number): string;
+    private static generateTimeLockScript;
 }

package/build/transaction/mineable/TimelockGenerator.js

@@ -1,13 +1,7 @@
 import bitcoin, { networks, opcodes, script } from '@btc-vision/bitcoin';
 export class TimeLockGenerator {
     static generateTimeLockAddress(publicKey, network = networks.bitcoin, csvBlocks = TimeLockGenerator.CSV_BLOCKS) {
-        const witnessScript = script.compile([
-            script.number.encode(csvBlocks),
-            opcodes.OP_CHECKSEQUENCEVERIFY,
-            opcodes.OP_DROP,
-            publicKey,
-            opcodes.OP_CHECKSIG,
-        ]);
+        const witnessScript = this.generateTimeLockScript(publicKey, csvBlocks);
         const p2wsh = bitcoin.payments.p2wsh({
             redeem: { output: witnessScript },
             network,
@@ -20,5 +14,30 @@ export class TimeLockGenerator {
             witnessScript: witnessScript,
         };
     }
+    static generateTimeLockAddressP2TR(publicKey, network = networks.bitcoin, csvBlocks = TimeLockGenerator.CSV_BLOCKS) {
+        if (publicKey.length !== 32) {
+            throw new Error('Public key must be 32 bytes for Taproot');
+        }
+        const witnessScript = this.generateTimeLockScript(publicKey, csvBlocks);
+        const taproot = bitcoin.payments.p2tr({
+            redeem: { output: witnessScript },
+            network,
+            internalPubkey: TimeLockGenerator.UNSPENDABLE_INTERNAL_KEY,
+        });
+        if (!taproot.address) {
+            throw new Error('Failed to generate P2TR address');
+        }
+        return taproot.address;
+    }
+    static generateTimeLockScript(publicKey, csvBlocks = TimeLockGenerator.CSV_BLOCKS) {
+        return script.compile([
+            script.number.encode(csvBlocks),
+            opcodes.OP_CHECKSEQUENCEVERIFY,
+            opcodes.OP_DROP,
+            publicKey,
+            opcodes.OP_CHECKSIG,
+        ]);
+    }
 }
+TimeLockGenerator.UNSPENDABLE_INTERNAL_KEY = Buffer.from('50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0', 'hex');
 TimeLockGenerator.CSV_BLOCKS = 75;

package/package.json

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

package/src/epoch/ChallengeSolution.ts

@@ -59,7 +59,11 @@ export class ChallengeSubmission implements IChallengeSubmission {
         }
 
         const buffer = signatureDataWriter.getBuffer();
-        return MessageSigner.verifySignature(this.publicKey, buffer, this.signature);
+        return MessageSigner.verifySignature(
+            this.publicKey.tweakedPublicKeyToBuffer(),
+            buffer,
+            this.signature,
+        );
     }
 }
 

package/src/generators/Features.ts

@@ -8,9 +8,16 @@ export enum Features {
     MLDSA_LINK_PUBKEY = 0b100,
 }
 
+export enum FeaturePriority {
+    ACCESS_LIST = 1,
+    EPOCH_SUBMISSION = 2,
+    MLDSA_LINK_PUBKEY = 3,
+}
+
 export interface Feature<T extends Features> {
     opcode: T;
     data: unknown;
+    priority: number;
 }
 
 export interface AccessListFeature extends Feature<Features.ACCESS_LIST> {

package/src/generators/builders/CalldataGenerator.ts

@@ -59,7 +59,7 @@ export class CalldataGenerator extends Generator {
      * @param {Buffer} contractSecret - The contract secret
      * @param {ChallengeSolution} challenge
      * @param maxPriority - Amount of satoshis to spend max on priority fee
-     * @param {Feature<Features>[]} features - The features to use
+     * @param {Feature<Features>[]} featuresRaw - The features to use
      * @returns {Buffer} - The compiled script
      * @throws {Error} - If something goes wrong
      */
@@ -68,7 +68,7 @@ export class CalldataGenerator extends Generator {
         contractSecret: Buffer,
         challenge: ChallengeSolution,
         maxPriority: bigint,
-        features: Feature<Features>[] = [],
+        featuresRaw: Feature<Features>[] = [],
     ): Buffer {
         if (!this.contractSaltPubKey) throw new Error('Contract salt public key not set');
 
@@ -77,12 +77,16 @@ export class CalldataGenerator extends Generator {
 
         const featuresList: Features[] = [];
         const featureData: (number | Buffer | Buffer[])[] = [];
-        for (let i = 0; i < features.length; i++) {
-            const feature = features[i];
-            featuresList.push(feature.opcode);
 
-            const data = this.encodeFeature(feature);
-            featureData.push(...data);
+        const features: Feature<Features>[] = featuresRaw.sort((a, b) => a.priority - b.priority);
+        if (features.length) {
+            for (let i = 0; i < features.length; i++) {
+                const feature = features[i];
+                featuresList.push(feature.opcode);
+
+                const data = this.encodeFeature(feature);
+                featureData.push(...data);
+            }
         }
 
         let compiledData: (number | Buffer | Buffer[])[] = [

package/src/generators/builders/DeploymentGenerator.ts

@@ -61,7 +61,7 @@ export class DeploymentGenerator extends Generator {
         challenge: ChallengeSolution,
         maxPriority: bigint,
         calldata?: Buffer,
-        features?: Feature<Features>[],
+        featuresRaw?: Feature<Features>[],
     ): (number | Buffer)[] {
         if (!this.contractSaltPubKey) throw new Error('Contract salt public key not set');
 
@@ -71,7 +71,11 @@ export class DeploymentGenerator extends Generator {
         const featuresList: Features[] = [];
         const featureData: (number | Buffer | Buffer[])[] = [];
 
-        if (features) {
+        if (featuresRaw) {
+            const features: Feature<Features>[] = featuresRaw.sort(
+                (a, b) => a.priority - b.priority,
+            );
+
             for (let i = 0; i < features.length; i++) {
                 const feature = features[i];
                 featuresList.push(feature.opcode);

package/src/generators/builders/LegacyCalldataGenerator.ts

@@ -55,7 +55,7 @@ export class LegacyCalldataGenerator extends Generator {
      * @param {Buffer} contractSecret - The contract secret
      * @param {Buffer} challenge - The challenge to use
      * @param {bigint} maxPriority - The maximum priority
-     * @param {number[]} [features=[]] - The features to use (optional)
+     * @param {number[]} [featuresRaw=[]] - The features to use (optional)
      * @returns {Buffer} - The compiled script
      * @throws {Error} - If something goes wrong
      */
@@ -64,19 +64,23 @@ export class LegacyCalldataGenerator extends Generator {
         contractSecret: Buffer,
         challenge: Buffer,
         maxPriority: bigint,
-        features: Feature<Features>[] = [],
+        featuresRaw: Feature<Features>[] = [],
     ): Buffer {
         const dataChunks: Buffer[][] = this.splitBufferIntoChunks(calldata);
         if (!dataChunks.length) throw new Error('No data chunks found');
 
         const featuresList: Features[] = [];
         const featureData: (number | Buffer | Buffer[])[] = [];
-        for (let i = 0; i < features.length; i++) {
-            const feature = features[i];
-            featuresList.push(feature.opcode);
+        const features: Feature<Features>[] = featuresRaw.sort((a, b) => a.priority - b.priority);
 
-            const data = this.encodeFeature(feature);
-            featureData.push(...data);
+        if (features.length) {
+            for (let i = 0; i < features.length; i++) {
+                const feature = features[i];
+                featuresList.push(feature.opcode);
+
+                const data = this.encodeFeature(feature);
+                featureData.push(...data);
+            }
         }
 
         let compiledData = [

package/src/generators/builders/P2WDAGenerator.ts

@@ -59,7 +59,7 @@ export class P2WDAGenerator extends Generator {
      * @param contractSecret The 32-byte contract secret
      * @param challenge The challenge solution for epoch rewards
      * @param maxPriority Maximum priority fee in satoshis
-     * @param features Optional features like access lists
+     * @param featuresRaw Optional features like access lists
      * @returns Raw operation data ready for signing and compression
      */
     public compile(
@@ -67,7 +67,7 @@ export class P2WDAGenerator extends Generator {
         contractSecret: Buffer,
         challenge: ChallengeSolution,
         maxPriority: bigint,
-        features: Feature<Features>[] = [],
+        featuresRaw: Feature<Features>[] = [],
     ): Buffer {
         if (!this.contractSaltPubKey) {
             throw new Error('Contract salt public key not set');
@@ -82,6 +82,8 @@ export class P2WDAGenerator extends Generator {
         // Version byte
         writer.writeU8(P2WDAGenerator.P2WDA_VERSION);
 
+        const features: Feature<Features>[] = featuresRaw.sort((a, b) => a.priority - b.priority);
+
         // Header
         writer.writeBytes(
             this.getHeader(

package/src/keypair/Address.ts

@@ -645,7 +645,7 @@ export class Address extends Uint8Array {
     }
 
     /**
-     * Generate a P2WSH address with CSV (CheckSequenceVerify) timelock
+     * Generate a P2WSH address with CSV (CheckSequenceVerify) time lock
      * The resulting address can only be spent after the specified number of blocks
      * have passed since the UTXO was created.
      *
@@ -677,6 +677,40 @@ export class Address extends Uint8Array {
         return TimeLockGenerator.generateTimeLockAddress(publicKeyBuffer, network, n);
     }
 
+    /**
+     * Generate a P2TR address with CSV (CheckSequenceVerify) time lock
+     * The resulting address can only be spent after the specified number of blocks
+     * have passed since the UTXO was created.
+     *
+     * @param {bigint | number | string} duration - The number of blocks that must pass before spending (1-65535)
+     * @param {Network} network - The Bitcoin network to use
+     * @returns {IP2WSHAddress} The timelocked address and its witness script
+     * @throws {Error} If the block number is out of range or public key is not available
+     */
+    public toCSVTweaked(duration: bigint | number | string, network: Network): string {
+        const n = Number(duration);
+
+        // First, let's validate the block number to ensure it's within the valid range
+        // CSV uses sequence numbers, which have special encoding for block-based locks
+        if (n < 1 || n > 65535) {
+            throw new Error('CSV block number must be between 1 and 65535');
+        }
+
+        // We need the original public key in compressed format for the script
+        // Your class stores this in #originalPublicKey when a key is set
+        if (!this.#originalPublicKey) {
+            throw new Error('Cannot create CSV address: public key not set');
+        }
+
+        // Now we can use your TimeLockGenerator to create the timelocked address
+        // Converting bigint to number is safe here because we've already validated the range
+        return TimeLockGenerator.generateTimeLockAddressP2TR(
+            this.tweakedPublicKeyToBuffer(),
+            network,
+            n,
+        );
+    }
+
     /**
      * Returns the OPNet address encoded in bech32m format, derived from the SHA256 hash of the ML-DSA public key
      * (which is what the Address internally stores).

package/src/transaction/builders/DeploymentTransaction.ts

@@ -25,7 +25,7 @@ import { Address } from '../../keypair/Address.js';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
 import { TimeLockGenerator } from '../mineable/TimelockGenerator.js';
 import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
-import { Feature, Features } from '../../generators/Features.js';
+import { Feature, FeaturePriority, Features } from '../../generators/Features.js';
 import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 
 export class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
@@ -379,6 +379,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         const submission = parameters.challenge.getSubmission();
         if (submission) {
             features.push({
+                priority: FeaturePriority.MLDSA_LINK_PUBKEY,
                 opcode: Features.EPOCH_SUBMISSION,
                 data: submission,
             });