@dynamic-labs-wallet/btc-utils 1.0.99 → 1.0.101

package/index.cjs

@@ -1455,9 +1455,6 @@ function _type_of(obj) {
  * Computes the BIP-322 message hash for a given message and public key,
  * returning the result as a hex string.
  *
- * This function implements the BIP-322 hash computation for
- * native_segwit and taproot address types.
- *
  * @param message - The raw message to be signed
  * @param publicKey - The public key (hex string, Buffer, or Uint8Array)
  * @param addressType - The address type (BitcoinAddressType enum or 'native_segwit', 'taproot')
@@ -1466,70 +1463,11 @@ function _type_of(obj) {
  * @returns The BIP-322 message hash as a hex string
  */ var computeBip322HashHex = function(message, publicKey, addressType) {
     var network = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : core.BitcoinNetwork.MAINNET, ecc = arguments.length > 4 ? arguments[4] : void 0;
-    // Convert string network to BitcoinNetwork enum
     var btcNetwork = toBitcoinNetwork(network);
-    // Convert string addressType to enum
     var addressTypeEnum = toBitcoinAddressType(addressType);
-    // Validate address type
-    if (addressTypeEnum !== core.BitcoinAddressType.NATIVE_SEGWIT && addressTypeEnum !== core.BitcoinAddressType.TAPROOT) {
-        throw new Error("Unsupported address type: ".concat(addressType));
-    }
-    // Convert publicKey to Buffer
-    var pubKeyBuffer;
-    if (typeof publicKey === 'string') {
-        pubKeyBuffer = Buffer.from(publicKey.replace(/^0x/, ''), 'hex');
-    } else {
-        pubKeyBuffer = toBuffer(publicKey);
-    }
-    // Compress public key if uncompressed
-    pubKeyBuffer = normalizeForCompressed(pubKeyBuffer);
-    // Generate address from public key
-    var address = publicKeyToBitcoinAddress(pubKeyBuffer, addressTypeEnum, btcNetwork, ecc);
-    // Convert address to scriptPubKey using bip322-js
-    var scriptPubKey = bip322Js.Address.convertAdressToScriptPubkey(address);
-    // Create the BIP-322 to_spend transaction
-    var toSpendTx = bip322Js.BIP322.buildToSpendTx(message, scriptPubKey);
-    // Create the to_sign PSBT
-    var toSignPsbt = bip322Js.BIP322.buildToSignTx(toSpendTx.getId(), scriptPubKey);
-    // Get the transaction from the PSBT
-    var txToSign = toSignPsbt.__CACHE.__TX;
-    // Get bitcoinjs-lib network
-    var bitcoinNetwork = getBitcoinNetwork(btcNetwork);
-    // Compute sighash based on address type
-    if (addressTypeEnum === core.BitcoinAddressType.TAPROOT) {
-        // Taproot (BIP-341) uses hashForWitnessV1 with SIGHASH_DEFAULT
-        var prevOutScripts = [
-            scriptPubKey
-        ];
-        var values = [
-            0
-        ]; // Use number, not BigInt - BIP-322 uses 0 value
-        var hash = txToSign.hashForWitnessV1(0, prevOutScripts, values, bitcoin__namespace.Transaction.SIGHASH_DEFAULT);
-        return Buffer.from(hash).toString('hex');
-    } else {
-        // SegWit (BIP-143) uses hashForWitnessV0 with SIGHASH_ALL
-        // Create a new transaction for signing
-        var txToSignSegwit = new bitcoin__namespace.Transaction();
-        txToSignSegwit.version = 0;
-        txToSignSegwit.locktime = 0;
-        var prevTxId = toSpendTx.getId();
-        var prevHash = Buffer.from(prevTxId, 'hex').reverse();
-        txToSignSegwit.addInput(new Uint8Array(prevHash), 0, 0);
-        txToSignSegwit.addOutput(new Uint8Array(Buffer.from([
-            0x6a
-        ])), BigInt(0));
-        // Build P2PKH script code from pubkey
-        var p2pkh = bitcoin__namespace.payments.p2pkh({
-            pubkey: new Uint8Array(pubKeyBuffer),
-            network: bitcoinNetwork
-        });
-        var scriptCode = p2pkh.output;
-        if (!scriptCode) {
-            throw new Error('Failed to generate scriptCode for BIP-322 hash');
-        }
-        var hash1 = txToSignSegwit.hashForWitnessV0(0, scriptCode, BigInt(0), bitcoin__namespace.Transaction.SIGHASH_ALL);
-        return Buffer.from(hash1).toString('hex');
-    }
+    var normalizedPublicKey = typeof publicKey === 'string' ? publicKey.replace(/^0x/, '') : publicKey;
+    var formattedMessage = calculateBip322Hash(message, normalizedPublicKey, addressTypeEnum, btcNetwork, ecc).formattedMessage;
+    return Buffer.from(formattedMessage).toString('hex');
 };
 
 exports.calculateBip322Hash = calculateBip322Hash;

package/index.esm.js

@@ -1435,9 +1435,6 @@ function _type_of(obj) {
  * Computes the BIP-322 message hash for a given message and public key,
  * returning the result as a hex string.
  *
- * This function implements the BIP-322 hash computation for
- * native_segwit and taproot address types.
- *
  * @param message - The raw message to be signed
  * @param publicKey - The public key (hex string, Buffer, or Uint8Array)
  * @param addressType - The address type (BitcoinAddressType enum or 'native_segwit', 'taproot')
@@ -1446,70 +1443,11 @@ function _type_of(obj) {
  * @returns The BIP-322 message hash as a hex string
  */ var computeBip322HashHex = function(message, publicKey, addressType) {
     var network = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : BitcoinNetwork.MAINNET, ecc = arguments.length > 4 ? arguments[4] : void 0;
-    // Convert string network to BitcoinNetwork enum
     var btcNetwork = toBitcoinNetwork(network);
-    // Convert string addressType to enum
     var addressTypeEnum = toBitcoinAddressType(addressType);
-    // Validate address type
-    if (addressTypeEnum !== BitcoinAddressType.NATIVE_SEGWIT && addressTypeEnum !== BitcoinAddressType.TAPROOT) {
-        throw new Error("Unsupported address type: ".concat(addressType));
-    }
-    // Convert publicKey to Buffer
-    var pubKeyBuffer;
-    if (typeof publicKey === 'string') {
-        pubKeyBuffer = Buffer.from(publicKey.replace(/^0x/, ''), 'hex');
-    } else {
-        pubKeyBuffer = toBuffer(publicKey);
-    }
-    // Compress public key if uncompressed
-    pubKeyBuffer = normalizeForCompressed(pubKeyBuffer);
-    // Generate address from public key
-    var address = publicKeyToBitcoinAddress(pubKeyBuffer, addressTypeEnum, btcNetwork, ecc);
-    // Convert address to scriptPubKey using bip322-js
-    var scriptPubKey = Address.convertAdressToScriptPubkey(address);
-    // Create the BIP-322 to_spend transaction
-    var toSpendTx = BIP322.buildToSpendTx(message, scriptPubKey);
-    // Create the to_sign PSBT
-    var toSignPsbt = BIP322.buildToSignTx(toSpendTx.getId(), scriptPubKey);
-    // Get the transaction from the PSBT
-    var txToSign = toSignPsbt.__CACHE.__TX;
-    // Get bitcoinjs-lib network
-    var bitcoinNetwork = getBitcoinNetwork(btcNetwork);
-    // Compute sighash based on address type
-    if (addressTypeEnum === BitcoinAddressType.TAPROOT) {
-        // Taproot (BIP-341) uses hashForWitnessV1 with SIGHASH_DEFAULT
-        var prevOutScripts = [
-            scriptPubKey
-        ];
-        var values = [
-            0
-        ]; // Use number, not BigInt - BIP-322 uses 0 value
-        var hash = txToSign.hashForWitnessV1(0, prevOutScripts, values, bitcoin.Transaction.SIGHASH_DEFAULT);
-        return Buffer.from(hash).toString('hex');
-    } else {
-        // SegWit (BIP-143) uses hashForWitnessV0 with SIGHASH_ALL
-        // Create a new transaction for signing
-        var txToSignSegwit = new bitcoin.Transaction();
-        txToSignSegwit.version = 0;
-        txToSignSegwit.locktime = 0;
-        var prevTxId = toSpendTx.getId();
-        var prevHash = Buffer.from(prevTxId, 'hex').reverse();
-        txToSignSegwit.addInput(new Uint8Array(prevHash), 0, 0);
-        txToSignSegwit.addOutput(new Uint8Array(Buffer.from([
-            0x6a
-        ])), BigInt(0));
-        // Build P2PKH script code from pubkey
-        var p2pkh = bitcoin.payments.p2pkh({
-            pubkey: new Uint8Array(pubKeyBuffer),
-            network: bitcoinNetwork
-        });
-        var scriptCode = p2pkh.output;
-        if (!scriptCode) {
-            throw new Error('Failed to generate scriptCode for BIP-322 hash');
-        }
-        var hash1 = txToSignSegwit.hashForWitnessV0(0, scriptCode, BigInt(0), bitcoin.Transaction.SIGHASH_ALL);
-        return Buffer.from(hash1).toString('hex');
-    }
+    var normalizedPublicKey = typeof publicKey === 'string' ? publicKey.replace(/^0x/, '') : publicKey;
+    var formattedMessage = calculateBip322Hash(message, normalizedPublicKey, addressTypeEnum, btcNetwork, ecc).formattedMessage;
+    return Buffer.from(formattedMessage).toString('hex');
 };
 
 export { calculateBip322Hash, calculateTaprootTweak, collectPSBTInputData, computeBip322HashHex, convertSignatureToDER, convertSignatureToTaprootBuffer, createLegacyAddress, createNativeSegWitAddress, createSegWitAddress, createTaprootAddress, doesInputBelongToAddress, encodeBip322Signature, extractPsbtSighashes, extractPublicKeyHex, getAddressTypeFromDerivationPath, getBitcoinNetwork, getDefaultRpcUrl, getFeeRates, getPublicKeyFromPrivateKey, getUTXOs, initEccLib, normalizeForCompressed, normalizeForTaproot, normalizePublicKey, privateKeyToWIF, publicKeyToBitcoinAddress, selectUTXOs, toBitcoinNetwork, toBuffer, wifToPrivateKey };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dynamic-labs-wallet/btc-utils",
-  "version": "1.0.99",
+  "version": "1.0.101",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
   "dependencies": {
-    "@dynamic-labs-wallet/core": "1.0.99",
+    "@dynamic-labs-wallet/core": "1.0.101",
     "bitcoinjs-lib": "^7.0.0",
     "bip322-js": "^3.0.0",
     "@noble/hashes": "1.7.1",

package/src/computeBip322HashHex/computeBip322HashHex.d.ts

@@ -1,11 +1,9 @@
-import { BitcoinAddressType, BitcoinNetwork } from '@dynamic-labs-wallet/core';
+import type { BitcoinAddressType } from '@dynamic-labs-wallet/core';
+import { BitcoinNetwork } from '@dynamic-labs-wallet/core';
 /**
  * Computes the BIP-322 message hash for a given message and public key,
  * returning the result as a hex string.
  *
- * This function implements the BIP-322 hash computation for
- * native_segwit and taproot address types.
- *
  * @param message - The raw message to be signed
  * @param publicKey - The public key (hex string, Buffer, or Uint8Array)
  * @param addressType - The address type (BitcoinAddressType enum or 'native_segwit', 'taproot')

package/src/computeBip322HashHex/computeBip322HashHex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeBip322HashHex.d.ts","sourceRoot":"","sources":["../../src/computeBip322HashHex/computeBip322HashHex.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAQ/E;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,oBAAoB,YACtB,MAAM,aACJ,MAAM,GAAG,MAAM,GAAG,UAAU,eAC1B,kBAAkB,GAAG,eAAe,GAAG,SAAS,YACpD,cAAc,GAAG,SAAS,GAAG,SAAS,QACzC,GAAG,KACR,MAyEF,CAAC"}
+{"version":3,"file":"computeBip322HashHex.d.ts","sourceRoot":"","sources":["../../src/computeBip322HashHex/computeBip322HashHex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAK3D;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB,YACtB,MAAM,aACJ,MAAM,GAAG,MAAM,GAAG,UAAU,eAC1B,kBAAkB,GAAG,eAAe,GAAG,SAAS,YACpD,cAAc,GAAG,SAAS,GAAG,SAAS,QACzC,GAAG,KACR,MASF,CAAC"}