fix: Update to work with v6

Author: reardencode

package-lock.json

@@ -53,6 +53,7 @@
     "bip174": "^2.0.1",
     "bs58check": "^2.1.2",
     "create-hash": "^1.1.0",
+    "fastpriorityqueue": "^0.7.1",
     "ripemd160": "^2.0.2",
     "typeforce": "^1.11.3",
     "varuint-bitcoin": "^1.1.2",
@@ -86,7 +87,7 @@
     "randombytes": "^2.1.0",
     "regtest-client": "0.2.0",
     "rimraf": "^2.6.3",
-    "tiny-secp256k1": "^2.1.2",
+    "tiny-secp256k1": "^2.2.0",
     "ts-node": "^8.3.0",
     "tslint": "^6.1.3",
     "typescript": "^4.4.4"

package.json

@@ -99,6 +99,9 @@ function fromOutputScript(output, network) {
   try {
     return payments.p2wsh({ output, network }).address;
   } catch (e) {}
+  try {
+    return payments.p2tr({ output, network }).address;
+  } catch (e) {}
   try {
     return _toFutureSegwitAddress(output, network);
   } catch (e) {}

src/address.js

@@ -3,7 +3,8 @@ import * as crypto from './crypto';
 import * as networks from './networks';
 import * as payments from './payments';
 import * as script from './script';
-export { address, crypto, networks, payments, script };
+import * as taproot from './taproot';
+export { address, crypto, networks, payments, script, taproot };
 export { Block } from './block';
 export { TaggedHashPrefix } from './crypto';
 export { Psbt, PsbtTxInput, PsbtTxOutput, Signer, SignerAsync, HDSigner, HDSignerAsync, } from './psbt';

src/index.d.ts

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.Transaction = exports.opcodes = exports.Psbt = exports.Block = exports.script = exports.payments = exports.networks = exports.crypto = exports.address = void 0;
+exports.Transaction = exports.opcodes = exports.Psbt = exports.Block = exports.taproot = exports.script = exports.payments = exports.networks = exports.crypto = exports.address = void 0;
 const address = require('./address');
 exports.address = address;
 const crypto = require('./crypto');
@@ -11,6 +11,8 @@ const payments = require('./payments');
 exports.payments = payments;
 const script = require('./script');
 exports.script = script;
+const taproot = require('./taproot');
+exports.taproot = taproot;
 var block_1 = require('./block');
 Object.defineProperty(exports, 'Block', {
   enumerable: true,

src/index.js

@@ -1,10 +1,13 @@
 /// <reference types="node" />
 import { Network } from '../networks';
+import { TinySecp256k1Interface } from '../types';
 import { p2data as embed } from './embed';
 import { p2ms } from './p2ms';
 import { p2pk } from './p2pk';
 import { p2pkh } from './p2pkh';
 import { p2sh } from './p2sh';
+import { p2tr } from './p2tr';
+import { p2tr_ns } from './p2tr_ns';
 import { p2wpkh } from './p2wpkh';
 import { p2wsh } from './p2wsh';
 export interface Payment {
@@ -22,15 +25,21 @@ export interface Payment {
     address?: string;
     hash?: Buffer;
     redeem?: Payment;
+    redeems?: Payment[];
+    redeemIndex?: number;
     witness?: Buffer[];
+    weight?: number;
+    controlBlock?: Buffer;
+    annex?: Buffer;
 }
 export declare type PaymentCreator = (a: Payment, opts?: PaymentOpts) => Payment;
 export declare type PaymentFunction = () => Payment;
 export interface PaymentOpts {
     validate?: boolean;
     allowIncomplete?: boolean;
+    eccLib?: TinySecp256k1Interface;
 }
 export declare type StackElement = Buffer | number;
 export declare type Stack = StackElement[];
 export declare type StackFunction = () => Stack;
-export { embed, p2ms, p2pk, p2pkh, p2sh, p2wpkh, p2wsh };
+export { embed, p2ms, p2pk, p2pkh, p2sh, p2tr, p2tr_ns, p2wpkh, p2wsh };

src/payments/index.d.ts

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.p2wsh = exports.p2wpkh = exports.p2sh = exports.p2pkh = exports.p2pk = exports.p2ms = exports.embed = void 0;
+exports.p2wsh = exports.p2wpkh = exports.p2tr_ns = exports.p2tr = exports.p2sh = exports.p2pkh = exports.p2pk = exports.p2ms = exports.embed = void 0;
 const embed_1 = require('./embed');
 Object.defineProperty(exports, 'embed', {
   enumerable: true,
@@ -36,6 +36,20 @@ Object.defineProperty(exports, 'p2sh', {
     return p2sh_1.p2sh;
   },
 });
+const p2tr_1 = require('./p2tr');
+Object.defineProperty(exports, 'p2tr', {
+  enumerable: true,
+  get: function() {
+    return p2tr_1.p2tr;
+  },
+});
+const p2tr_ns_1 = require('./p2tr_ns');
+Object.defineProperty(exports, 'p2tr_ns', {
+  enumerable: true,
+  get: function() {
+    return p2tr_ns_1.p2tr_ns;
+  },
+});
 const p2wpkh_1 = require('./p2wpkh');
 Object.defineProperty(exports, 'p2wpkh', {
   enumerable: true,

src/payments/index.js

@@ -0,0 +1,2 @@
+import { Payment, PaymentOpts } from './index';
+export declare function p2tr(a: Payment, opts?: PaymentOpts): Payment;