Merge pull request bitpay#1867 from micahriggan/fix/syncing-node-issue

micahriggan · web-flow · commit 71b6c08fec82 · 2019-01-06T22:44:52.000-05:00
fix(node): config should use merge, findOneAndUpdate should return new
diff --git a/packages/bitcore-node/src/config.ts b/packages/bitcore-node/src/config.ts
@@ -1,6 +1,7 @@
 import { homedir, cpus } from 'os';
 import parseArgv from './utils/parseArgv';
 import { ConfigType } from './types/Config';
+import * as _ from 'lodash';
 let program = parseArgv([], ['config']);
 
 function findConfig(): ConfigType | undefined {
@@ -76,7 +77,7 @@ const Config = function(): ConfigType {
   };
 
   let foundConfig = findConfig();
-  Object.assign(config, foundConfig, {});
+  config = _.merge(config, foundConfig, {});
   if (!Object.keys(config.chains).length) {
     Object.assign(config.chains, {
       BTC: {
diff --git a/packages/bitcore-node/src/models/block.ts b/packages/bitcore-node/src/models/block.ts
@@ -10,8 +10,7 @@ import { IBlock } from '../types/Block';
 import { SpentHeightIndicators } from '../types/Coin';
 import { EventStorage } from './events';
 import config from '../config';
-import { Event } from '../services/event';
-import { StorageService } from "../services/storage";
+import { StorageService } from '../services/storage';
 
 export { IBlock };
 
@@ -47,17 +46,6 @@ export class BlockModel extends BaseModel<IBlock> {
         }
       }
     }
-
-    Event.blockStream.on('data', (block: IBlock) => {
-      if (block) {
-        const { chain, network, height } = block;
-        this.chainTips[chain] = valueOrDefault(this.chainTips[chain], {});
-        this.chainTips[chain][network] = valueOrDefault(this.chainTips[chain][network], block);
-        if (this.chainTips[chain][network].height < height) {
-          this.chainTips[chain][network] = block;
-        }
-      }
-    });
   }
 
   async addBlock(params: {
@@ -143,9 +131,19 @@ export class BlockModel extends BaseModel<IBlock> {
       EventStorage.signalBlock(convertedBlock);
     }
 
+    this.updateCachedChainTip({ block: convertedBlock, height, chain, network });
     return this.collection.updateOne({ hash: header.hash, chain, network }, { $set: { processed: true } });
   }
 
+  updateCachedChainTip(params: { block; chain; network; height }) {
+    const { chain, network, block, height } = params;
+    this.chainTips[chain] = valueOrDefault(this.chainTips[chain], {});
+    this.chainTips[chain][network] = valueOrDefault(this.chainTips[chain][network], block);
+    if (this.chainTips[chain][network].height < height) {
+      this.chainTips[chain][network] = block;
+    }
+  }
+
   getPoolInfo(coinbase: string) {
     //TODO need to make this actually parse the coinbase input and map to miner strings
     // also should go somewhere else
diff --git a/packages/bitcore-node/src/models/state.ts b/packages/bitcore-node/src/models/state.ts
@@ -20,7 +20,7 @@ export class StateModel extends BaseModel<IState> {
     return this.collection.findOneAndUpdate(
       {},
       { $setOnInsert: { created: new Date()}},
-      { upsert: true }
+      { upsert: true, returnOriginal: false }
     );
   }
 
diff --git a/packages/bitcore-node/test/unit/models/block.unit.ts b/packages/bitcore-node/test/unit/models/block.unit.ts
@@ -12,14 +12,15 @@ import { ObjectID } from 'mongodb';
 import { MongoBound } from '../../../src/models/base';
 
 describe('Block Model', function() {
+  let addBlockParams = {
+    chain: 'BTC',
+    network: 'regtest',
+    block: TEST_BLOCK,
+    height: 1355,
+    initialSyncComplete: false
+  };
+
   describe('addBlock', () => {
-    let addBlockParams = {
-      chain: 'BTC',
-      network: 'regtest',
-      block: TEST_BLOCK,
-      height: 1355,
-      initialSyncComplete: false
-    };
     let sandbox;
     beforeEach(() => {
       sandbox = sinon.sandbox.create();
@@ -58,7 +59,7 @@ describe('Block Model', function() {
       const { query, options } = Storage.getFindOptions<MongoBound<IBlock>>(BlockStorage, {
         since: id,
         paging: '_id',
-        limit: 100,
+        limit: 100
       });
       expect(options.sort).to.be.deep.eq({ _id: -1 });
       expect(options.limit).to.be.eq(100);
@@ -87,11 +88,13 @@ describe('Block Model', function() {
     afterEach(() => {
       sandbox.restore();
     });
-    it('should return null if there are no blocks', async () => {
+    it('should return the new tip', async () => {
       mockStorage(null);
       const params = { chain: 'BTC', network: 'regtest' };
       const result = await ChainStateProvider.getLocalTip(params);
-      expect(result).to.deep.equal(null);
+      expect(result.height).to.deep.equal(addBlockParams.height + 1);
+      expect(result.chain).to.deep.equal(addBlockParams.chain);
+      expect(result.network).to.deep.equal(addBlockParams.network);
     });
   });
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ export class StateModel extends BaseModel<IState> {`
`20`	`20`	`return this.collection.findOneAndUpdate(`
`21`	`21`	`{},`
`22`	`22`	`{ $setOnInsert: { created: new Date()}},`
`23`		`- { upsert: true }`
	`23`	`+ { upsert: true, returnOriginal: false }`
`24`	`24`	`);`
`25`	`25`	`}`
`26`	`26`