Use bitcore-lib and bitcore-lib-cash instead BWC

rastajpa · rastajpa · commit 0055b6b06dea · 2018-12-07T16:28:16.000-03:00
diff --git a/packages/insight-previous/package.json b/packages/insight-previous/package.json
@@ -64,7 +64,8 @@
     "@ionic/storage": "2.0.1",
     "angular2-moment": "^1.6.0",
     "angular2-qrcode": "^2.0.1",
-    "bitcore-wallet-client": "^6.7.5",
+    "bitcore-lib": "^0.16.0",
+    "bitcore-lib-cash": "^0.19.0",
     "cz-conventional-changelog": "^2.1.0",
     "ionic-angular": "3.4.2",
     "ionicons": "3.0.0",
@@ -105,4 +106,4 @@
   "engines": {
     "node": ">=8"
   }
-}
+}
diff --git a/packages/insight-previous/src/app/app.module.ts b/packages/insight-previous/src/app/app.module.ts
@@ -5,7 +5,6 @@ import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';
 import { BlocksPage, HomePage, PagesModule } from '../pages';
 import { ApiProvider } from '../providers/api/api';
 import { BlocksProvider } from '../providers/blocks/blocks';
-import { BwcProvider } from '../providers/bwc/bwc';
 import { CurrencyProvider } from '../providers/currency/currency';
 import { DefaultProvider } from '../providers/default/default';
 import { PriceProvider } from '../providers/price/price';
@@ -29,8 +28,7 @@ import { InsightApp } from './app.component';
     BlocksProvider,
     TxsProvider,
     DefaultProvider,
-    PriceProvider,
-    BwcProvider
+    PriceProvider
   ]
 })
 export class AppModule { }
diff --git a/packages/insight-previous/src/components/head-nav/head-nav.ts b/packages/insight-previous/src/components/head-nav/head-nav.ts
@@ -10,8 +10,8 @@ import { ApiProvider, ChainNetwork } from '../../providers/api/api';
 import { CurrencyProvider } from '../../providers/currency/currency';
 import { PriceProvider } from '../../providers/price/price';
 import { DenominationComponent } from '../denomination/denomination';
-import { BwcProvider } from '../../providers/bwc/bwc';
-
+import * as bitcoreLib from 'bitcore-lib';
+import * as bitcoreLibCash from 'bitcore-lib-cash';
 @Component({
   selector: 'head-nav',
   templateUrl: 'head-nav.html'
@@ -33,8 +33,7 @@ export class HeadNavComponent {
     public price: PriceProvider,
     public actionSheetCtrl: ActionSheetController,
     public popoverCtrl: PopoverController,
-    public toastCtrl: ToastController,
-    public bwcProvider: BwcProvider
+    public toastCtrl: ToastController
   ) { }
 
   public search(): void {
@@ -159,11 +158,11 @@ export class HeadNavComponent {
     const network = this.config.network;
     const addr = this.extractAddress(inputValue);
 
-    if (coin == 'btc' && network == 'mainnet') {
+    if (coin.toLowerCase() == 'btc' && network == 'mainnet') {
       return this.isValidBitcoinMainnetAddress(addr);
-    } else if (coin == 'btc' && network == 'testnet') {
+    } else if (coin.toLowerCase() == 'btc' && network == 'testnet') {
       return this.isValidBitcoinTestnetAddress(addr);
-    } else if (coin == 'bch' && network == 'mainnet') {
+    } else if (coin.toLowerCase() == 'bch' && network == 'mainnet') {
       return (
         this.isValidBitcoinCashMainnetAddress(addr) ||
         this.isValidBitcoinCashLegacyMainnetAddress(addr)
@@ -172,18 +171,18 @@ export class HeadNavComponent {
   }
 
   private isValidBitcoinMainnetAddress(data: string): boolean {
-    return !!this.bwcProvider.getBitcore().Address.isValid(data, 'mainnet');
+    return !!bitcoreLib.Address.isValid(data, 'mainnet');
   }
   private isValidBitcoinTestnetAddress(data: string): boolean {
-    return !!this.bwcProvider.getBitcore().Address.isValid(data, 'testnet');
+    return !!bitcoreLib.Address.isValid(data, 'testnet');
   }
 
   private isValidBitcoinCashLegacyMainnetAddress(data: string): boolean {
-    return !!this.bwcProvider.getBitcore().Address.isValid(data, 'mainnet');
+    return !!bitcoreLib.Address.isValid(data, 'mainnet');
   }
 
   private isValidBitcoinCashMainnetAddress(data: string): boolean {
-    return !!this.bwcProvider.getBitcoreCash().Address.isValid(data, 'mainnet');
+    return !!bitcoreLibCash.Address.isValid(data, 'mainnet');
   }
 
   private isValidBlockIndex(inputValue): boolean {
diff --git a/packages/insight-previous/src/providers/bwc/bwc.ts b/packages/insight-previous/src/providers/bwc/bwc.ts
