edge-currency-plugins 2.0.4 → 2.1.0

package/lib/common/plugin/types.js

@@ -1,4 +1,5 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }
+
 var _cleaners = require('cleaners');
 
 
@@ -17,6 +18,7 @@ var _cleaners = require('cleaners');
 
 
 
+
  const asCurrencyFormat = _cleaners.asValue.call(void 0, 'bip32', 'bip44', 'bip49', 'bip84'); exports.asCurrencyFormat = asCurrencyFormat
 
 // Path up to changeIndex
@@ -133,7 +135,6 @@ var _cleaners = require('cleaners');
 
 
 
-
 
 
  const asFeeRates = _cleaners.asObject.call(void 0, {

package/lib/common/utxobased/info/bitcoincash.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }var _altcoinjs = require('altcoin-js'); var bitcoin = _interopRequireWildcard(_altcoinjs);
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _altcoinjs = require('altcoin-js');
 var _cleaners = require('cleaners');
 
 
@@ -76,7 +76,7 @@ const engineInfo = {
  const coinInfo = {
   name: 'bitcoincash',
   segwit: false,
-  sighash: bitcoin.Psbt.BCH_SIGHASH_ALL,
+  sighash: _altcoinjs.Psbt.BCH_SIGHASH_ALL,
   coinType: 145,
 
   prefixes: {

package/lib/common/utxobased/info/bitcoincashtestnet.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }var _altcoinjs = require('altcoin-js'); var bitcoin = _interopRequireWildcard(_altcoinjs);
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _altcoinjs = require('altcoin-js');
 
 
 var _constants = require('../../constants');
@@ -55,7 +55,7 @@ const engineInfo = {
  const coinInfo = {
   name: 'bitcoincashtestnet',
   segwit: false,
-  sighash: bitcoin.Psbt.BCH_SIGHASH_ALL,
+  sighash: _altcoinjs.Psbt.BCH_SIGHASH_ALL,
   coinType: 1,
 
   prefixes: {

package/lib/common/utxobased/info/bitcoinsv.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }var _altcoinjs = require('altcoin-js'); var bitcoin = _interopRequireWildcard(_altcoinjs);
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _altcoinjs = require('altcoin-js');
 var _cleaners = require('cleaners');
 
 
@@ -94,7 +94,7 @@ const engineInfo = {
  const coinInfo = {
   name: 'bitcoinsv',
   segwit: false,
-  sighash: bitcoin.Psbt.BCH_SIGHASH_ALL,
+  sighash: _altcoinjs.Psbt.BCH_SIGHASH_ALL,
   coinType: 236,
 
   prefixes: {

package/lib/common/utxobased/keymanager/bitcoincashUtils/base32.js

@@ -1,5 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});// @flow
-/***
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});/***
  * https://github.com/bitcoincashjs/cashaddr
  * Copyright (c) 2018 Matias Alejo Garcia
  * Copyright (c) 2017 Emilio Almansi

package/lib/common/utxobased/keymanager/bitcoincashUtils/cashAddress.js

@@ -1,7 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }// @flow
-
-// import bcoin from 'bcoin'
-var _buffer = require('buffer');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _buffer = require('buffer');
 
 var _base32 = require('./base32');
 var _bn = require('./bn'); var _bn2 = _interopRequireDefault(_bn);

package/lib/common/utxobased/keymanager/declarations/bs58smartcheck.d.js

@@ -1 +1,5 @@
 "use strict";
+
+
+
+

package/lib/common/utxobased/keymanager/declarations/wif-smart.d.js

@@ -1 +1,25 @@
 "use strict";
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

package/lib/common/utxobased/keymanager/keymanager.js

@@ -1,9 +1,18 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/* eslint-disable camelcase */
-var _altcoinjs = require('altcoin-js'); var bitcoin = _interopRequireWildcard(_altcoinjs);
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+
+
+
+
+
+
+
+
+var _altcoinjs = require('altcoin-js');
 var _biggystring = require('biggystring');
 var _bip32 = require('bip32'); var bip32 = _interopRequireWildcard(_bip32);
 var _bip39 = require('bip39'); var bip39 = _interopRequireWildcard(_bip39);
 var _bitcoinjsmessage = require('bitcoinjs-message'); var _bitcoinjsmessage2 = _interopRequireDefault(_bitcoinjsmessage);
+var _ecpair = require('ecpair');
 var _types = require('edge-core-js/types');
 
 var _indexAtProtected = require('../../../util/indexAtProtected');
@@ -21,6 +30,20 @@ var _cashAddress = require('./bitcoincashUtils/cashAddress');
 var _coinmapper = require('./coinmapper');
 var _utxopicker = require('./utxopicker'); var utxopicker = _interopRequireWildcard(_utxopicker);
 
+let ECPair
+
+Promise.resolve().then(() => require('@bitcoin-js/tiny-secp256k1-asmjs'))
+  .then(tinysecp => {
+    _altcoinjs.initEccLib.call(void 0, tinysecp)
+    ECPair = _ecpair.ECPairFactory.call(void 0, tinysecp)
+  })
+  .catch(error => {
+    console.error(error)
+  })
+  .finally(() => {
+    console.log('loaded ECPair!')
+  })
+
 // in bitcoin these are bip44, bip49, bip84 xpub prefixes
 // other coins contain different formats which still need to be gathered.
 var BIP43PurposeTypeEnum; (function (BIP43PurposeTypeEnum) {
@@ -37,6 +60,7 @@ var AddressTypeEnum; (function (AddressTypeEnum) {
   const p2sh = 'p2sh'; AddressTypeEnum["p2sh"] = p2sh;
   const p2wpkh = 'p2wpkh'; AddressTypeEnum["p2wpkh"] = p2wpkh; // short bech32 address
   const p2wsh = 'p2wsh'; AddressTypeEnum["p2wsh"] = p2wsh; // long bech32 address
+  const p2tr = 'p2tr'; AddressTypeEnum["p2tr"] = p2tr; // bech32m address
 })(AddressTypeEnum || (exports.AddressTypeEnum = AddressTypeEnum = {}));
 
 var ScriptTypeEnum; (function (ScriptTypeEnum) {
@@ -46,6 +70,7 @@ var ScriptTypeEnum; (function (ScriptTypeEnum) {
   const p2pk = 'p2pk'; ScriptTypeEnum["p2pk"] = p2pk;
   const p2pkh = 'p2pkh'; ScriptTypeEnum["p2pkh"] = p2pkh;
   const p2sh = 'p2sh'; ScriptTypeEnum["p2sh"] = p2sh;
+  const p2tr = 'p2tr'; ScriptTypeEnum["p2tr"] = p2tr;
   const replayProtection = 'replayprotection'; ScriptTypeEnum["replayProtection"] = replayProtection;
   const replayProtectionP2SH = 'replayprotectionp2sh'; ScriptTypeEnum["replayProtectionP2SH"] = replayProtectionP2SH;
 })(ScriptTypeEnum || (exports.ScriptTypeEnum = ScriptTypeEnum = {}));
@@ -224,15 +249,6 @@ var VerifyAddressEnum; (function (VerifyAddressEnum) {
 
 
 
-
-
-
-
-
-
-
-
-
 
 
 
@@ -392,7 +408,7 @@ const xprivToXPubInternal = (
   // currently returns the derivation for an empty script template for a bitcoin cash
   // replay protection script (without key material)
   let hash = '0000'
-  hash = bitcoin.crypto
+  hash = _altcoinjs.crypto
     .hash160(Buffer.from(scriptTemplate(''), 'hex'))
     .slice(0, 4)
     .toString('hex')
@@ -482,7 +498,7 @@ const addressToScriptPubkeyInternal = (
           return scriptPubkey
         }
       }
-      payment = bitcoin.payments.p2pkh
+      payment = _altcoinjs.payments.p2pkh
       break
     case AddressTypeEnum.p2sh:
       if (selectedPrefixes.cashaddr != null) {
@@ -501,13 +517,16 @@ const addressToScriptPubkeyInternal = (
           return scriptPubkey
         }
       }
-      payment = bitcoin.payments.p2sh
+      payment = _altcoinjs.payments.p2sh
       break
     case AddressTypeEnum.p2wpkh:
-      payment = bitcoin.payments.p2wpkh
+      payment = _altcoinjs.payments.p2wpkh
       break
     case AddressTypeEnum.p2wsh:
-      payment = bitcoin.payments.p2wsh
+      payment = _altcoinjs.payments.p2wsh
+      break
+    case AddressTypeEnum.p2tr:
+      payment = _altcoinjs.payments.p2tr
       break
     default:
       throw new Error('invalid address type in address to script pubkey')
@@ -516,7 +535,7 @@ const addressToScriptPubkeyInternal = (
   try {
     scriptPubkey = payment({
       address: args.address,
-      network: network,
+      network,
       bs58DecodeFunc: coin.bs58DecodeFunc,
       bs58EncodeFunc: coin.bs58EncodeFunc
     }).output
@@ -593,7 +612,7 @@ const addressToScriptPubkeyInternal = (
           legacyPrefixes.cashaddr
         )
       }
-      payment = bitcoin.payments.p2pkh
+      payment = _altcoinjs.payments.p2pkh
       break
     case AddressTypeEnum.p2sh:
       if (standardPrefixes.cashaddr != null) {
@@ -618,13 +637,16 @@ const addressToScriptPubkeyInternal = (
           legacyPrefixes.cashaddr
         )
       }
-      payment = bitcoin.payments.p2sh
+      payment = _altcoinjs.payments.p2sh
       break
     case AddressTypeEnum.p2wpkh:
-      payment = bitcoin.payments.p2wpkh
+      payment = _altcoinjs.payments.p2wpkh
       break
     case AddressTypeEnum.p2wsh:
-      payment = bitcoin.payments.p2wsh
+      payment = _altcoinjs.payments.p2wsh
+      break
+    case AddressTypeEnum.p2tr:
+      payment = _altcoinjs.payments.p2tr
       break
     default:
       throw new Error('invalid address type in address to script pubkey')
@@ -634,7 +656,7 @@ const addressToScriptPubkeyInternal = (
       _nullishCoalesce(address, () => (
       payment({
         output: Buffer.from(args.scriptPubkey, 'hex'),
-        network: network,
+        network,
         bs58DecodeFunc: coinClass.bs58DecodeFunc,
         bs58EncodeFunc: coinClass.bs58EncodeFunc
       }).address))
@@ -668,13 +690,16 @@ const addressToScriptPubkeyInternal = (
   let payment
   switch (args.scriptType) {
     case ScriptTypeEnum.p2pkh:
-      payment = bitcoin.payments.p2pkh
+      payment = _altcoinjs.payments.p2pkh
       break
     case ScriptTypeEnum.p2sh:
-      payment = bitcoin.payments.p2sh
+      payment = _altcoinjs.payments.p2sh
       break
     case ScriptTypeEnum.p2wpkh:
-      payment = bitcoin.payments.p2wpkh
+      payment = _altcoinjs.payments.p2wpkh
+      break
+    case ScriptTypeEnum.p2tr:
+      payment = _altcoinjs.payments.p2tr
       break
     default:
       throw new Error('invalid address type in address to script pubkey')
@@ -683,7 +708,7 @@ const addressToScriptPubkeyInternal = (
   try {
     scriptHash = payment({
       output: Buffer.from(args.scriptPubkey, 'hex'),
-      network: network
+      network
     }).hash
   } catch (error) {
     console.trace(error)
@@ -706,15 +731,15 @@ const addressToScriptPubkeyInternal = (
       prefixIndex: 0
     })
   }
-  const p2sh = bitcoin.payments.p2sh({
-    network: bip32Network,
+  const p2sh = _altcoinjs.payments.p2sh({
+    ...(bip32Network != null ? { network: bip32Network } : {}),
     redeem: {
       output: Buffer.from(scriptPubkey, 'hex')
     }
   })
-  const scriptPubkeyFromLib = _optionalChain([p2sh, 'access', _ => _.output, 'optionalAccess', _2 => _2.toString, 'call', _3 => _3('hex')])
-  const redeemScript = _optionalChain([p2sh, 'access', _4 => _4.redeem, 'optionalAccess', _5 => _5.output, 'optionalAccess', _6 => _6.toString, 'call', _7 => _7('hex')])
-  const scriptHash = _optionalChain([p2sh, 'access', _8 => _8.hash, 'optionalAccess', _9 => _9.toString, 'call', _10 => _10('hex')])
+  const scriptPubkeyFromLib = _optionalChain([p2sh, 'access', _2 => _2.output, 'optionalAccess', _3 => _3.toString, 'call', _4 => _4('hex')])
+  const redeemScript = _optionalChain([p2sh, 'access', _5 => _5.redeem, 'optionalAccess', _6 => _6.output, 'optionalAccess', _7 => _7.toString, 'call', _8 => _8('hex')])
+  const scriptHash = _optionalChain([p2sh, 'access', _9 => _9.hash, 'optionalAccess', _10 => _10.toString, 'call', _11 => _11('hex')])
 
   if (scriptPubkeyFromLib == null || redeemScript == null) {
     throw new Error('unable to convert script to p2sh')
@@ -748,29 +773,41 @@ const addressToScriptPubkeyInternal = (
 ) {
   let payment
   switch (args.scriptType) {
-    case ScriptTypeEnum.p2pkh:
-      payment = bitcoin.payments.p2pkh({
+    case ScriptTypeEnum.p2pkh: {
+      payment = _altcoinjs.payments.p2pkh({
         pubkey: Buffer.from(args.pubkey, 'hex')
       })
       if (payment.output == null) {
         throw new Error('failed converting pubkey to script pubkey')
       }
       return { scriptPubkey: payment.output.toString('hex') }
-    case ScriptTypeEnum.p2wpkhp2sh:
+    }
+    case ScriptTypeEnum.p2wpkhp2sh: {
       return scriptPubkeyToP2SH({
         scriptPubkey: pubkeyToScriptPubkey({
           pubkey: args.pubkey,
           scriptType: ScriptTypeEnum.p2wpkh
         }).scriptPubkey
       })
-    case ScriptTypeEnum.p2wpkh:
-      payment = bitcoin.payments.p2wpkh({
+    }
+    case ScriptTypeEnum.p2wpkh: {
+      payment = _altcoinjs.payments.p2wpkh({
         pubkey: Buffer.from(args.pubkey, 'hex')
       })
       if (payment.output == null) {
         throw new Error('failed converting pubkey to script pubkey')
       }
       return { scriptPubkey: payment.output.toString('hex') }
+    }
+    case ScriptTypeEnum.p2tr: {
+      payment = _altcoinjs.payments.p2tr({
+        pubkey: Buffer.from(args.pubkey, 'hex')
+      })
+      if (payment.output == null) {
+        throw new Error('failed converting pubkey to script pubkey')
+      }
+      return { scriptPubkey: payment.output.toString('hex') }
+    }
     case ScriptTypeEnum.replayProtection: {
       if (args.scriptTemplates == null)
         throw new Error('Missing replayProtection script template')
@@ -809,9 +846,9 @@ const xprivToPrivateKeyInternal = (
   const bip32FromBase58Func = _nullishCoalesce(coin.bip32FromBase58Func, () => ( bip32.fromBase58))
   const node = bip32FromBase58Func(args.xpriv, network)
   return _optionalChain([node
-, 'access', _11 => _11.derive, 'call', _12 => _12(args.bip44ChangeIndex)
-, 'access', _13 => _13.derive, 'call', _14 => _14(args.bip44AddressIndex)
-, 'access', _15 => _15.privateKey, 'optionalAccess', _16 => _16.toString, 'call', _17 => _17('hex')])
+, 'access', _12 => _12.derive, 'call', _13 => _13(args.bip44ChangeIndex)
+, 'access', _14 => _14.derive, 'call', _15 => _15(args.bip44AddressIndex)
+, 'access', _16 => _16.privateKey, 'optionalAccess', _17 => _17.toString, 'call', _18 => _18('hex')])
 }
 
  const xprivToPrivateKey = (args) => {
@@ -833,7 +870,7 @@ const xprivToPrivateKeyInternal = (
     prefixIndex: 0
   })
   const coinClass = _coinmapper.getCoinFromString.call(void 0, args.coin)
-  return bitcoin.ECPair.fromPrivateKey(Buffer.from(args.privateKey, 'hex'), {
+  return ECPair.fromPrivateKey(Buffer.from(args.privateKey, 'hex'), {
     network
   }).toWIF(coinClass.wifEncodeFunc)
 } exports.privateKeyToWIF = privateKeyToWIF;
@@ -848,11 +885,7 @@ const wifToPrivateKeyEncodingInternal = (
     forWIF: true,
     prefixIndex
   })
-  const ecPair = bitcoin.ECPair.fromWIF(
-    args.wifKey,
-    network,
-    coin.bs58DecodeFunc
-  )
+  const ecPair = ECPair.fromWIF(args.wifKey, network, coin.bs58DecodeFunc)
   if (ecPair.privateKey == null) return
   return {
     hex: ecPair.privateKey.toString('hex'),
@@ -877,13 +910,13 @@ const wifToPrivateKeyEncodingInternal = (
   privateKeyEncoding
 ) {
   const { hex, compressed } = privateKeyEncoding
-  return bitcoin.ECPair.fromPrivateKey(Buffer.from(hex, 'hex'), {
+  return ECPair.fromPrivateKey(Buffer.from(hex, 'hex'), {
     compressed
   }).publicKey.toString('hex')
 } exports.privateKeyEncodingToPubkey = privateKeyEncodingToPubkey;
 
  function signMessageBase64(message, privateKey) {
-  const keyPair = bitcoin.ECPair.fromPrivateKey(Buffer.from(privateKey, 'hex'))
+  const keyPair = ECPair.fromPrivateKey(Buffer.from(privateKey, 'hex'))
   if (keyPair.privateKey == null) {
     throw new Error('Address could not sign message')
   }
@@ -900,7 +933,7 @@ const wifToPrivateKeyEncodingInternal = (
   }
 
   // get coin specific replay protection sighhash bits
-  let sighashType = bitcoin.Transaction.SIGHASH_ALL
+  let sighashType = _altcoinjs.Transaction.SIGHASH_ALL
   const coin = _coinmapper.getCoinFromString.call(void 0, args.coin)
   if (coin.sighash != null) {
     sighashType = coin.sighash
@@ -991,8 +1024,8 @@ const wifToPrivateKeyEncodingInternal = (
       if (!validatedMemo.passed) {
         throw new Error('Memo size exceeds 80 bytes')
       }
-      const script = bitcoin.script
-        .compile([bitcoin.opcodes.OP_RETURN, Buffer.from(target.memo, 'utf8')])
+      const script = _altcoinjs.script
+        .compile([_altcoinjs.opcodes.OP_RETURN, Buffer.from(target.memo, 'utf8')])
         .toString('hex')
       targets.push({
         script,
@@ -1035,12 +1068,12 @@ const wifToPrivateKeyEncodingInternal = (
     }
   })()
 
-  const psbt = new bitcoin.Psbt()
+  const psbt = new (0, _altcoinjs.Psbt)()
   try {
     psbt.addInputs(sortedInputs)
     psbt.addOutputs(sortedOutputs)
   } catch (error) {
-    _optionalChain([log, 'optionalAccess', _18 => _18.error, 'call', _19 => _19(`Failed makeTx: ${String(error)}`)])
+    _optionalChain([log, 'optionalAccess', _19 => _19.error, 'call', _20 => _20(`Failed makeTx: ${String(error)}`)])
     throw error
   }
 
@@ -1050,14 +1083,20 @@ const wifToPrivateKeyEncodingInternal = (
     changeUsed: result.changeUsed,
     fee: result.fee,
     psbtBase64: psbt.toBase64(),
-    hex: _optionalChain([psbt, 'access', _20 => _20.data, 'optionalAccess', _21 => _21.globalMap, 'optionalAccess', _22 => _22.unsignedTx, 'optionalAccess', _23 => _23.toBuffer, 'call', _24 => _24(), 'optionalAccess', _25 => _25.toString, 'call', _26 => _26('hex')])
+    hex: _optionalChain([psbt, 'access', _21 => _21.data, 'optionalAccess', _22 => _22.globalMap, 'optionalAccess', _23 => _23.unsignedTx, 'optionalAccess', _24 => _24.toBuffer, 'call', _25 => _25(), 'optionalAccess', _26 => _26.toString, 'call', _27 => _27('hex')])
   }
 } exports.makeTx = makeTx;
 
  async function signTx(args) {
-  const psbt = bitcoin.Psbt.fromBase64(args.psbtBase64)
+  const psbt = _altcoinjs.Psbt.fromBase64(args.psbtBase64)
   const coin = _coinmapper.getCoinFromString.call(void 0, args.coin)
 
+  const validator = (
+    pubkey,
+    msghash,
+    signature
+  ) => ECPair.fromPublicKey(pubkey).verify(msghash, signature)
+
   for (let i = 0; i < psbt.inputCount; i++) {
     const privateKeyEncoding =
       _nullishCoalesce(args.privateKeyEncodings[i], () => (
@@ -1065,11 +1104,11 @@ const wifToPrivateKeyEncodingInternal = (
     const { hex, compressed } = privateKeyEncoding
     psbt.signInput(
       i,
-      bitcoin.ECPair.fromPrivateKey(Buffer.from(hex, 'hex'), { compressed }),
-      bitcoin.Psbt.DEFAULT_SIGHASHES,
+      ECPair.fromPrivateKey(Buffer.from(hex, 'hex'), { compressed }),
+      _altcoinjs.Psbt.DEFAULT_SIGHASHES,
       coin.sighashFunction
     )
-    psbt.validateSignaturesOfInput(i)
+    psbt.validateSignaturesOfInput(i, validator)
     psbt.finalizeInput(i)
   }
   const tx = psbt.extractTransaction(true)
@@ -1225,31 +1264,38 @@ const guessAddressTypeFromAddress = (
   }
   const coinClass = _coinmapper.getCoinFromString.call(void 0, coin)
   try {
-    bitcoin.payments.p2pkh({
+    _altcoinjs.payments.p2pkh({
       address,
       network,
       bs58DecodeFunc: coinClass.bs58DecodeFunc,
       bs58EncodeFunc: coinClass.bs58EncodeFunc
     })
     return AddressTypeEnum.p2pkh
-  } catch (e) {}
+  } catch (_) {}
   try {
-    bitcoin.payments.p2sh({
+    _altcoinjs.payments.p2sh({
       address,
       network,
       bs58DecodeFunc: coinClass.bs58DecodeFunc,
       bs58EncodeFunc: coinClass.bs58EncodeFunc
     })
     return AddressTypeEnum.p2sh
-  } catch (e) {}
+  } catch (_) {}
   try {
-    bitcoin.payments.p2wsh({ address, network })
+    _altcoinjs.payments.p2wsh({ address, network })
     return AddressTypeEnum.p2wsh
-  } catch (e) {}
+  } catch (_) {}
   try {
-    bitcoin.payments.p2wpkh({ address, network })
+    _altcoinjs.payments.p2wpkh({ address, network })
     return AddressTypeEnum.p2wpkh
-  } catch (e) {}
+  } catch (_) {}
+  try {
+    _altcoinjs.payments.p2tr({
+      address,
+      network
+    })
+    return AddressTypeEnum.p2tr
+  } catch (_) {}
   const cashAddrPrefixes = getCashAddrPrefixes(coinClass)
   if (cashAddrPrefixes.length > 0) {
     try {
@@ -1295,13 +1341,16 @@ const scriptHashToScriptPubkey = (
   let payment
   switch (args.scriptType) {
     case ScriptTypeEnum.p2pkh:
-      payment = bitcoin.payments.p2pkh
+      payment = _altcoinjs.payments.p2pkh
       break
     case ScriptTypeEnum.p2sh:
-      payment = bitcoin.payments.p2sh
+      payment = _altcoinjs.payments.p2sh
       break
     case ScriptTypeEnum.p2wpkh:
-      payment = bitcoin.payments.p2wpkh
+      payment = _altcoinjs.payments.p2wpkh
+      break
+    case ScriptTypeEnum.p2tr:
+      payment = _altcoinjs.payments.p2tr
       break
     default:
       throw new Error('invalid address type in address to script pubkey')

package/lib/common/utxobased/keymanager/utxopicker/utils.js

@@ -1,6 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});/* eslint-disable no-fallthrough */
-/* eslint-disable no-duplicate-case */
-var _keymanager = require('../keymanager');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _keymanager = require('../keymanager');
 
 
 /*

package/lib/src/common/plugin/types.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="node" />
-import { bip32 } from 'altcoin-js';
+import { BaseConverter } from 'base-x';
+import * as bip32 from 'bip32';
 import { Cleaner } from 'cleaners';
 import { Disklet } from 'disklet';
 import { EdgeCurrencyEngineOptions, EdgeCurrencyInfo, EdgeCurrencyTools, EdgeIo, EdgeParsedUri, EdgeWalletInfo } from 'edge-core-js/types';
+import * as wif from 'wif';
 import { IProcessorTransaction, IUTXO } from '../utxobased/db/types';
 import { ScriptTemplates } from '../utxobased/info/scriptTemplates/types';
 import { UtxoPicker } from '../utxobased/keymanager/utxopicker';
@@ -53,9 +55,9 @@ export interface CoinInfo {
     sighash?: number;
     sighashFunction?: (Hash: Buffer) => Buffer;
     txHashFunction?: (Hash: Buffer) => Buffer;
-    bs58DecodeFunc?: (payload: string | undefined) => Buffer;
-    bs58EncodeFunc?: (payload: any) => string;
-    wifEncodeFunc?: (prefix: unknown, key: unknown, compressed: unknown) => string;
+    bs58DecodeFunc?: BaseConverter['decode'];
+    bs58EncodeFunc?: BaseConverter['encode'];
+    wifEncodeFunc?: typeof wif.encode;
     bip32FromBase58Func?: (xKey: string, network: BitcoinJSNetwork) => bip32.BIP32Interface;
     bip32FromSeedFunc?: (seed: Buffer) => bip32.BIP32Interface;
     utxoPicker?: UtxoPicker;

package/lib/src/common/utxobased/keymanager/keymanager.d.ts

@@ -14,7 +14,8 @@ export declare enum AddressTypeEnum {
     p2pkh = "p2pkh",
     p2sh = "p2sh",
     p2wpkh = "p2wpkh",
-    p2wsh = "p2wsh"
+    p2wsh = "p2wsh",
+    p2tr = "p2tr"
 }
 export declare enum ScriptTypeEnum {
     p2wpkh = "p2wpkh",
@@ -23,6 +24,7 @@ export declare enum ScriptTypeEnum {
     p2pk = "p2pk",
     p2pkh = "p2pkh",
     p2sh = "p2sh",
+    p2tr = "p2tr",
     replayProtection = "replayprotection",
     replayProtectionP2SH = "replayprotectionp2sh"
 }
@@ -159,14 +161,6 @@ interface SignTxReturn {
     id: string;
     hex: string;
 }
-export interface BitcoinJSNetwork {
-    wif: number;
-    bip32: Bip32;
-    messagePrefix: string;
-    bech32: string;
-    pubKeyHash: number;
-    scriptHash: number;
-}
 export interface Bip32 {
     public: number;
     private: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",
   "license": "MIT",
@@ -33,7 +33,8 @@
     "*.{js,ts,json}": "eslint"
   },
   "dependencies": {
-    "altcoin-js": "https://github.com/EdgeApp/altcoin-js.git#master",
+    "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
+    "altcoin-js": "^1.0.0",
     "async-mutex": "^0.2.6",
     "baselet": "^0.2.4",
     "biggystring": "^4.0.0",
@@ -48,6 +49,7 @@
     "bs58smartcheck": "^2.0.4",
     "cleaners": "^0.3.12",
     "disklet": "^0.4.5",
+    "ecpair": "https://github.com/EdgeApp/ecpair.git#b193eb8ea2ec0c93b528f4b0223a605407ff43e4",
     "edge-sync-client": "^0.2.7",
     "memlet": "^0.1.7",
     "uri-js": "^4.4.0",
@@ -57,8 +59,10 @@
     "ws": "^7.4.6"
   },
   "devDependencies": {
+    "@types/base-x": "^3.0.6",
     "@types/bn.js": "^5.1.0",
     "@types/bs58": "^4.0.1",
+    "@types/bs58grscheck": "^2.1.0",
     "@types/chai": "^4.2.9",
     "@types/chai-as-promised": "^7.1.3",
     "@types/jsonfile": "^6.0.1",
@@ -67,9 +71,12 @@
     "@types/node-fetch": "2.x",
     "@types/request": "^2.48.7",
     "@types/url-parse": "^1.4.3",
+    "@types/wif": "^2.0.2",
+    "@types/wifgrs": "^2.0.0",
     "@types/ws": "^7.2.6",
     "@typescript-eslint/eslint-plugin": "^4.8.2",
     "@typescript-eslint/parser": "^4.8.2",
+    "base-x": "^4.0.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "edge-core-js": "^0.19.48",
@@ -97,6 +104,7 @@
     "request": "^2.88.2",
     "rimraf": "^3.0.2",
     "sucrase": "^3.12.1",
-    "typescript": "^4.1.2"
+    "typescript": "^4.1.2",
+    "wif": "^2.0.6"
   }
 }

package/lib/common/utxobased/keymanager/declarations/base58grscheck.d.js

@@ -1 +0,0 @@
-"use strict";

package/lib/common/utxobased/keymanager/declarations/wifgrs.d.js

@@ -1 +0,0 @@
-"use strict";