Remove lodash from bitcore-lib

packages/bitcore-lib/index.js

@@ -68,7 +68,6 @@ bitcore.deps.bs58 = require('bs58');
 
 bitcore.deps.Buffer = Buffer;
 bitcore.deps.elliptic = require('elliptic');
-bitcore.deps._ = require('lodash');
 
 // Internal usage, exposed for testing/advanced tweaking
 bitcore.Transaction.sighash = require('./lib/transaction/sighash');

packages/bitcore-lib/lib/address.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const _ = require('lodash');
 const $ = require('./util/preconditions');
 const Hash = require('./crypto/hash');
 const Base58Check = require('./encoding/base58check');
@@ -29,16 +28,16 @@ const PublicKey = require('./publickey');
  * @example
  * ```javascript
  * // validate that an input field is valid
- * let error = Address.getValidationError(input, 'testnet');
+ * const error = Address.getValidationError(input, 'testnet');
  * if (!error) {
- *   let address = Address(input, 'testnet');
+ *   const address = Address(input, 'testnet');
  * } else {
  *   // invalid network or checksum (typo?)
- *   let message = error.messsage;
+ *   const message = error.messsage;
  * }
  *
  * // get an address from a public key
- * let address = Address(publicKey, 'testnet').toString();
+ * const address = Address(publicKey, 'testnet').toString();
  * ```
  *
  * @param {*} data - The encoded data in various formats
@@ -56,7 +55,7 @@ function Address(data, network, type, multisigType) {
     return new Address(data, network, type);
   }
 
-  if (_.isArray(data) && _.isNumber(network)) {
+  if (Array.isArray(data) && typeof network === 'number') {
     return Address.createMultisig(data, network, type, false, multisigType);
   }
 
@@ -113,7 +112,7 @@ Address.prototype._classifyArguments = function(data, network, type) {
     return Address._transformScript(data, network);
   } else if (typeof(data) === 'string') {
     return Address._transformString(data, network, type);
-  } else if (_.isObject(data)) {
+  } else if (typeof data === 'object' && data !== null) {
     return Address._transformObject(data);
   } else {
     throw new TypeError('First argument is an unrecognized data format.');
@@ -247,7 +246,6 @@ Address._classifyFromVersion = function(buffer) {
       } else {
         throw new TypeError('Witness data must be 32 bytes for v1');
       }
-    } else {
     }
     version.network = Networks.get(info.prefix, 'bech32prefix');
   } else {
@@ -378,7 +376,7 @@ Address.createMultisig = function(publicKeys, threshold, network, nestedWitness,
     throw new TypeError('Type must be either scripthash or witnessscripthash to create multisig.');
   }
   if (nestedWitness || Address.isPayToWitnessScriptHash(type)) {
-    publicKeys = _.map(publicKeys, PublicKey);
+    publicKeys = publicKeys.map(key => PublicKey(key));
     for (let i = 0; i < publicKeys.length; i++) {
       if (!publicKeys[i].compressed) {
         throw new TypeError('Witness addresses must use compressed public keys.');
@@ -563,7 +561,7 @@ Address.fromObject = function fromObject(obj) {
  * @example
  * ```javascript
  * // a network mismatch error
- * let error = Address.getValidationError('15vkcKf7gB23wLAnZLmbVuMiiVDc1Nm4a2', 'testnet');
+ * const error = Address.getValidationError('15vkcKf7gB23wLAnZLmbVuMiiVDc1Nm4a2', 'testnet');
  * ```
  *
  * @param {string} data - The encoded data

packages/bitcore-lib/lib/block/block.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const _ = require('lodash');
 const BN = require('../crypto/bn');
 const Hash = require('../crypto/hash');
 const BufferReader = require('../encoding/bufferreader');
@@ -22,7 +21,7 @@ function Block(arg) {
   if (!(this instanceof Block)) {
     return new Block(arg);
   }
-  _.extend(this, Block._from(arg));
+  Object.assign(this, Block._from(arg));
   return this;
 }
 
@@ -39,7 +38,7 @@ Block._from = function _from(arg) {
   let info = {};
   if (BufferUtil.isBuffer(arg)) {
     info = Block._fromBufferReader(BufferReader(arg));
-  } else if (_.isObject(arg)) {
+  } else if (typeof arg === 'object' && arg !== null) {
     info = Block._fromObject(arg);
   } else {
     throw new TypeError('Unrecognized argument for Block');
@@ -53,12 +52,11 @@ Block._from = function _from(arg) {
  * @private
  */
 Block._fromObject = function _fromObject(data) {
-  const transactions = [];
-  data.transactions.forEach(function(tx) {
+  const transactions = data.transactions.map(tx => {
     if (tx instanceof Transaction) {
-      transactions.push(tx);
+      return tx;
     } else {
-      transactions.push(Transaction().fromObject(tx));
+      return Transaction().fromObject(tx);
     }
   });
   const info = {
@@ -139,10 +137,7 @@ Block.fromRawBlock = function fromRawBlock(data) {
  * @returns {Object} - A plain object with the block properties
  */
 Block.prototype.toObject = Block.prototype.toJSON = function toObject() {
-  const transactions = [];
-  this.transactions.forEach(function(tx) {
-    transactions.push(tx.toObject());
-  });
+  const transactions = this.transactions.map(tx => tx.toObject());
   return {
     header: this.header.toObject(),
     transactions: transactions
@@ -261,7 +256,7 @@ const idProperty = {
     }
     return this._id;
   },
-  set: _.noop
+  set: function () {/** no op */}
 };
 Object.defineProperty(Block.prototype, 'id', idProperty);
 Object.defineProperty(Block.prototype, 'hash', idProperty);

packages/bitcore-lib/lib/block/blockheader.js

@@ -1,12 +1,10 @@
 'use strict';
 
-const _ = require('lodash');
 const BN = require('../crypto/bn');
 const Hash = require('../crypto/hash');
 const BufferReader = require('../encoding/bufferreader');
 const BufferWriter = require('../encoding/bufferwriter');
 const BufferUtil = require('../util/buffer');
-const JSUtil = require('../util/js');
 const $ = require('../util/preconditions');
 
 const GENESIS_BITS = 0x1d00ffff;
@@ -52,7 +50,7 @@ BlockHeader._from = function _from(arg) {
   let info = {};
   if (BufferUtil.isBuffer(arg)) {
     info = BlockHeader._fromBufferReader(BufferReader(arg));
-  } else if (_.isObject(arg)) {
+  } else if (typeof arg === 'object' && arg !== null) {
     info = BlockHeader._fromObject(arg);
   } else {
     throw new TypeError('Unrecognized argument for BlockHeader');
@@ -69,10 +67,10 @@ BlockHeader._fromObject = function _fromObject(data) {
   $.checkArgument(data, 'data is required');
   let prevHash = data.prevHash;
   let merkleRoot = data.merkleRoot;
-  if (_.isString(data.prevHash)) {
+  if (typeof data.prevHash === 'string') {
     prevHash = BufferUtil.reverse(Buffer.from(data.prevHash, 'hex'));
   }
-  if (_.isString(data.merkleRoot)) {
+  if (typeof data.merkleRoot === 'string') {
     merkleRoot = BufferUtil.reverse(Buffer.from(data.merkleRoot, 'hex'));
   }
   const info = {
@@ -208,7 +206,9 @@ BlockHeader.prototype.toBufferWriter = function toBufferWriter(bw) {
 BlockHeader.prototype.getTargetDifficulty = function getTargetDifficulty(bits) {
   bits = bits || this.bits;
 
+  // eslint-disable-next-line no-bitwise
   let target = new BN(bits & 0xffffff);
+  // eslint-disable-next-line no-bitwise
   let mov = 8 * ((bits >>> 24) - 3);
   while (mov-- > 0) {
     target = target.mul(new BN(2));
@@ -251,7 +251,7 @@ const idProperty = {
     }
     return this._id;
   },
-  set: _.noop
+  set: function () {/** no op */}
 };
 Object.defineProperty(BlockHeader.prototype, 'id', idProperty);
 Object.defineProperty(BlockHeader.prototype, 'hash', idProperty);

packages/bitcore-lib/lib/block/merkleblock.js

@@ -1,13 +1,11 @@
 'use strict';
 
-const _ = require('lodash');
 const Hash = require('../crypto/hash');
 const BufferReader = require('../encoding/bufferreader');
 const BufferWriter = require('../encoding/bufferwriter');
 const errors = require('../errors');
 const Transaction = require('../transaction');
 const BufferUtil = require('../util/buffer');
-const JSUtil = require('../util/js');
 const $ = require('../util/preconditions');
 const BlockHeader = require('./blockheader');
 
@@ -29,7 +27,7 @@ function MerkleBlock(arg) {
   let info = {};
   if (BufferUtil.isBuffer(arg)) {
     info = MerkleBlock._fromBufferReader(BufferReader(arg));
-  } else if (_.isObject(arg)) {
+  } else if (typeof arg === 'object' && arg !== null) {
     let header;
     if (arg.header instanceof BlockHeader) {
       header = arg.header;
@@ -61,7 +59,7 @@ function MerkleBlock(arg) {
   } else {
     throw new TypeError('Unrecognized argument for MerkleBlock');
   }
-  _.extend(this, info);
+  Object.assign(this, info);
   this._flagBitsUsed = 0;
   this._hashesUsed = 0;
 
@@ -129,8 +127,8 @@ MerkleBlock.prototype.toObject = MerkleBlock.prototype.toJSON = function toObjec
  * @returns {Boolean} - True/False whether this MerkleBlock is Valid
  */
 MerkleBlock.prototype.validMerkleTree = function validMerkleTree() {
-  $.checkState(_.isArray(this.flags), 'MerkleBlock flags is not an array');
-  $.checkState(_.isArray(this.hashes), 'MerkleBlock hashes is not an array');
+  $.checkState(Array.isArray(this.flags), 'MerkleBlock flags is not an array');
+  $.checkState(Array.isArray(this.hashes), 'MerkleBlock hashes is not an array');
 
   // Can't have more hashes than numTransactions
   if (this.hashes.length > this.numTransactions) {
@@ -156,8 +154,8 @@ MerkleBlock.prototype.validMerkleTree = function validMerkleTree() {
  * @returns {Array} - txs hash that match the filter
  */
 MerkleBlock.prototype.filterdTxsHash = function filterdTxsHash() {
-  $.checkState(_.isArray(this.flags), 'MerkleBlock flags is not an array');
-  $.checkState(_.isArray(this.hashes), 'MerkleBlock hashes is not an array');
+  $.checkState(Array.isArray(this.flags), 'MerkleBlock flags is not an array');
+  $.checkState(Array.isArray(this.hashes), 'MerkleBlock hashes is not an array');
 
   // Can't have more hashes than numTransactions
   if (this.hashes.length > this.numTransactions) {
@@ -210,6 +208,7 @@ MerkleBlock.prototype._traverseMerkleTree = function traverseMerkleTree(depth, p
   if (opts.flagBitsUsed > this.flags.length * 8) {
     return null;
   }
+  // eslint-disable-next-line no-bitwise
   const isParentOfMatch = (this.flags[opts.flagBitsUsed >> 3] >>> (opts.flagBitsUsed++ & 7)) & 1;
   if (depth === 0 || !isParentOfMatch) {
     if (opts.hashesUsed >= this.hashes.length) {
@@ -241,6 +240,7 @@ MerkleBlock.prototype._traverseMerkleTree = function traverseMerkleTree(depth, p
  * @private
  */
 MerkleBlock.prototype._calcTreeWidth = function calcTreeWidth(height) {
+  // eslint-disable-next-line no-bitwise
   return (this.numTransactions + (1 << height) - 1) >> height;
 };
 
@@ -263,7 +263,7 @@ MerkleBlock.prototype._calcTreeHeight = function calcTreeHeight() {
  * @private
  */
 MerkleBlock.prototype.hasTransaction = function hasTransaction(tx) {
-  $.checkArgument(!_.isUndefined(tx), 'tx cannot be undefined');
+  $.checkArgument(tx != null, 'tx cannot be undefined');
   $.checkArgument(tx instanceof Transaction || typeof tx === 'string',
     'Invalid tx given, tx must be a "string" or "Transaction"');
 

packages/bitcore-lib/lib/crypto/bn.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const BN = require('bn.js');
-const _ = require('lodash');
 const BufferUtil = require('../util/buffer');
 const $ = require('../util/preconditions');
 
@@ -18,12 +17,12 @@ BN.One = new BN(1);
 BN.Minus1 = new BN(-1);
 
 BN.fromNumber = function(n) {
-  $.checkArgument(_.isNumber(n));
+  $.checkArgument(typeof n === 'number');
   return new BN(n);
 };
 
 BN.fromString = function(str, base) {
-  $.checkArgument(_.isString(str));
+  $.checkArgument(typeof str === 'string');
   return new BN(str, base);
 };
 
@@ -56,7 +55,9 @@ BN.fromSM = function(buf, opts) {
     buf = reversebuf(buf);
   }
 
+  // eslint-disable-next-line no-bitwise
   if (buf[0] & 0x80) {
+    // eslint-disable-next-line no-bitwise
     buf[0] = buf[0] & 0x7f;
     ret = BN.fromBuffer(buf);
     ret.neg().copy(ret);
@@ -99,18 +100,22 @@ BN.prototype.toSMBigEndian = function() {
   let buf;
   if (this.cmp(BN.Zero) === -1) {
     buf = this.neg().toBuffer();
+    // eslint-disable-next-line no-bitwise
     if (buf[0] & 0x80) {
       buf = Buffer.concat([Buffer.from([0x80]), buf]);
     } else {
+      // eslint-disable-next-line no-bitwise
       buf[0] = buf[0] | 0x80;
     }
   } else {
     buf = this.toBuffer();
+    // eslint-disable-next-line no-bitwise
     if (buf[0] & 0x80) {
       buf = Buffer.concat([Buffer.from([0x00]), buf]);
     }
   }
 
+  // eslint-disable-next-line no-bitwise
   if (buf.length === 1 & buf[0] === 0) {
     buf = Buffer.from([]);
   }
@@ -145,12 +150,14 @@ BN.fromScriptNumBuffer = function(buf, fRequireMinimal, size) {
     // If the most-significant-byte - excluding the sign bit - is zero
     // then we're not minimal. Note how this test also rejects the
     // negative-zero encoding, 0x80.
+    // eslint-disable-next-line no-bitwise
     if ((buf[buf.length - 1] & 0x7f) === 0) {
       // One exception: if there's more than one byte and the most
       // significant bit of the second-most-significant-byte is set
       // it would conflict with the sign bit. An example of this case
       // is +-255, which encode to 0xff00 and 0xff80 respectively.
       // (big-endian).
+      // eslint-disable-next-line no-bitwise
       if (buf.length <= 1 || (buf[buf.length - 2] & 0x80) === 0) {
         throw new Error('non-minimally encoded script number');
       }

packages/bitcore-lib/lib/crypto/point.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const EC = require('elliptic').ec;
 const BufferUtil = require('../util/buffer');
 const BN = require('./bn');
-const EC = require('elliptic').ec;
 
 const ec = new EC('secp256k1');
 const ecPoint = ec.curve.point.bind(ec.curve);
@@ -24,7 +24,7 @@ const Point = function Point(x, y, isRed) {
   let point;
   try {
     point = ecPoint(x, y, isRed);
-  } catch (e) {
+  } catch {
     throw new Error('Invalid Point');
   }
   point.validate();
@@ -46,7 +46,7 @@ Point.fromX = function fromX(odd, x) {
   let point;
   try {
     point = ecPointFromX(x, odd);
-  } catch (e) {
+  } catch {
     throw new Error('Invalid X');
   }
   point.validate();
@@ -127,7 +127,7 @@ Point.prototype.validate = function validate() {
   let p2;
   try {
     p2 = ecPointFromX(this.getX(), this.getY().isOdd());
-  } catch (e) {
+  } catch {
     throw new Error('Point does not lie on the curve');
   }