nitsujlangston
diff --git a/‎packages/bitcore-node/src/models/coin.ts‎
Lines changed: 3 additions & 3 deletions b/‎packages/bitcore-node/src/models/coin.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎packages/bitcore-node/src/models/transaction.ts‎
Lines changed: 2 additions & 2 deletions b/‎packages/bitcore-node/src/models/transaction.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎packages/bitcore-node/src/providers/chain-state/internal/internal.ts‎
Lines changed: 2 additions & 2 deletions b/‎packages/bitcore-node/src/providers/chain-state/internal/internal.ts‎
Lines changed: 2 additions & 2 deletions
@@ -63,10 +63,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 }, { background: true, partialFilterExpression: { 'wallets.0': { $exists: true } } });
   }
 
   getBalance(params: { query: any }) {
 
@@ -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 } } });
   }
 
@@ -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 };
+    let query: any = { wallets: wallet._id, 'wallets.0': { $exists: true } };
     if (args.includeSpent !== 'true') {
       query.spentHeight = { $lt: SpentHeightIndicators.pending };
     }
Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,10 @@ class Coin extends BaseModel<ICoin> {`
`63`	`63`	`}`
`64`	`64`	`);`
`65`	`65`	`this.collection.createIndex({ address: 1 }, { background: true });`
`66`		`- this.collection.createIndex({ mintHeight: 1, chain: 1, network: 1 }, { background: true });`
	`66`	`+ this.collection.createIndex({ chain: 1, network: 1, mintHeight: 1 }, { background: true });`
`67`	`67`	`this.collection.createIndex({ spentTxid: 1 }, { background: true, sparse: true });`
`68`		`- this.collection.createIndex({ spentHeight: 1, chain: 1, network: 1 }, { background: true });`
`69`		`- this.collection.createIndex({ wallets: 1, spentHeight: 1 }, { background: true, sparse: true });`
	`68`	`+ this.collection.createIndex({ chain: 1, network: 1, spentHeight: 1 }, { background: true });`
	`69`	`+ this.collection.createIndex({ wallets: 1, spentHeight: 1 }, { background: true, partialFilterExpression: { 'wallets.0': { $exists: true } } });`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`getBalance(params: { query: any }) {`
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 };`
	`333`	`+ let query: any = { wallets: wallet._id, 'wallets.0': { $exists: true } };`
`334`	`334`	`if (args.includeSpent !== 'true') {`
`335`	`335`	`query.spentHeight = { $lt: SpentHeightIndicators.pending };`
`336`	`336`	`}`