Merge pull request bitpay#2055 from micahriggan/fix/mongo-compile-error

Making the options param optional for api transform

Author: micahriggan

packages/bitcore-node/package-lock.json

@@ -49,7 +49,7 @@
     "@types/express": "^4.11.1",
     "@types/lodash": "^4.14.116",
     "@types/mocha": "^5.2.0",
-    "@types/mongodb": "^3.1.19",
+    "@types/mongodb": "^3.1.22",
     "@types/mongoose": "^5.0.11",
     "@types/node": "10.0.2",
     "@types/request": "^2.47.0",

packages/bitcore-node/package.json

@@ -219,7 +219,7 @@ export class BlockModel extends BaseModel<IBlock> {
     return true;
   }
 
-  _apiTransform(block: Partial<MongoBound<IBlock>>, options: TransformOptions): any {
+  _apiTransform(block: Partial<MongoBound<IBlock>>, options?: TransformOptions): any {
     const transform = {
       _id: block._id,
       chain: block.chain,

packages/bitcore-node/src/models/block.ts

@@ -521,7 +521,7 @@ export class TransactionModel extends BaseModel<ITransaction> {
     return this.collection.find(finalQuery, options).addCursorFlag('noCursorTimeout', true);
   }
 
-  _apiTransform(tx: Partial<MongoBound<ITransaction>>, options: TransformOptions): TransactionJSON | string {
+  _apiTransform(tx: Partial<MongoBound<ITransaction>>, options?: TransformOptions): TransactionJSON | string {
     const transaction: TransactionJSON = {
       _id: tx._id ? tx._id.toString() : '',
       txid: tx.txid || '',

packages/bitcore-node/src/models/transaction.ts

@@ -24,7 +24,7 @@ export class WalletModel extends BaseModel<IWallet> {
     this.collection.createIndex({ pubKey: 1 }, { background: true });
   }
 
-  _apiTransform(wallet: IWallet, options: TransformOptions) {
+  _apiTransform(wallet: IWallet, options?: TransformOptions) {
     let transform = { name: wallet.name, pubKey: wallet.pubKey };
     if (options && options.object) {
       return transform;

packages/bitcore-node/src/models/wallet.ts

@@ -28,7 +28,7 @@ export class WalletAddressModel extends BaseModel<IWalletAddress> {
     this.collection.createIndex({ chain: 1, network: 1, wallet: 1, address: 1 }, { background: true, unique: true });
   }
 
-  _apiTransform(walletAddress: { address: string }, options: TransformOptions) {
+  _apiTransform(walletAddress: { address: string }, options?: TransformOptions) {
     let transform = { address: walletAddress.address };
     if (options && options.object) {
       return transform;
@@ -101,7 +101,7 @@ export class WalletAddressModel extends BaseModel<IWalletAddress> {
             })
           ),
             { ordered: false };
-          
+
         } catch (err) {
           // Ignore duplicate keys, they may be half processed
           if (err.code !== 11000) {

packages/bitcore-node/src/models/walletAddress.ts

@@ -1,5 +1,5 @@
 import { TransformOptions } from "./TransformOptions";
 import { BaseModel, MongoBound } from "../models/base";
-type TransformProperty<T> = {_apiTransform: (model: T | MongoBound<T>, options: TransformOptions) => any};
+type TransformProperty<T> = {_apiTransform: (model: T | MongoBound<T>, options?: TransformOptions) => any};
 export type TransformableModel<T> = BaseModel<T> & TransformProperty<T>;
 

packages/bitcore-node/src/types/TransformableModel.ts

@@ -21,6 +21,9 @@ type ErrorType = {
 export async function validateDataForBlock(blockNum: number, log = false) {
   let success = true;
   const blockTxs = await TransactionStorage.collection.find({ chain, network, blockHeight: blockNum }).toArray();
+  const blockTxids = blockTxs.map(t => t.txid);
+  const coinsForTx = await CoinStorage.collection.find({ chain, network, mintTxid: { $in: blockTxids } }).toArray();
+
   const seenTxs = {} as { [txid: string]: ITransaction };
   const errors = new Array<ErrorType>();
 
@@ -46,9 +49,6 @@ export async function validateDataForBlock(blockNum: number, log = false) {
     }
   }
 
-  const blockTxids = blockTxs.map(t => t.txid);
-
-  const coinsForTx = await CoinStorage.collection.find({ chain, network, mintTxid: { $in: blockTxids } }).toArray();
   for (let coin of coinsForTx) {
     if (seenTxCoins[coin.mintTxid] && seenTxCoins[coin.mintTxid][coin.mintIndex]) {
       success = false;