@btc-vision/transaction 1.0.120 → 1.0.121

package/src/keypair/EcKeyPair.ts

@@ -4,17 +4,21 @@ import { address, initEccLib, Network, networks, payments, Signer } from '@btc-v
 import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { ECPairAPI, ECPairFactory, ECPairInterface } from 'ecpair';
 import { IWallet } from './interfaces/IWallet.js';
-import { CURVE, Point, utils } from '@noble/secp256k1';
+import { CURVE, ProjectivePoint as Point } from '@noble/secp256k1';
 import { taggedHash } from '@btc-vision/bitcoin/src/crypto.js';
 
 initEccLib(ecc);
 
 const BIP32factory = typeof bip32 === 'function' ? bip32 : BIP32Factory;
-
 if (!BIP32factory) {
     throw new Error('Failed to load BIP32 library');
 }
 
+const mod = (a: bigint, b: bigint): bigint => {
+    const result = a % b;
+    return result >= 0n ? result : result + b;
+};
+
 /**
  * Class for handling EC key pairs
  * @class EcKeyPair
@@ -212,20 +216,24 @@ export class EcKeyPair {
 
     /**
      * Tweak a public key
-     * @param {string} compressedPubKeyHex - The compressed public key hex string
-     * @returns {string} - The tweaked public key hex string
+     * @param {string | Buffer} compressedPubKeyHex - The compressed public key hex string
+     * @returns {Buffer} - The tweaked public key hex string
      * @throws {Error} - If the public key cannot be tweaked
      */
-    public static tweakPublicKey(compressedPubKeyHex: string): string {
-        if (compressedPubKeyHex.startsWith('0x')) {
+    public static tweakPublicKey(compressedPubKeyHex: string | Buffer): Buffer {
+        if (typeof compressedPubKeyHex === 'string' && compressedPubKeyHex.startsWith('0x')) {
             compressedPubKeyHex = compressedPubKeyHex.slice(2);
         }
 
+        if (typeof compressedPubKeyHex !== 'string') {
+            compressedPubKeyHex = compressedPubKeyHex.toString('hex');
+        }
+
         // Convert the compressed public key hex string to a Point on the curve
         let P = Point.fromHex(compressedPubKeyHex);
 
         // Ensure the point has an even y-coordinate
-        if (!P.hasEvenY()) {
+        if ((P.y & 1n) !== 0n) {
             // Negate the point to get an even y-coordinate
             P = P.negate();
         }
@@ -235,13 +243,13 @@ export class EcKeyPair {
 
         // Compute the tweak t = H_tapTweak(x)
         const tHash = taggedHash('TapTweak', Buffer.from(x));
-        const t = utils.mod(BigInt('0x' + Buffer.from(tHash).toString('hex')), CURVE.n);
+        const t = mod(BigInt('0x' + Buffer.from(tHash).toString('hex')), CURVE.n);
 
         // Compute Q = P + t*G (where G is the generator point)
-        const Q = P.add(Point.BASE.multiply(t));
+        const Q = P.add(Point.BASE.mul(t));
 
         // Return the tweaked public key in compressed form (hex string)
-        return Q.toHex(true);
+        return Buffer.from(Q.toRawBytes(true));
     }
 
     /**
@@ -417,6 +425,6 @@ export class EcKeyPair {
         const privKey = fromSeed.privateKey;
         if (!privKey) throw new Error('Failed to generate key pair');
 
-        return this.ECPair.fromPrivateKey(privKey, { network });
+        return this.ECPair.fromPrivateKey(Buffer.from(privKey), { network });
     }
 }

package/src/keypair/Wallet.ts

@@ -68,10 +68,7 @@ export class Wallet {
         this._legacy = EcKeyPair.getLegacyAddress(this._keypair, this.network);
         this._segwitLegacy = EcKeyPair.getLegacySegwitAddress(this._keypair, this.network);
 
-        this._tweakedKey = Buffer.from(
-            EcKeyPair.tweakPublicKey(this._keypair.publicKey.toString('hex')),
-            'hex',
-        );
+        this._tweakedKey = EcKeyPair.tweakPublicKey(this._keypair.publicKey.toString('hex'));
 
         this._bufferPubKey = this._keypair.publicKey;
         this._address = new Address(this._keypair.publicKey);

package/src/utils/BitcoinUtils.ts

@@ -37,13 +37,9 @@ export class BitcoinUtils {
 
             return Buffer.from(array);
         } else {
-            // Fallback to Math.random() if window.crypto is not available
-            const randomValues = [];
-            for (let i = 0; i < length; i++) {
-                randomValues.push(Math.floor(Math.random() * 256));
-            }
-
-            return Buffer.from(randomValues);
+            throw new Error(
+                'No secure random number generator available. Please upgrade your environment.',
+            );
         }
     }