fix(node): removing unneeded properties

using an indexer to absorb extra properties from params
nitsujlangston · Nov 6, 2018 · 7f2ad9f · 7f2ad9f
1 parent ab37830
commit 7f2ad9f
Showing 1 changed file with 36 additions and 25 deletions.
diff --git a/packages/bitcore-node/src/models/transaction.ts b/packages/bitcore-node/src/models/transaction.ts
@@ -64,25 +64,28 @@ export class Transaction extends BaseModel<ITransaction> {
     logger.debug('Minting Coins', mintOps.length);
     if (mintOps.length) {
       await Promise.all(
-        partition(mintOps, mintOps.length / config.maxPoolSize)
-          .map(mintBatch => CoinModel.collection.bulkWrite(mintBatch, { ordered: false }))
+        partition(mintOps, mintOps.length / config.maxPoolSize).map(mintBatch =>
+          CoinModel.collection.bulkWrite(mintBatch, { ordered: false })
+        )
       );
     }
-    
+
     logger.debug('Spending Coins', spendOps.length);
     if (spendOps.length) {
       await Promise.all(
-        partition(spendOps, spendOps.length / config.maxPoolSize)
-          .map(spendBatch => CoinModel.collection.bulkWrite(spendBatch, { ordered: false }))
+        partition(spendOps, spendOps.length / config.maxPoolSize).map(spendBatch =>
+          CoinModel.collection.bulkWrite(spendBatch, { ordered: false })
+        )
       );
     }
-    
+
     if (mintOps) {
       const txOps = await this.addTransactions({ ...params, mintOps });
       logger.debug('Writing Transactions', txOps.length);
       await Promise.all(
-        partition(txOps, txOps.length / config.maxPoolSize)
-          .map(txBatch => this.collection.bulkWrite(txBatch, { ordered: false }))
+        partition(txOps, txOps.length / config.maxPoolSize).map(txBatch =>
+          this.collection.bulkWrite(txBatch, { ordered: false })
+        )
       );
     }
   }
@@ -99,11 +102,13 @@ export class Transaction extends BaseModel<ITransaction> {
     chain: string;
     network: string;
     mintOps: Array<any>;
-    mempoolTime?: Date
+    mempoolTime?: Date;
   }) {
     let { blockHash, blockTime, blockTimeNormalized, chain, height, network, parentChain, forkHeight } = params;
     if (parentChain && forkHeight && height < forkHeight) {
-      const parentTxs = await TransactionModel.collection.find({blockHeight: height, chain: parentChain, network}).toArray();
+      const parentTxs = await TransactionModel.collection
+        .find({ blockHeight: height, chain: parentChain, network })
+        .toArray();
       return parentTxs.map(parentTx => {
         return {
           updateOne: {
@@ -125,13 +130,19 @@ export class Transaction extends BaseModel<ITransaction> {
               }
             },
             upsert: true,
-              forceServerObjectId: true
+            forceServerObjectId: true
           }
         };
       });
     } else {
-      const spentQuery = height > 0 ? { spentHeight: height, chain, network } : { spentTxid: { $in: params.txs.map(tx => tx._hash) }, chain, network };
-      const spent = await CoinModel.collection.find(spentQuery).project({ spentTxid: 1, value: 1, wallets: 1 }).toArray();
+      const spentQuery =
+        height > 0
+          ? { spentHeight: height, chain, network }
+          : { spentTxid: { $in: params.txs.map(tx => tx._hash) }, chain, network };
+      const spent = await CoinModel.collection
+        .find(spentQuery)
+        .project({ spentTxid: 1, value: 1, wallets: 1 })
+        .toArray();
       type CoinGroup = { [txid: string]: { total: number; wallets: Array<ObjectID> } };
       const groupedMints = params.mintOps.reduce<CoinGroup>((agg, coinOp) => {
         const mintTxid = coinOp.updateOne.filter.mintTxid;
@@ -162,7 +173,7 @@ export class Transaction extends BaseModel<ITransaction> {
         return agg;
       }, {});
 
-      let txOps = params.txs.map((tx) => {
+      let txOps = params.txs.map(tx => {
         const txid = tx._hash!;
         const minted = groupedMints[txid] || {};
         const spent = groupedSpends[txid] || {};
@@ -172,6 +183,7 @@ export class Transaction extends BaseModel<ITransaction> {
         const wallets = lodash.uniqBy(txWallets, wallet => wallet.toHexString());
         let fee = 0;
         if (groupedMints[txid] && groupedSpends[txid]) {
+          // TODO: Fee is negative for mempool txs
           fee = groupedSpends[txid].total - groupedMints[txid].total;
           if (fee < 0) {
             console.error(txid, groupedSpends[txid], groupedMints[txid]);
@@ -225,11 +237,9 @@ export class Transaction extends BaseModel<ITransaction> {
           chain: parentChain,
           network,
           mintHeight: height,
-          $or: [
-            { spentHeight: { $lt: SpentHeightIndicators.minimum }},
-            { spentHeight: { $gte: forkHeight }},
-          ]
-        }).project({mintTxid:1, mintIndex: 1})
+          $or: [{ spentHeight: { $lt: SpentHeightIndicators.minimum } }, { spentHeight: { $gte: forkHeight } }]
+        })
+        .project({ mintTxid: 1, mintIndex: 1 })
         .toArray();
       for (const parentChainCoin of parentChainCoins) {
         parentChainCoinsMap.set(`${parentChainCoin.mintTxid}:${parentChainCoin.mintIndex}`, true);
@@ -239,7 +249,12 @@ export class Transaction extends BaseModel<ITransaction> {
       tx._hash = tx.hash;
       let isCoinbase = tx.isCoinbase();
       for (let [index, output] of tx.outputs.entries()) {
-        if ((parentChain && forkHeight && height < forkHeight) && (!parentChainCoinsMap.size || !parentChainCoinsMap.get(`${tx._hash}:${index}`))) {
+        if (
+          parentChain &&
+          forkHeight &&
+          height < forkHeight &&
+          (!parentChainCoinsMap.size || !parentChainCoinsMap.get(`${tx._hash}:${index}`))
+        ) {
           continue;
         }
         let address = '';
@@ -307,11 +322,7 @@ export class Transaction extends BaseModel<ITransaction> {
     chain: string;
     network: string;
     mintOps?: Array<any>;
-    mempoolTime?: Date;
-    blockTime?: Date;
-    blockHash?: string;
-    blockTimeNormalized?: Date;
-    initialSyncComplete?: boolean
+    [rest: string]: any;
   }): Array<any> {
     let { chain, network, height, parentChain, forkHeight } = params;
     let spendOps: any[] = [];