Merge branch 'pruneMempool' of github.com:nitsujlangston/bitcore into pruneMempool

Micah Riggan · Micah Riggan · commit a051f9389f60 · 2018-11-28T10:57:54.000-06:00
diff --git a/packages/bitcore-node/src/models/coin.ts b/packages/bitcore-node/src/models/coin.ts
@@ -68,10 +68,10 @@ class Coin extends BaseModel<ICoin> {
       }
     );
     this.collection.createIndex({ address: 1 }, { background: true });
-    this.collection.createIndex({ mintHeight: 1, chain: 1, network: 1 }, { background: true });
+    this.collection.createIndex({ chain: 1, network: 1, mintHeight: 1 }, { background: true });
     this.collection.createIndex({ spentTxid: 1 }, { background: true, sparse: true });
-    this.collection.createIndex({ spentHeight: 1, chain: 1, network: 1 }, { background: true });
-    this.collection.createIndex({ wallets: 1, spentHeight: 1 }, { background: true, sparse: true });
+    this.collection.createIndex({ chain: 1, network: 1, spentHeight: 1 }, { background: true });
+    this.collection.createIndex({ wallets: 1, spentHeight: 1, value: 1 }, { background: true, partialFilterExpression: { 'wallets.0': { $exists: true } } });
   }
 
   getBalance(params: { query: any }) {
@@ -83,6 +83,7 @@ class Coin extends BaseModel<ICoin> {
     return this.collection
       .aggregate<{ balance: number }>([
         { $match: query },
+        { $project: { value: 1, _id: 0 }},
         {
           $group: {
             _id: null,
diff --git a/packages/bitcore-node/src/models/transaction.ts b/packages/bitcore-node/src/models/transaction.ts
@@ -40,9 +40,9 @@ export class Transaction extends BaseModel<ITransaction> {
 
   onConnect() {
     this.collection.createIndex({ txid: 1 }, { background: true });
-    this.collection.createIndex({ blockHeight: 1, chain: 1, network: 1 }, { background: true });
+    this.collection.createIndex({ chain: 1, network: 1, blockHeight: 1 }, { background: true });
     this.collection.createIndex({ blockHash: 1 }, { background: true });
-    this.collection.createIndex({ blockTimeNormalized: 1, chain: 1, network: 1 }, { background: true });
+    this.collection.createIndex({ chain: 1, network: 1, blockTimeNormalized: 1 }, { background: true });
     this.collection.createIndex({ wallets: 1, blockTimeNormalized: 1 }, { background: true, partialFilterExpression: { 'wallets.0': { $exists: true } } });
     this.collection.createIndex({ wallets: 1, blockHeight: 1 }, { background: true, partialFilterExpression: { 'wallets.0': { $exists: true } } });
   }
diff --git a/packages/bitcore-node/src/providers/chain-state/internal/internal.ts b/packages/bitcore-node/src/providers/chain-state/internal/internal.ts
@@ -324,13 +324,13 @@ export class InternalStateProvider implements CSP.IChainStateService {
   }
 
   async getWalletBalance(params: CSP.GetWalletBalanceParams) {
-    let query = { wallets: params.wallet._id };
+    let query = { wallets: params.wallet._id, 'wallets.0': { $exists: true } };
     return CoinModel.getBalance({ query });
   }
 
   async streamWalletUtxos(params: CSP.StreamWalletUtxosParams) {
     const { wallet, limit, args = {}, stream } = params;
-    let query: any = { wallets: wallet._id, mintHeight: { $gt: SpentHeightIndicators.conflicting } };
+    let query: any = { wallets: wallet._id, 'wallets.0': { $exists: true }, mintHeight: { $gt: SpentHeightIndicators.conflicting } };
     if (args.includeSpent !== 'true') {
       query.spentHeight = { $lt: SpentHeightIndicators.pending };
     }

Original file line number	Diff line number	Diff line change
`@@ -324,13 +324,13 @@ export class InternalStateProvider implements CSP.IChainStateService {`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`async getWalletBalance(params: CSP.GetWalletBalanceParams) {`
`327`		`- let query = { wallets: params.wallet._id };`
	`327`	`+ let query = { wallets: params.wallet._id, 'wallets.0': { $exists: true } };`
`328`	`328`	`return CoinModel.getBalance({ query });`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`async streamWalletUtxos(params: CSP.StreamWalletUtxosParams) {`
`332`	`332`	`const { wallet, limit, args = {}, stream } = params;`
`333`		`- let query: any = { wallets: wallet._id, mintHeight: { $gt: SpentHeightIndicators.conflicting } };`
	`333`	`+ let query: any = { wallets: wallet._id, 'wallets.0': { $exists: true }, mintHeight: { $gt: SpentHeightIndicators.conflicting } };`
`334`	`334`	`if (args.includeSpent !== 'true') {`
`335`	`335`	`query.spentHeight = { $lt: SpentHeightIndicators.pending };`
`336`	`336`	`}`