chore: bump bitcoinjs-lib to latest (fixes warnings related to taproot/segwit_v1 addresses) (#1517)

* chore: bump to bitcoinjs-lib to latest (fixes warnings related to taproot/segwitV2 addresses)

* chore: bitcoinjs-lib now supports taproot addresses without custom handling

Author: zone117x

package-lock.json

@@ -137,7 +137,7 @@
     "@types/ws": "7.4.7",
     "ajv": "6.12.6",
     "bignumber.js": "9.0.2",
-    "bitcoinjs-lib": "6.0.2",
+    "bitcoinjs-lib": "6.1.0",
     "bluebird": "3.7.2",
     "c32check": "1.1.3",
     "chokidar": "3.5.3",

package.json

@@ -1,5 +1,6 @@
 import { RPCClient } from 'rpc-bitcoin';
 import * as btc from 'bitcoinjs-lib';
+import * as ecc from 'tiny-secp256k1';
 import * as Bluebird from 'bluebird';
 import { parsePort, time, logger, logError } from './helpers';
 import * as coinselect from 'coinselect';
@@ -70,6 +71,7 @@ const MIN_TX_CONFIRMATIONS = 1;
 
 function isValidBtcAddress(network: btc.Network, address: string): boolean {
   try {
+    btc.initEccLib(ecc);
     btc.address.toOutputScript(address, network);
     return true;
   } catch (error) {

src/btc-faucet.ts

@@ -198,24 +198,15 @@ function p2wshAddressFromKey(args: KeyInputArgs): KeyOutput {
 function p2trAddressFromKey(args: KeyInputArgs): KeyOutput {
   const network = BITCOIN_NETWORKS[args.network];
   const ecPair = ecPairFromKeyInputArgs(args, true);
-
-  // x-only pubkey (remove 1 byte y parity)
-  const myXOnlyPubkey = ecPair.publicKey.slice(1, 33);
-  const commitHash = bitcoin.crypto.taggedHash('TapTweak', myXOnlyPubkey);
-  const tweakResult = ecc.xOnlyPointAddTweak(myXOnlyPubkey, commitHash);
-  if (tweakResult === null) {
-    throw new Error('Invalid Tweak');
+  bitcoin.initEccLib(ecc);
+  const pmnt = bitcoin.payments.p2tr({
+    internalPubkey: ecPair.publicKey.slice(1, 33),
+    network: network,
+  });
+  if (!pmnt.address) {
+    throw new Error(`Could not create p2tr address from key`);
   }
-  const { xOnlyPubkey: tweaked } = tweakResult;
-  const scriptPubkey = Buffer.concat([
-    // witness v1, PUSH_DATA 32 bytes
-    Buffer.from([0x51, 0x20]),
-    // x-only tweaked pubkey
-    tweaked,
-  ]);
-
-  const address = bitcoin.address.fromOutputScript(scriptPubkey, network);
-  return { ecPair, address };
+  return { ecPair, address: pmnt.address };
 }
 
 export interface VerboseKeyOutput {

src/ec-helpers.ts

@@ -7,6 +7,7 @@ import * as stream from 'stream';
 import * as http from 'http';
 import * as winston from 'winston';
 import { isValidStacksAddress, stacksToBitcoinAddress } from 'stacks-encoding-native-js';
+import * as ecc from 'tiny-secp256k1';
 import * as btc from 'bitcoinjs-lib';
 import {
   BufferCV,
@@ -243,6 +244,7 @@ export function microStxToStx(microStx: bigint | BigNumber): string {
  * @param address - A bitcoin address.
  */
 export function isValidBitcoinAddress(address: string): boolean {
+  btc.initEccLib(ecc);
   try {
     btc.address.toOutputScript(address, btc.networks.bitcoin);
     return true;

src/helpers.ts

@@ -114,6 +114,17 @@ test('bitcoin<->stacks address', () => {
       'tb1qwvwagx5f24farha0fzfmxr48lgr7sly7t5tsyh',
       'tb1qqruv3zxqtmaxqa8uxaychtm0szfazeay63j9yu',
     ],
+    // bech32m / segwit_V1 / p2tr / taproot
+    p2tr_mainnet: [
+      'bc1p5d7rjq7g6rdk2yhzks9smlaqtedr4dekq08ge8ztwac72sfr9rusxg3297',
+      'bc1p2wsldez5mud2yam29q22wgfh9439spgduvct83k3pm50fcxa5dps59h4z5',
+      'bc1pmfr3p9j00pfxjh0zmgp99y8zftmd3s5pmedqhyptwy6lm87hf5sspknck9',
+    ],
+    // bech32m / segwit_V1 / p2tr / taproot
+    p2tr_testnet: [
+      'tb1p6h5fuzmnvpdthf5shf0qqjzwy7wsqc5rhmgq2ks9xrak4ry6mtrscsqvzp',
+      'tb1p8dlmzllfah294ntwatr8j5uuvcj7yg0dete94ck2krrk0ka2c9qqex96hv',
+    ],
     bip141_p2wpkh_mainnet: [
       'bc1q86agjesjeu33mq7uwxsfgdxpe5uxwd0z9ttke9',
       'bc1qlq3xlzgun9x92hd4hrfqkqs6uh78tjleqsc2u2',