Merge branch 'master' of github.com:bitpay/bitcore into feature/env-bitcore-node-http-port

micahriggan · micahriggan · commit 1fd7f132c442 · 2019-04-02T12:47:11.000-04:00
diff --git a/packages/bitcore-wallet-service/package.json b/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'"
   },
diff --git a/packages/bitcore-wallet-service/src/deprecated-serverMessages.ts b/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',
     };
   }
-}
+};
diff --git a/packages/bitcore-wallet-service/src/lib/pushnotificationsservice.ts b/packages/bitcore-wallet-service/src/lib/pushnotificationsservice.ts
@@ -4,12 +4,12 @@ import * as async from 'async';
 import * as fs from 'fs';
 import * as _ from 'lodash';
 import request from 'request';
+import { MessageBroker } from './messagebroker';
 import { INotification } from './model/notification';
 import { IPreferences } from './model/preferences';
 import { Storage } from './storage';
 var Mustache = require('mustache');
 var defaultRequest = require('request');
-var MessageBroker = require('./messagebroker');
 var path = require('path');
 var Utils = require('./common/utils');
 var Defaults = require('./common/defaults');
diff --git a/packages/bitcore-wallet-service/src/lib/server.ts b/packages/bitcore-wallet-service/src/lib/server.ts
@@ -15,6 +15,7 @@ import { IWallet, Wallet } from './model/wallet';
 import { Storage } from './storage';
 
 const $ = require('preconditions').singleton();
+var deprecatedServerMessage = require('../deprecated-serverMessages');
 var serverMessages = require('../serverMessages');
 var BCHAddressTranslator = require('./bchaddresstranslator');
 
@@ -215,7 +216,7 @@ export class WalletService {
   }
 
   static handleIncomingNotifications(notification, cb) {
-    cb = cb || function() {};
+    cb = cb || function() { };
 
     // do nothing here....
     // bc height cache is cleared on bcmonitor
@@ -695,6 +696,8 @@ export class WalletService {
             }
             status.wallet = wallet;
 
+            status.serverMessage = deprecatedServerMessage(wallet, self.appName, self.appVersion);
+
             status.serverMessage = serverMessages(
               wallet,
               self.appName,
@@ -798,7 +801,7 @@ export class WalletService {
 
     // self.logi('Notification', type);
 
-    cb = cb || function() {};
+    cb = cb || function() { };
 
     var walletId = self.walletId || data.walletId;
     var copayerId = self.copayerId || data.copayerId;
@@ -1791,7 +1794,7 @@ export class WalletService {
           return cb(
             new ClientError(
               'Invalid fee level. Valid values are ' +
-                _.map(feeLevels, 'name').join(', ')
+              _.map(feeLevels, 'name').join(', ')
             )
           );
       }
@@ -1915,10 +1918,10 @@ export class WalletService {
         var logger = network == 'livenet' ? self.logw : self.logi;
         logger(
           'Could not compute fee estimation in ' +
-            network +
-            ': ' +
-            failed.join(', ') +
-            ' blocks.'
+          network +
+          ': ' +
+          failed.join(', ') +
+          ' blocks.'
         );
       }
 
@@ -2142,20 +2145,20 @@ export class WalletService {
       if (totalValueInUtxos < txpAmount) {
         self.logi(
           'Total value in all utxos (' +
-            Utils.formatAmountInBtc(totalValueInUtxos) +
-            ') is insufficient to cover for txp amount (' +
-            Utils.formatAmountInBtc(txpAmount) +
-            ')'
+          Utils.formatAmountInBtc(totalValueInUtxos) +
+          ') is insufficient to cover for txp amount (' +
+          Utils.formatAmountInBtc(txpAmount) +
+          ')'
         );
         return cb(Errors.INSUFFICIENT_FUNDS);
       }
       if (netValueInUtxos < txpAmount) {
         self.logi(
           'Value after fees in all utxos (' +
-            Utils.formatAmountInBtc(netValueInUtxos) +
-            ') is insufficient to cover for txp amount (' +
-            Utils.formatAmountInBtc(txpAmount) +
-            ')'
+          Utils.formatAmountInBtc(netValueInUtxos) +
+          ') is insufficient to cover for txp amount (' +
+          Utils.formatAmountInBtc(txpAmount) +
+          ')'
         );
         return cb(Errors.INSUFFICIENT_FUNDS_FOR_FEE);
       }
@@ -2373,9 +2376,9 @@ export class WalletService {
               txp.fee;
             self.logi(
               'Successfully built transaction. Total fees: ' +
-                Utils.formatAmountInBtc(txp.fee) +
-                ', total change: ' +
-                Utils.formatAmountInBtc(change)
+              Utils.formatAmountInBtc(txp.fee) +
+              ', total change: ' +
+              Utils.formatAmountInBtc(change)
             );
           } else {
             self.logw('Error building transaction', err);
@@ -2514,7 +2517,7 @@ export class WalletService {
               return next(
                 new ClientError(
                   'Invalid fee level. Valid values are ' +
-                    _.map(feeLevels, 'name').join(', ')
+                  _.map(feeLevels, 'name').join(', ')
                 )
               );
           }
