Upgrade dependencies January 2019 - Related to #2500

.eslintrc.json

@@ -16,13 +16,15 @@
 			}
 		],
 		"func-names": "off",
+		"implicit-arrow-linebreak": "off",
 		"max-len": "off",
 		"no-new": "off",
 		"no-param-reassign": "off",
 		"no-plusplus": "off",
 		"no-underscore-dangle": "off",
 		"no-unused-expressions": "off",
 		"no-use-before-define": "off",
+		"operator-linebreak": "off",
 		"prefer-destructuring": "off",
 		"radix": "off",
 		"require-jsdoc": [

helpers/ed.js

@@ -54,9 +54,9 @@ ed.makeKeypair = function(hash) {
  * @todo Add description for the params and the return value
  */
 ed.sign = function(hash, privateKey) {
-	if (!(hash instanceof Buffer))
+	if (!(hash instanceof Buffer)) {
 		throw new Error('argument message must be a buffer');
-
+	}
 	const signature = Buffer.alloc(sodium.crypto_sign_BYTES);
 	sodium.crypto_sign_detached(signature, hash, privateKey);
 
@@ -74,8 +74,9 @@ ed.sign = function(hash, privateKey) {
  * @todo Add description for the params
  */
 ed.verify = function(hash, signature, publicKey) {
-	if (!(hash instanceof Buffer) || !(signature instanceof Buffer))
+	if (!(hash instanceof Buffer) || !(signature instanceof Buffer)) {
 		throw new Error('argument message must be a buffer');
+	}
 	return sodium.crypto_sign_verify_detached(signature, hash, publicKey);
 };
 

helpers/json_history.js

@@ -137,16 +137,18 @@ function JSONHistory(title, logger) {
 		}
 
 		assert(typeof json === 'object', 'Invalid json object to migrate.');
-		if (jsonVersion)
+		if (jsonVersion) {
 			assert(
 				semver.valid(jsonVersion),
 				'Invalid start version specified to migrate.'
 			);
-		if (migrateToVersion)
+		}
+		if (migrateToVersion) {
 			assert(
 				semver.valid(migrateToVersion),
 				'Invalid end version specified to migrate.'
 			);
+		}
 		assert(typeof cb === 'function', 'Invalid callback specified to migrate.');
 
 		self.logger.info(

helpers/sort_by.js

@@ -61,7 +61,8 @@ function sortBy(sort, options) {
 
 		if (keys.length === 0) {
 			return self.sortBy('');
-		} else if (keys.length === 1) {
+		}
+		if (keys.length === 1) {
 			return self.sortBy(
 				`${keys[0]}:${sort[keys[0]] === -1 ? 'desc' : 'asc'}`,
 				options
@@ -90,9 +91,11 @@ function sortBy(sort, options) {
 	function prefixField(prefixSortedField) {
 		if (!prefixSortedField) {
 			return prefixSortedField;
-		} else if (typeof options.fieldPrefix === 'string') {
+		}
+		if (typeof options.fieldPrefix === 'string') {
 			return options.fieldPrefix + prefixSortedField;
-		} else if (typeof options.fieldPrefix === 'function') {
+		}
+		if (typeof options.fieldPrefix === 'function') {
 			return options.fieldPrefix(prefixSortedField);
 		}
 		return prefixSortedField;

logic/account.js

@@ -495,6 +495,7 @@ class Account {
 				// Get field data type
 				const fieldType = self.conv[updatedField];
 				const updatedValue = diff[updatedField];
+				const value = new Bignum(updatedValue);
 
 				// Make execution selection based on field type
 				switch (fieldType) {
@@ -508,7 +509,6 @@ class Account {
 					// [u_]balance, [u_]multimin, [u_]multilifetime, fees, rewards, votes, producedBlocks, missedBlocks
 					// eslint-disable-next-line no-case-declarations
 					case Number:
-						const value = new Bignum(updatedValue);
 						if (value.isNaN() || !value.isFinite()) {
 							throw `Encountered insane number: ${value.toString()}`;
 						}

logic/block_reward.js

@@ -140,8 +140,12 @@ class BlockReward {
  * @todo Add description for the params and the return value
  */
 __private.parseHeight = function(height) {
-	if (Number.isNaN(height)) {
-		throw 'Invalid block height';
+	if (
+		typeof height === 'undefined' ||
+		height === null ||
+		Number.isNaN(height)
+	) {
+		throw new TypeError('Invalid block height');
 	} else {
 		return Math.abs(height);
 	}

logic/broadcaster.js

@@ -223,7 +223,8 @@ __private.filterQueue = function(cb) {
 		(broadcast, filterCb) => {
 			if (broadcast.options.immediate) {
 				return setImmediate(filterCb, null, false);
-			} else if (broadcast.options.data) {
+			}
+			if (broadcast.options.data) {
 				let transactionId;
 				if (broadcast.options.data.transaction) {
 					// Look for a transaction of a given "id" when broadcasting transactions

logic/dapp.js

@@ -201,7 +201,8 @@ DApp.prototype.verify = function(transaction, sender, cb, tx) {
 						cb,
 						`Application name already exists: ${dapp.name}`
 					);
-				} else if (dapp.link === transaction.asset.dapp.link) {
+				}
+				if (dapp.link === transaction.asset.dapp.link) {
 					return setImmediate(
 						cb,
 						`Application link already exists: ${dapp.link}`

logic/transaction.js

@@ -292,7 +292,8 @@ class Transaction {
 		return this.countById(transaction, (err, count) => {
 			if (err) {
 				return setImmediate(cb, err, false);
-			} else if (count > 0) {
+			}
+			if (count > 0) {
 				return setImmediate(cb, null, true);
 			}
 			return setImmediate(cb, null, false);
@@ -1128,7 +1129,8 @@ class Transaction {
 
 		if (!transactionType) {
 			return setImmediate(cb, `Unknown transaction type ${transaction.type}`);
-		} else if (typeof transactionType.afterSave === 'function') {
+		}
+		if (typeof transactionType.afterSave === 'function') {
 			return transactionType.afterSave.call(this, transaction, cb);
 		}
 		return setImmediate(cb);

logic/transaction_pool.js

@@ -997,7 +997,8 @@ __private.applyUnconfirmedList = function(transactions, cb, tx) {
 __private.transactionTimeOut = function(transaction) {
 	if (transaction.type === transactionTypes.MULTI) {
 		return transaction.asset.multisignature.lifetime * self.hourInSeconds;
-	} else if (Array.isArray(transaction.signatures)) {
+	}
+	if (Array.isArray(transaction.signatures)) {
 		return UNCONFIRMED_TRANSACTION_TIMEOUT * 8;
 	}
 	return UNCONFIRMED_TRANSACTION_TIMEOUT;

modules/blocks/process.js

@@ -277,7 +277,8 @@ Process.prototype.getCommonBlock = function(peer, height, cb) {
 					if (err) {
 						modules.peers.remove(peer);
 						return setImmediate(waterCb, err);
-					} else if (!blocksCommonRes.common) {
+					}
+					if (!blocksCommonRes.common) {
 						// FIXME: Need better checking here, is base on 'common' property enough?
 						comparisonFailed = true;
 						return setImmediate(
@@ -666,13 +667,15 @@ Process.prototype.onReceiveBlock = function(block) {
 		) {
 			// Process received block
 			return __private.receiveBlock(block, cb);
-		} else if (
+		}
+		if (
 			block.previousBlock !== lastBlock.id &&
 			lastBlock.height + 1 === block.height
 		) {
 			// Process received fork cause 1
 			return __private.receiveForkOne(block, lastBlock, cb);
-		} else if (
+		}
+		if (
 			block.previousBlock === lastBlock.previousBlock &&
 			block.height === lastBlock.height &&
 			block.id !== lastBlock.id
@@ -682,22 +685,21 @@ Process.prototype.onReceiveBlock = function(block) {
 		}
 		if (block.id === lastBlock.id) {
 			library.logger.debug('Block already processed', block.id);
-		} else {
-			library.logger.warn(
-				[
-					'Discarded block that does not match with current chain:',
-					block.id,
-					'height:',
-					block.height,
-					'round:',
-					slots.calcRound(block.height),
-					'slot:',
-					slots.getSlotNumber(block.timestamp),
-					'generator:',
-					block.generatorPublicKey,
-				].join(' ')
-			);
 		}
+		library.logger.warn(
+			[
+				'Discarded block that does not match with current chain:',
+				block.id,
+				'height:',
+				block.height,
+				'round:',
+				slots.calcRound(block.height),
+				'slot:',
+				slots.getSlotNumber(block.timestamp),
+				'generator:',
+				block.generatorPublicKey,
+			].join(' ')
+		);
 
 		// Discard received block
 		return setImmediate(cb);

modules/blocks/utils.js

@@ -280,7 +280,8 @@ Utils.prototype.loadBlocksData = function(filter, cb, tx) {
 	// FIXME: filter.id is not used
 	if (filter.id && filter.lastId) {
 		return setImmediate(cb, 'Invalid filter: Received both id and lastId');
-	} else if (filter.id) {
+	}
+	if (filter.id) {
 		params.id = filter.id;
 	} else if (filter.lastId) {
 		params.lastId = filter.lastId;

modules/blocks/verify.js

@@ -796,7 +796,8 @@ Verify.prototype.processBlock = function(block, broadcast, saveBlock, cb) {
 	if (modules.blocks.isCleaning.get()) {
 		// Break processing if node shutdown reqested
 		return setImmediate(cb, 'Cleaning up');
-	} else if (!__private.loaded) {
+	}
+	if (!__private.loaded) {
 		// Break processing if blockchain is not loaded
 		return setImmediate(cb, 'Blockchain is loading');
 	}

modules/transactions.js

@@ -214,7 +214,8 @@ __private.list = function(filter, cb) {
 		fieldPrefix(sortField) {
 			if (['height'].indexOf(sortField) > -1) {
 				return `b_${sortField}`;
-			} else if (['confirmations'].indexOf(sortField) > -1) {
+			}
+			if (['confirmations'].indexOf(sortField) > -1) {
 				return sortField;
 			}
 			return `t_${sortField}`;
@@ -648,7 +649,8 @@ Transactions.prototype.applyUnconfirmed = function(
 
 	if (!sender && transaction.blockId !== library.genesisBlock.block.id) {
 		return setImmediate(cb, 'Invalid block id');
-	} else if (transaction.requesterPublicKey) {
+	}
+	if (transaction.requesterPublicKey) {
 		return modules.accounts.getAccount(
 			{ publicKey: transaction.requesterPublicKey },
 			(err, requester) => {

modules/transport.js

@@ -429,7 +429,8 @@ Transport.prototype.onBroadcastBlock = function(block, broadcast) {
 			'Transport->onBroadcastBlock: Aborted - max block relays exhausted'
 		);
 		return;
-	} else if (modules.loader.syncing()) {
+	}
+	if (modules.loader.syncing()) {
 		library.logger.debug(
 			'Transport->onBroadcastBlock: Aborted - blockchain synchronization in progress'
 		);