[fix] #1076 HEAD change detection

app/lib/other_constants.ts

 export const OtherConstants = {
 
-  MUTE_LOGS_DURING_UNIT_TESTS: true
+  MUTE_LOGS_DURING_UNIT_TESTS: true,
+
+  BC_EVENT: {
+    SWITCHED: 'switched',
+    HEAD_CHANGED: 'newHEAD',
+    RESOLUTION_DONE: 'resolution_done'
+  }
 }
\ No newline at end of file

app/modules/prover/lib/permanentProver.ts

@@ -164,6 +164,9 @@ export class PermanentProver {
                 try {
                   const obj = parsers.parseBlock.syncWrite(dos2unix(this.lastComputedBlock.getRawSigned()));
                   await this.server.writeBlock(obj)
+                  await new Promise(res => {
+                    this.server.once('bcEvent', () => res())
+                  })
                 } catch (err) {
                   this.logger.warn('Proof-of-work self-submission: %s', err.message || err);
                 }

app/modules/prover/lib/proof.ts

@@ -85,7 +85,10 @@ function beginNewProofOfWork(stuff:any) {
     const pair = stuff.pair;
     const forcedTime = stuff.forcedTime;
     currentCPU = conf.cpu || Constants.DEFAULT_CPU;
-    prefix = parseInt(conf.prefix || prefix) * 10 * Constants.NONCE_RANGE
+    prefix = parseInt(conf.prefix || prefix)
+    if (prefix && prefix < Constants.NONCE_RANGE) {
+      prefix *= 10 * Constants.NONCE_RANGE
+    }
     const highMark = stuff.highMark;
     const turnDuration = stuff.turnDuration || TURN_DURATION_IN_MILLISEC
     let sigFunc = null;

app/modules/prover/lib/prover.ts

 "use strict";
 import {PermanentProver} from "./permanentProver"
 import * as stream from "stream"
+import {OtherConstants} from "../../../lib/other_constants"
 
 export class Prover extends stream.Transform {
 
@@ -13,8 +14,9 @@ export class Prover extends stream.Transform {
 
   _write(obj:any, enc:any, done:any) {
     // Never close the stream
-    if (obj && obj.membersCount) {
-      this.permaProver.blockchainChanged(obj);
+    if (obj) {
+      if (obj.bcEvent && obj.bcEvent === OtherConstants.BC_EVENT.HEAD_CHANGED || obj.bcEvent === OtherConstants.BC_EVENT.SWITCHED) {
+        this.permaProver.blockchainChanged(obj.block);
       } else if (obj.nodeIndexInPeers !== undefined) {
         this.permaProver.prover.changePoWPrefix((obj.nodeIndexInPeers + 1) * 10); // We multiply by 10 to give room to computers with < 100 cores
       } else if (obj.cpu !== undefined) {
@@ -27,6 +29,7 @@ export class Prover extends stream.Transform {
           this.permaProver.pullingFinished();
         }
       }
+    }
     done && done();
   };
 

app/service/BlockchainService.ts

@@ -14,6 +14,7 @@ import {FIFOService} from "./FIFOService"
 import {CommonConstants} from "../lib/common-libs/constants"
 import {LOCAL_RULES_FUNCTIONS} from "../lib/rules/local_rules"
 import {Switcher, SwitcherDao} from "../lib/blockchain/Switcher"
+import {OtherConstants} from "../lib/other_constants"
 
 const _               = require('underscore');
 const constants       = require('../lib/constants');
@@ -158,6 +159,11 @@ export class BlockchainService extends FIFOService {
               await this.blockResolution()
               // Resolve the potential forks
               await this.forkResolution()
+              const current = this.current()
+              this.push({
+                bcEvent: OtherConstants.BC_EVENT.RESOLUTION_DONE,
+                block: current
+              })
             })
           })()
         }
@@ -187,6 +193,10 @@ export class BlockchainService extends FIFOService {
         try {
           await this.mainContext.checkAndAddBlock(dto)
           added = true
+          this.push({
+            bcEvent: OtherConstants.BC_EVENT.HEAD_CHANGED,
+            block: dto
+          })
         } catch (e) {
           this.logger.error(e)
           added = false
@@ -204,7 +214,7 @@ export class BlockchainService extends FIFOService {
     const newCurrent = await switcher.tryToFork()
     if (newCurrent) {
       this.push({
-        bcEvent: 'switched',
+        bcEvent: OtherConstants.BC_EVENT.SWITCHED,
         block: newCurrent
       })
     }

server.ts

@@ -21,6 +21,7 @@ import {MembershipDTO} from "./app/lib/dto/MembershipDTO"
 import {RevocationDTO} from "./app/lib/dto/RevocationDTO"
 import {TransactionDTO} from "./app/lib/dto/TransactionDTO"
 import {PeerDTO} from "./app/lib/dto/PeerDTO"
+import {OtherConstants} from "./app/lib/other_constants"
 
 export interface HookableServer {
   getMainEndpoint: (...args:any[]) => Promise<any>
@@ -181,6 +182,10 @@ export class Server extends stream.Duplex implements HookableServer {
     // Messages piping
     this.BlockchainService
       .pipe(es.mapSync((e:any) => {
+        if (e.bcEvent === OtherConstants.BC_EVENT.HEAD_CHANGED || e.bcEvent === OtherConstants.BC_EVENT.SWITCHED) {
+          this.emitDocument(e.block, DuniterDocument.ENTITY_BLOCK)
+          this.emit('bcEvent', e)
+        }
         this.streamPush(e)
       }))
 

test/integration/continuous-proof.js

@@ -93,7 +93,7 @@ describe("Continous proof-of-work", function() {
     yield s1.permaProver.blockchainChanged();
     yield new Promise((resolve) => setTimeout(resolve, 100));
     // * 1 loop for waiting for b#4 but being interrupted
-    s1.permaProver.should.have.property('loops').greaterThanOrEqual(7);
+    s1.permaProver.should.have.property('loops').greaterThanOrEqual(6);
     yield s1.stopBlockComputation();
 
     // If we wait a bit, the loop should be ended