@btc-vision/transaction 1.7.13 → 1.7.14

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.14";

package/build/_version.js

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

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

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

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.14",
     "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.14';

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

@@ -889,6 +889,11 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         }
 
         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();
@@ -897,6 +902,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         writer.writeU8(MLDSASecurityLevel.LEVEL2);
         writer.writeBytes(this.hashedPublicKey);
         writer.writeBytes(tweakedKey);
+        writer.writeBytes(originalKey);
         writer.writeBytes(BITCOIN_PROTOCOL_ID);
         writer.writeBytes(chainId);
 
@@ -923,6 +929,11 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         }
 
         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);
 
@@ -935,6 +946,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         writer.writeBytes(this.hashedPublicKey);
         writer.writeBytes(this.mldsaSigner.publicKey);
         writer.writeBytes(tweakedKey);
+        writer.writeBytes(originalKey);
         writer.writeBytes(BITCOIN_PROTOCOL_ID);
         writer.writeBytes(chainId);
 

package/src/transaction/mineable/TimelockGenerator.ts

@@ -2,6 +2,11 @@ import bitcoin, { Network, networks, opcodes, script } from '@btc-vision/bitcoin
 import { IP2WSHAddress } from './IP2WSHAddress.js';
 
 export class TimeLockGenerator {
+    private static readonly UNSPENDABLE_INTERNAL_KEY = Buffer.from(
+        '50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0',
+        'hex',
+    );
+
     private static readonly CSV_BLOCKS = 75;
 
     /**
@@ -13,13 +18,7 @@ export class TimeLockGenerator {
         network: Network = networks.bitcoin,
         csvBlocks: number = TimeLockGenerator.CSV_BLOCKS,
     ): IP2WSHAddress {
-        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 },
@@ -35,4 +34,45 @@ export class TimeLockGenerator {
             witnessScript: witnessScript,
         };
     }
+
+    /**
+     * Generate a P2TR address with CSV time lock
+     * Note: This uses Schnorr signatures
+     */
+    public static generateTimeLockAddressP2TR(
+        publicKey: Buffer,
+        network: Network = networks.bitcoin,
+        csvBlocks: number = TimeLockGenerator.CSV_BLOCKS,
+    ): string {
+        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;
+    }
+
+    private static generateTimeLockScript(
+        publicKey: Buffer,
+        csvBlocks: number = TimeLockGenerator.CSV_BLOCKS,
+    ): Buffer {
+        return script.compile([
+            script.number.encode(csvBlocks),
+            opcodes.OP_CHECKSEQUENCEVERIFY,
+            opcodes.OP_DROP,
+            publicKey,
+            opcodes.OP_CHECKSIG,
+        ]);
+    }
 }