Clean code and type fixes for remaining files

README.md

@@ -114,7 +114,7 @@ server=1
 irc=1
 upnp=1
 
-# Make sure port & rpcport matches the 
+# Make sure port & rpcport matches the
 # bitcore.config.json ports for BTC mainnet
 
 # if using Bitcoin Core v0.17+ prefix
@@ -150,29 +150,29 @@ npm run node
 
 ## Applications
 
-- [Bitcore Node](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-node) - A full node with extended capabilities using Bitcoin Core
-- [Bitcore Wallet](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-wallet) - A command-line based wallet client
-- [Bitcore Wallet Client](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-wallet-client) - A client for the wallet service
-- [Bitcore Wallet Service](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-wallet-service) - A multisig HD service for wallets
+- [Bitcore Node](packages/bitcore-node) - A full node with extended capabilities using Bitcoin Core
+- [Bitcore Wallet](packages/bitcore-wallet) - A command-line based wallet client
+- [Bitcore Wallet Client](packages/bitcore-wallet-client) - A client for the wallet service
+- [Bitcore Wallet Service](packages/bitcore-wallet-service) - A multisig HD service for wallets
 - [Bitpay Wallet](https://github.com/bitpay/copay) - An easy-to-use, multiplatform, multisignature, secure bitcoin wallet
-- [Insight](https://github.com/bitpay/bitcore/tree/master/packages/insight-previous) - A blockchain explorer web user interface
+- [Insight](packages/insight-previous) - A blockchain explorer web user interface
 
 ## Libraries
 
 - [Bitcore Channel](https://github.com/bitpay/bitcore-channel) - Micropayment channels for rapidly adjusting bitcoin transactions
 - [Bitcore ECIES](https://github.com/bitpay/bitcore-ecies) - Uses ECIES symmetric key negotiation from public keys to encrypt arbitrarily long data streams
-- [Bitcore Lib](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-lib) - A pure and powerful JavaScript Bitcoin library
-- [Bitcore Lib Cash](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-lib-cash) - A pure and powerful JavaScript Bitcoin Cash library
+- [Bitcore Lib](packages/bitcore-lib) - A pure and powerful JavaScript Bitcoin library
+- [Bitcore Lib Cash](packages/bitcore-lib-cash) - A pure and powerful JavaScript Bitcoin Cash library
 - [Bitcore Message](https://github.com/bitpay/bitcore-message) - Bitcoin message verification and signing
-- [Bitcore Mnemonic](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-mnemonic) - Implements mnemonic code for generating deterministic keys
-- [Bitcore P2P](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-p2p) - The peer-to-peer networking protocol for BTC
-- [Bitcore P2P Cash](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-p2p-cash) - The peer-to-peer networking protocol for BCH
-- [Crypto Wallet Core](https://github.com/bitpay/bitcore/tree/master/packages/crypto-wallet-core) - A coin-agnostic wallet library for creating transactions, signing, and address derivation
+- [Bitcore Mnemonic](packages/bitcore-mnemonic) - Implements mnemonic code for generating deterministic keys
+- [Bitcore P2P](packages/bitcore-p2p) - The peer-to-peer networking protocol for BTC
+- [Bitcore P2P Cash](packages/bitcore-p2p-cash) - The peer-to-peer networking protocol for BCH
+- [Crypto Wallet Core](packages/crypto-wallet-core) - A coin-agnostic wallet library for creating transactions, signing, and address derivation
 
 ## Extras
 
-- [Bitcore Build](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-build) - A helper to add tasks to gulp
-- [Bitcore Client](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-client) - A helper to create a wallet using the bitcore-v8 infrastructure
+- [Bitcore Build](packages/bitcore-build) - A helper to add tasks to gulp
+- [Bitcore Client](packages/bitcore-client) - A helper to create a wallet using the bitcore-v8 infrastructure
 
 ## Contributing
 
@@ -182,4 +182,4 @@ See [CONTRIBUTING.md](https://github.com/bitpay/bitcore/blob/master/Contributing
 
 Code released under [the MIT license](https://github.com/bitpay/bitcore/blob/master/LICENSE).
 
-Copyright 2013-2019 BitPay, Inc. Bitcore is a trademark maintained by BitPay, Inc.
+Copyright 2013-2019 BitPay, Inc. Bitcore is a trademark maintained by BitPay, Inc.

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

packages/bitcore-node/src/services/api.ts

@@ -24,7 +24,7 @@ export class ApiService {
     storageService = Storage,
     socketService = Socket
   } = {}) {
-    this.port = port;
+    this.port = Number(process.env.BITCORE_NODE_HTTP_PORT) || port;
     this.timeout = timeout;
     this.configService = configService;
     this.storageService = storageService;

packages/bitcore-wallet-service/README.md

@@ -102,24 +102,9 @@ The are plenty example creating and sending proposals in the `/test/integration`
 
 **bitcore.config.json**
 
-1.  Add testnet and regtest to bitcore.config.json. Testnet config must match regtest settings.
+1.  Add regtest to bitcore.config.json.
 
 ```
-"testnet": {
-          "chainSource": "p2p",
-          "trustedPeers": [
-            {
-              "host": "127.0.0.1",
-              "port": 20020
-            }
-          ],
-          "rpc": {
-            "host": "127.0.0.1",
-            "port": 20021,
-            "username": "bitpaytest",
-            "password": "local321"
-          }
-        },
 "regtest": {
           "chainSource": "p2p",
           "trustedPeers": [

packages/bitcore-wallet-service/package.json

@@ -70,7 +70,6 @@
     "mocha": "^5.2.0",
     "mocha-lcov-reporter": "^1.3.0",
     "proxyquire": "^1.7.2",
-    "rimraf": "^2.6.3",
     "sinon": "^7.1.1",
     "supertest": "*",
     "ts-node": "^8.0.3",
@@ -88,7 +87,7 @@
     "compile": "npm run tsc",
     "tsc": "npm run clean &&./node_modules/.bin/tsc",
     "build": "tsc && npm run lint",
-    "clean": "rimraf ./ts_build",
+    "clean": "rm -rf ./ts_build",
     "lint": "tslint -c tslint.json 'src/**/*.ts'",
     "lint-fix": "tslint --fix -c tslint.json 'src/**/*.ts'"
   },

packages/bitcore-wallet-service/src/app.ts

@@ -16,7 +16,7 @@ var scripts = [
 async.eachSeries(scripts, function(script, callback) {
   console.log(`Spawning ${script}`);
 
-  var node = spawn('node', [script]);
+  const node = spawn('node', [script]);
   node.stdout.on('data', data => {
     console.log(`${data}`);
   });

packages/bitcore-wallet-service/src/bcmonitor/bcmonitor.ts

@@ -1,16 +1,13 @@
 #!/usr/bin/env node
-
-'use strict';
-
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { BlockchainMonitor } from '../lib/blockchainmonitor';
-var log = require('npmlog');
-log.debug = log.verbose;
 
-var config = require('../config');
+const config = require('../config');
+const log = require('npmlog');
+log.debug = log.verbose;
 
-var bcm = new BlockchainMonitor();
-bcm.start(config, function(err) {
+const bcm = new BlockchainMonitor();
+bcm.start(config, (err) => {
   if (err) throw err;
 
   console.log('Blockchain monitor started');

packages/bitcore-wallet-service/src/bws.ts

@@ -1,25 +1,17 @@
 #!/usr/bin/env node
-
-import * as async from 'async';
 import * as fs from 'fs';
 import { ExpressApp } from './lib/expressapp';
 
-var config = require('./config');
-var log = require('npmlog');
+const config = require('./config');
+const log = require('npmlog');
 log.debug = log.verbose;
 log.disableColor();
-var Common = require('./lib/common');
-var Defaults = Common.Defaults;
-
-var port = process.env.BWS_PORT || config.port || 3232;
 
-var cluster = require('cluster');
-var http = require('http');
-var numCPUs = require('os').cpus().length;
-var clusterInstances = config.clusterInstances || numCPUs;
-var serverModule = config.https ? require('https') : require('http');
+const port = process.env.BWS_PORT || config.port || 3232;
+const cluster = require('cluster');
+const serverModule = config.https ? require('https') : require('http');
 
-var serverOpts: {
+const serverOpts: {
   key?: Buffer;
   cert?: Buffer;
   ciphers?: string[];
@@ -60,22 +52,22 @@ if (config.cluster && !config.messageBrokerOpts.messageBrokerServer)
     'When running in cluster mode, message broker server need to be configured'
   );
 
-var expressApp = new ExpressApp();
+const expressApp = new ExpressApp();
 
-function startInstance(cb?: () => void) {
-  var server = config.https
+function startInstance() {
+  const server = config.https
     ? serverModule.createServer(serverOpts, expressApp.app)
     : serverModule.Server(expressApp.app);
 
-  expressApp.start(config, function(err) {
+  expressApp.start(config, (err) => {
     if (err) {
       log.error('Could not start BWS instance', err);
       return;
     }
 
     server.listen(port);
 
-    var instanceInfo = cluster.worker
+    const instanceInfo = cluster.worker
       ? ' [Instance:' + cluster.worker.id + ']'
       : '';
     log.info('BWS running ' + instanceInfo);
@@ -85,17 +77,17 @@ function startInstance(cb?: () => void) {
 
 if (config.cluster && cluster.isMaster) {
   // Count the machine's CPUs
-  var instances = config.clusterInstances || require('os').cpus().length;
+  const instances = config.clusterInstances || require('os').cpus().length;
 
   log.info('Starting ' + instances + ' instances');
 
   // Create a worker for each CPU
-  for (var i = 0; i < instances; i += 1) {
+  for (let i = 0; i < instances; i += 1) {
     cluster.fork();
   }
 
   // Listen for dying workers
-  cluster.on('exit', function(worker) {
+  cluster.on('exit', (worker) => {
     // Replace the dead worker,
     log.error('Worker ' + worker.id + ' died :(');
     cluster.fork();

packages/bitcore-wallet-service/deprecated-serverMessages.js → packages/bitcore-wallet-service/src/deprecated-serverMessages.ts

@@ -1,7 +1,7 @@
-module.exports = function(wallet, appName, appVersion) {
+module.exports = (wallet, appName, appVersion) => {
   if (!appVersion || !appName) return;
 
-  if (wallet.network == 'livenet' && appVersion.major==5 && wallet.createdOn < 1443461026 ) {
+  if (wallet.network == 'livenet' && appVersion.major == 5 && wallet.createdOn < 1443461026) {
     return {
       title: 'Deprecated Test message',
       body: 'Only for bitpay, old wallets',
@@ -12,4 +12,4 @@ module.exports = function(wallet, appName, appVersion) {
       app: 'bitpay',
     };
   }
-}
+};

packages/bitcore-wallet-service/src/emailservice/emailservice.ts

@@ -1,16 +1,13 @@
 #!/usr/bin/env node
-
-'use strict';
-
+import _ from 'lodash';
 import { EmailService } from '../lib/emailservice';
-var _ = require('lodash');
-var log = require('npmlog');
-log.debug = log.verbose;
 
-var config = require('../config');
+const config = require('../config');
+const log = require('npmlog');
+log.debug = log.verbose;
 
-var emailService = new EmailService();
-emailService.start(config, function(err) {
+const emailService = new EmailService();
+emailService.start(config, (err) => {
   if (err) throw err;
 
   console.log('Email service started');

packages/bitcore-wallet-service/src/fiatrateservice/fiatrateservice.ts

@@ -1,14 +1,11 @@
 #!/usr/bin/env node
+const config = require('../config');
+const FiatRateService = require('../lib/fiatrateservice');
 
-'use strict';
-
-var config = require('../config');
-var FiatRateService = require('../lib/fiatrateservice');
-
-var service = new FiatRateService();
-service.init(config, function(err) {
+const service = new FiatRateService();
+service.init(config, (err) => {
   if (err) throw err;
-  service.startCron(config, function(err) {
+  service.startCron(config, (err) => {
     if (err) throw err;
 
     console.log('Fiat rate service started');