@xchainjs/xchain-doge 2.0.0 → 2.0.2

package/README.md

@@ -13,7 +13,7 @@ yarn add @xchainjs/xchain-doge
 Following peer dependencies have to be installed into your project. These are not included in `@xchainjs/xchain-doge`.
 
 ```
-yarn add @xchainjs/xchain-client @xchainjs/xchain-crypto @xchainjs/xchain-util axios bitcoinjs-lib coininfo wif
+yarn add @xchainjs/xchain-client @xchainjs/xchain-crypto @xchainjs/xchain-util axios bitcoinjs-lib wif
 ```
 
 ## Documentation

package/lib/index.esm.js

@@ -1,11 +1,13 @@
+import * as ecc from '@bitcoin-js/tiny-secp256k1-asmjs';
 import { ExplorerProvider, Network, FeeOption, checkFeeBounds } from '@xchainjs/xchain-client';
 import { getSeed } from '@xchainjs/xchain-crypto';
 import * as Dogecoin from 'bitcoinjs-lib';
-import { Client as Client$1 } from '@xchainjs/xchain-utxo';
+import { ECPairFactory } from 'ecpair';
+import { HDKey } from '@scure/bip32';
+import { toBitcoinJS, Client as Client$1 } from '@xchainjs/xchain-utxo';
 import accumulative from 'coinselect/accumulative';
 import { AssetType } from '@xchainjs/xchain-util';
 import { SochainProvider, SochainNetwork, BlockcypherProvider, BlockcypherNetwork, BitgoProvider } from '@xchainjs/xchain-utxo-providers';
-import coininfo from 'coininfo';
 import AppBtc from '@ledgerhq/hw-app-btc';
 
 /******************************************************************************
@@ -145,18 +147,11 @@ function inputBytes() {
 const dogeNetwork = (network) => {
     switch (network) {
         case Network.Mainnet:
-            return coininfo.dogecoin.main.toBitcoinJS();
+            return toBitcoinJS('dogecoin', 'main');
         case Network.Stagenet:
-            return coininfo.dogecoin.main.toBitcoinJS();
+            return toBitcoinJS('dogecoin', 'main');
         case Network.Testnet: {
-            // Latest coininfo on NPM doesn't contain dogetest config information
-            const bip32 = {
-                private: 0x04358394,
-                public: 0x043587cf,
-            };
-            const test = coininfo.dogecoin.test;
-            test.versions.bip32 = bip32;
-            return test.toBitcoinJS();
+            return toBitcoinJS('dogecoin', 'test');
         }
     }
 };
@@ -405,6 +400,7 @@ class Client extends Client$1 {
     }
 }
 
+const ECPair = ECPairFactory(ecc);
 /**
  * Custom Doge client extended to support keystore functionality
  */
@@ -453,11 +449,11 @@ class ClientKeystore extends Client {
     getDogeKeys(phrase, index = 0) {
         const dogeNetwork$1 = dogeNetwork(this.network);
         const seed = getSeed(phrase);
-        const master = Dogecoin.bip32.fromSeed(seed, dogeNetwork$1).derivePath(this.getFullDerivationPath(index));
+        const master = HDKey.fromMasterSeed(Uint8Array.from(seed), dogeNetwork$1.bip32).derive(this.getFullDerivationPath(index));
         if (!master.privateKey) {
             throw new Error('Could not get private key from phrase');
         }
-        return Dogecoin.ECPair.fromPrivateKey(master.privateKey, { network: dogeNetwork$1 });
+        return ECPair.fromPrivateKey(Buffer.from(master.privateKey), { network: dogeNetwork$1 });
     }
     /**
      * Get the current address.

package/lib/index.js

@@ -1,13 +1,15 @@
 'use strict';
 
+var ecc = require('@bitcoin-js/tiny-secp256k1-asmjs');
 var xchainClient = require('@xchainjs/xchain-client');
 var xchainCrypto = require('@xchainjs/xchain-crypto');
 var Dogecoin = require('bitcoinjs-lib');
+var ecpair = require('ecpair');
+var bip32 = require('@scure/bip32');
 var xchainUtxo = require('@xchainjs/xchain-utxo');
 var accumulative = require('coinselect/accumulative');
 var xchainUtil = require('@xchainjs/xchain-util');
 var xchainUtxoProviders = require('@xchainjs/xchain-utxo-providers');
-var coininfo = require('coininfo');
 var AppBtc = require('@ledgerhq/hw-app-btc');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -30,9 +32,9 @@ function _interopNamespace(e) {
     return Object.freeze(n);
 }
 
+var ecc__namespace = /*#__PURE__*/_interopNamespace(ecc);
 var Dogecoin__namespace = /*#__PURE__*/_interopNamespace(Dogecoin);
 var accumulative__default = /*#__PURE__*/_interopDefault(accumulative);
-var coininfo__default = /*#__PURE__*/_interopDefault(coininfo);
 var AppBtc__default = /*#__PURE__*/_interopDefault(AppBtc);
 
 /******************************************************************************
@@ -172,18 +174,11 @@ function inputBytes() {
 const dogeNetwork = (network) => {
     switch (network) {
         case xchainClient.Network.Mainnet:
-            return coininfo__default.default.dogecoin.main.toBitcoinJS();
+            return xchainUtxo.toBitcoinJS('dogecoin', 'main');
         case xchainClient.Network.Stagenet:
-            return coininfo__default.default.dogecoin.main.toBitcoinJS();
+            return xchainUtxo.toBitcoinJS('dogecoin', 'main');
         case xchainClient.Network.Testnet: {
-            // Latest coininfo on NPM doesn't contain dogetest config information
-            const bip32 = {
-                private: 0x04358394,
-                public: 0x043587cf,
-            };
-            const test = coininfo__default.default.dogecoin.test;
-            test.versions.bip32 = bip32;
-            return test.toBitcoinJS();
+            return xchainUtxo.toBitcoinJS('dogecoin', 'test');
         }
     }
 };
@@ -432,6 +427,7 @@ class Client extends xchainUtxo.Client {
     }
 }
 
+const ECPair = ecpair.ECPairFactory(ecc__namespace);
 /**
  * Custom Doge client extended to support keystore functionality
  */
@@ -480,11 +476,11 @@ class ClientKeystore extends Client {
     getDogeKeys(phrase, index = 0) {
         const dogeNetwork$1 = dogeNetwork(this.network);
         const seed = xchainCrypto.getSeed(phrase);
-        const master = Dogecoin__namespace.bip32.fromSeed(seed, dogeNetwork$1).derivePath(this.getFullDerivationPath(index));
+        const master = bip32.HDKey.fromMasterSeed(Uint8Array.from(seed), dogeNetwork$1.bip32).derive(this.getFullDerivationPath(index));
         if (!master.privateKey) {
             throw new Error('Could not get private key from phrase');
         }
-        return Dogecoin__namespace.ECPair.fromPrivateKey(master.privateKey, { network: dogeNetwork$1 });
+        return ECPair.fromPrivateKey(Buffer.from(master.privateKey), { network: dogeNetwork$1 });
     }
     /**
      * Get the current address.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-doge",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Custom Doge client and utilities used by XChain clients",
   "keywords": [
     "Xchain",
@@ -33,20 +33,23 @@
     "postversion": "git push --follow-tags"
   },
   "dependencies": {
-    "@ledgerhq/hw-app-btc": "10.1.0",
-    "@xchainjs/xchain-client": "2.0.0",
-    "@xchainjs/xchain-crypto": "1.0.0",
-    "@xchainjs/xchain-util": "2.0.0",
-    "@xchainjs/xchain-utxo": "2.0.0",
-    "@xchainjs/xchain-utxo-providers": "2.0.0",
-    "bitcoinjs-lib": "5.2.0",
-    "coininfo": "5.1.0",
-    "coinselect": "3.1.12"
+    "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
+    "@ledgerhq/hw-app-btc": "10.9.0",
+    "@scure/bip32": "^1.7.0",
+    "@xchainjs/xchain-client": "2.0.2",
+    "@xchainjs/xchain-crypto": "1.0.1",
+    "@xchainjs/xchain-util": "2.0.1",
+    "@xchainjs/xchain-utxo": "2.0.2",
+    "@xchainjs/xchain-utxo-providers": "2.0.2",
+    "bitcoinjs-lib": "^6.1.7",
+    "coinselect": "3.1.12",
+    "ecpair": "2.1.0"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "6.28.6",
+    "@types/bitcoinjs-lib": "^5.0.4",
     "axios": "1.8.4",
-    "axios-mock-adapter": "1.20.0"
+    "axios-mock-adapter": "2.1.0"
   },
   "publishConfig": {
     "access": "public",