@xchainjs/xchain-dash 2.0.0 → 2.0.2

package/lib/clientKeystore.d.ts

@@ -1,7 +1,7 @@
 import { FeeRate, TxHash } from '@xchainjs/xchain-client';
 import { Address } from '@xchainjs/xchain-util';
 import { TxParams } from '@xchainjs/xchain-utxo';
-import * as Dash from 'bitcoinjs-lib';
+import { ECPairInterface } from 'ecpair';
 import { Client } from './client';
 export declare class ClientKeystore extends Client {
     /**
@@ -27,7 +27,7 @@ export declare class ClientKeystore extends Client {
      * @returns {Dash.ECPairInterface} The DASH ECPairInterface object.
      * @throws {"Could not get private key from phrase"} Thrown if private key cannot be obtained from the phrase.
      */
-    getDashKeys(phrase: string, index?: number): Dash.ECPairInterface;
+    getDashKeys(phrase: string, index?: number): ECPairInterface;
     /**
      * Asynchronously transfers assets between addresses.
      * @param {TxParams & { feeRate?: FeeRate }} params - Parameters for the transfer.

package/lib/index.esm.js

@@ -2,11 +2,13 @@ import { ExplorerProvider, Network, TxType, FeeOption, checkFeeBounds } from '@x
 import { AssetType, baseAmount, assetToBase, assetAmount } from '@xchainjs/xchain-util';
 import { BlockcypherProvider, BlockcypherNetwork, BitgoProvider } from '@xchainjs/xchain-utxo-providers';
 import * as dashcore from '@dashevo/dashcore-lib';
-import { Client as Client$1 } from '@xchainjs/xchain-utxo';
+import { toBitcoinJS, Client as Client$1 } from '@xchainjs/xchain-utxo';
 import * as Dash from 'bitcoinjs-lib';
-import * as coininfo from 'coininfo';
 import accumulative from 'coinselect/accumulative';
+import * as ecc from '@bitcoin-js/tiny-secp256k1-asmjs';
 import { getSeed } from '@xchainjs/xchain-crypto';
+import { HDKey } from '@scure/bip32';
+import { ECPairFactory } from 'ecpair';
 import AppBtc from '@ledgerhq/hw-app-btc';
 
 /**
@@ -3908,9 +3910,9 @@ const dashNetwork = (network) => {
     switch (network) {
         case Network.Mainnet:
         case Network.Stagenet:
-            return coininfo.dash.main.toBitcoinJS(); // Convert Dash mainnet to BitcoinJS format
+            return toBitcoinJS('dash', 'main'); // Convert Dash mainnet to BitcoinJS format
         case Network.Testnet:
-            return coininfo.dash.test.toBitcoinJS(); // Convert Dash testnet to BitcoinJS format
+            return toBitcoinJS('dash', 'test'); // Convert Dash testnet to BitcoinJS format
     }
 };
 /**
@@ -4276,6 +4278,7 @@ const broadcastTx = (params) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 
+const ECPair = ECPairFactory(ecc);
 class ClientKeystore extends Client {
     /**
      * Get the DASH address corresponding to the given index.
@@ -4324,11 +4327,11 @@ class ClientKeystore extends Client {
     getDashKeys(phrase, index = 0) {
         const dashNetwork$1 = dashNetwork(this.network);
         const seed = getSeed(phrase);
-        const master = Dash.bip32.fromSeed(seed, dashNetwork$1).derivePath(this.getFullDerivationPath(index));
+        const master = HDKey.fromMasterSeed(Uint8Array.from(seed), dashNetwork$1.bip32).derive(this.getFullDerivationPath(index));
         if (!master.privateKey) {
             throw new Error('Could not get private key from phrase');
         }
-        return Dash.ECPair.fromPrivateKey(master.privateKey, { network: dashNetwork$1 });
+        return ECPair.fromPrivateKey(Buffer.from(master.privateKey), { network: dashNetwork$1 });
     }
     /**
      * Asynchronously transfers assets between addresses.

package/lib/index.js

@@ -6,9 +6,11 @@ var xchainUtxoProviders = require('@xchainjs/xchain-utxo-providers');
 var dashcore = require('@dashevo/dashcore-lib');
 var xchainUtxo = require('@xchainjs/xchain-utxo');
 var Dash = require('bitcoinjs-lib');
-var coininfo = require('coininfo');
 var accumulative = require('coinselect/accumulative');
+var ecc = require('@bitcoin-js/tiny-secp256k1-asmjs');
 var xchainCrypto = require('@xchainjs/xchain-crypto');
+var bip32 = require('@scure/bip32');
+var ecpair = require('ecpair');
 var AppBtc = require('@ledgerhq/hw-app-btc');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -33,8 +35,8 @@ function _interopNamespace(e) {
 
 var dashcore__namespace = /*#__PURE__*/_interopNamespace(dashcore);
 var Dash__namespace = /*#__PURE__*/_interopNamespace(Dash);
-var coininfo__namespace = /*#__PURE__*/_interopNamespace(coininfo);
 var accumulative__default = /*#__PURE__*/_interopDefault(accumulative);
+var ecc__namespace = /*#__PURE__*/_interopNamespace(ecc);
 var AppBtc__default = /*#__PURE__*/_interopDefault(AppBtc);
 
 /**
@@ -3936,9 +3938,9 @@ const dashNetwork = (network) => {
     switch (network) {
         case xchainClient.Network.Mainnet:
         case xchainClient.Network.Stagenet:
-            return coininfo__namespace.dash.main.toBitcoinJS(); // Convert Dash mainnet to BitcoinJS format
+            return xchainUtxo.toBitcoinJS('dash', 'main'); // Convert Dash mainnet to BitcoinJS format
         case xchainClient.Network.Testnet:
-            return coininfo__namespace.dash.test.toBitcoinJS(); // Convert Dash testnet to BitcoinJS format
+            return xchainUtxo.toBitcoinJS('dash', 'test'); // Convert Dash testnet to BitcoinJS format
     }
 };
 /**
@@ -4304,6 +4306,7 @@ const broadcastTx = (params) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 
+const ECPair = ecpair.ECPairFactory(ecc__namespace);
 class ClientKeystore extends Client {
     /**
      * Get the DASH address corresponding to the given index.
@@ -4352,11 +4355,11 @@ class ClientKeystore extends Client {
     getDashKeys(phrase, index = 0) {
         const dashNetwork$1 = dashNetwork(this.network);
         const seed = xchainCrypto.getSeed(phrase);
-        const master = Dash__namespace.bip32.fromSeed(seed, dashNetwork$1).derivePath(this.getFullDerivationPath(index));
+        const master = bip32.HDKey.fromMasterSeed(Uint8Array.from(seed), dashNetwork$1.bip32).derive(this.getFullDerivationPath(index));
         if (!master.privateKey) {
             throw new Error('Could not get private key from phrase');
         }
-        return Dash__namespace.ECPair.fromPrivateKey(master.privateKey, { network: dashNetwork$1 });
+        return ECPair.fromPrivateKey(Buffer.from(master.privateKey), { network: dashNetwork$1 });
     }
     /**
      * Asynchronously transfers assets between addresses.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-dash",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Custom Dash client and utilities used by XChainJS clients",
   "keywords": [
     "XChain",
@@ -33,22 +33,24 @@
     "postversion": "git push --follow-tags"
   },
   "dependencies": {
-    "@dashevo/dashcore-lib": "0.19.41",
-    "@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",
+    "@dashevo/dashcore-lib": "^0.25.0",
+    "@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.0",
+    "@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",