added timstamp to root chain info update

Author: andrewnguyen22

bft/bft.go

@@ -126,6 +126,7 @@ func (b *BFT) Start() {
 				since := time.Since(resetBFT.StartTime)
 				// allow if 'since' is less than 1 block old
 				if int(since.Milliseconds()) < b.Config.BlockTimeMS() {
+					b.log.Infof("Using included timestamp to calculate process time: %s", resetBFT.StartTime.String())
 					processTime = since
 				}
 				// if is a root-chain update reset back to round 0 but maintain locks to prevent 'fork attacks'
@@ -897,7 +898,7 @@ type (
 		// LoadCertificate() gets the Quorum Certificate from the chainId-> plugin at a certain height
 		LoadCertificate(height uint64) (*lib.QuorumCertificate, lib.ErrorI)
 		// CommitCertificate() commits a block to persistence
-		CommitCertificate(qc *lib.QuorumCertificate, block *lib.Block, blockResult *lib.BlockResult) (err lib.ErrorI)
+		CommitCertificate(qc *lib.QuorumCertificate, block *lib.Block, blockResult *lib.BlockResult, ts uint64) (err lib.ErrorI)
 		// GossipBlock() is a P2P call to gossip a completed Quorum Certificate with a Proposal
 		GossipBlock(certificate *lib.QuorumCertificate, sender []byte, timestamp uint64)
 		// SendToSelf() is a P2P call to directly send  a completed Quorum Certificate to self

bft/mock_test.go

@@ -497,7 +497,7 @@ type testController struct {
 	sendToReplicasChan chan lib.Signable
 }
 
-func (t *testController) CommitCertificate(qc *lib.QuorumCertificate, block *lib.Block, blockResult *lib.BlockResult) (err lib.ErrorI) {
+func (t *testController) CommitCertificate(qc *lib.QuorumCertificate, block *lib.Block, blockResult *lib.BlockResult, ts uint64) (err lib.ErrorI) {
 	return nil
 }
 

controller/block.go

@@ -234,7 +234,7 @@ func (c *Controller) ValidateProposal(rcBuildHeight uint64, qc *lib.QuorumCertif
 // - re-checks all transactions in mempool
 // - atomically writes all to the underlying db
 // - sets up the controller for the next height
-func (c *Controller) CommitCertificate(qc *lib.QuorumCertificate, block *lib.Block, blockResult *lib.BlockResult) (err lib.ErrorI) {
+func (c *Controller) CommitCertificate(qc *lib.QuorumCertificate, block *lib.Block, blockResult *lib.BlockResult, ts uint64) (err lib.ErrorI) {
 	start := time.Now()
 	// cancel any running mempool check
 	c.Mempool.stop()
@@ -319,6 +319,8 @@ func (c *Controller) CommitCertificate(qc *lib.QuorumCertificate, block *lib.Blo
 			}
 			continue
 		}
+		// set the timestamp
+		info.Timestamp = ts
 		// publish root chain information
 		go c.RCManager.Publish(id, info)
 	}
@@ -567,7 +569,7 @@ func (c *Controller) HandlePeerBlock(msg *lib.BlockMessage, syncing bool) (*lib.
 		result = nil
 	}
 	// attempts to commit the QC to persistence of chain by playing it against the state machine
-	if err = c.CommitCertificate(qc, block, result); err != nil {
+	if err = c.CommitCertificate(qc, block, result, msg.Time); err != nil {
 		// exit with error
 		return nil, err
 	}

controller/controller.go

@@ -153,21 +153,26 @@ func (c *Controller) Stop() {
 // UpdateRootChainInfo() receives updates from the root-chain thread
 func (c *Controller) UpdateRootChainInfo(info *lib.RootChainInfo) {
 	c.log.Debugf("Updating root chain info")
-	//defer lib.TimeTrack(c.log, time.Now())
 	// ensure this root chain is active
 	activeRootChainId, _ := c.FSM.GetRootChainId()
 	// if inactive
 	if activeRootChainId != info.RootChainId {
 		c.log.Debugf("Detected inactive root-chain update at rootChainId=%d", info.RootChainId)
 		return
 	}
+	// set timestamp if included
+	var timestamp time.Time
+	// if timestamp is not 0
+	if info.Timestamp != 0 {
+		timestamp = time.UnixMicro(int64(info.Timestamp))
+	}
 	// if the last validator set is empty
 	if info.LastValidatorSet == nil || len(info.LastValidatorSet.ValidatorSet) == 0 {
 		// signal to reset consensus and start a new height
-		c.Consensus.ResetBFT <- bft.ResetBFT{IsRootChainUpdate: false}
+		c.Consensus.ResetBFT <- bft.ResetBFT{IsRootChainUpdate: false, StartTime: timestamp}
 	} else {
 		// signal to reset consensus
-		c.Consensus.ResetBFT <- bft.ResetBFT{IsRootChainUpdate: true}
+		c.Consensus.ResetBFT <- bft.ResetBFT{IsRootChainUpdate: true, StartTime: timestamp}
 	}
 	// update the peer 'must connect'
 	c.UpdateP2PMustConnect(info.ValidatorSet)

lib/.proto/consensus.proto

@@ -166,4 +166,6 @@ message RootChainInfo {
   LotteryWinner lottery_winner = 5; // @gotags: json:"lotteryWinner"
   // orders: the swap order book from the 'root chain' for the 'nested chain'
   OrderBook orders = 6; // @gotags: json:"orders"
+  // timestamp: a timestamp of when the notification should cause a reset
+  uint64 timestamp = 7;
 }