@btc-vision/transaction 1.7.13 → 1.7.15

package/src/transaction/builders/InteractionTransaction.ts

@@ -3,7 +3,7 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { IInteractionParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
-import { Feature, Features } from '../../generators/Features.js';
+import { Feature, FeaturePriority, Features } from '../../generators/Features.js';
 
 /**
  * Class for interaction transactions
@@ -63,6 +63,7 @@ export class InteractionTransaction extends SharedInteractionTransaction<Transac
 
         if (parameters.loadedStorage) {
             features.push({
+                priority: FeaturePriority.ACCESS_LIST,
                 opcode: Features.ACCESS_LIST,
                 data: parameters.loadedStorage,
             });
@@ -71,6 +72,7 @@ export class InteractionTransaction extends SharedInteractionTransaction<Transac
         const submission = parameters.challenge.getSubmission();
         if (submission) {
             features.push({
+                priority: FeaturePriority.EPOCH_SUBMISSION,
                 opcode: Features.EPOCH_SUBMISSION,
                 data: submission,
             });

package/src/transaction/builders/InteractionTransactionP2WDA.ts

@@ -6,7 +6,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 { Feature, Features } from '../../generators/Features.js';
+import { Feature, FeaturePriority, Features } from '../../generators/Features.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
@@ -200,6 +200,7 @@ export class InteractionTransactionP2WDA extends TransactionBuilder<TransactionT
 
         if (parameters.loadedStorage) {
             features.push({
+                priority: FeaturePriority.ACCESS_LIST,
                 opcode: Features.ACCESS_LIST,
                 data: parameters.loadedStorage,
             });
@@ -208,6 +209,7 @@ export class InteractionTransactionP2WDA extends TransactionBuilder<TransactionT
         const submission = parameters.challenge.getSubmission();
         if (submission) {
             features.push({
+                priority: FeaturePriority.EPOCH_SUBMISSION,
                 opcode: Features.EPOCH_SUBMISSION,
                 data: submission,
             });

package/src/transaction/builders/TransactionBuilder.ts

@@ -27,7 +27,7 @@ import { TweakedTransaction } from '../shared/TweakedTransaction.js';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
 import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 import { P2WDADetector } from '../../p2wda/P2WDADetector.js';
-import { Feature, Features, MLDSALinkRequest } from '../../generators/Features.js';
+import { Feature, FeaturePriority, Features, MLDSALinkRequest } 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';
@@ -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);
 
@@ -967,6 +979,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         }
 
         const mldsaRequest: MLDSALinkRequest = {
+            priority: FeaturePriority.MLDSA_LINK_PUBKEY,
             opcode: Features.MLDSA_LINK_PUBKEY,
             data: {
                 verifyRequest: !!parameters.revealMLDSAPublicKey,

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,
+        ]);
+    }
 }