update miner dynasty logic

nebulasio · Apr 15, 2019 · 9a6703f · 9a6703f
1 parent 9da6d80
commit 9a6703f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/consensus/dpos/dpos_state.go b/consensus/dpos/dpos_state.go
@@ -233,7 +233,7 @@ func (ds *State) NextConsensusState(elapsedSecond int64, worldState state.WorldS
 			"timestamp": ds.timestamp,
 		}).Fatal("Type conversion failed, unexpected error.")
 	}
-	nextTimestamp := ds.timestamp + BlockIntervalInMs/SecondInMs
+	nextTimestamp := ds.timestamp + elapsedSecond
 	dynastyTrie, err := dpos.dynasty.getDynasty(nextTimestamp)
 	if err != nil {
 		return nil, err

diff --git a/consensus/dpos/dynasty.go b/consensus/dpos/dynasty.go
@@ -174,18 +174,21 @@ func (d *Dynasty) getDynasty(timestamp int64) (*trie.Trie, error) {
 
 	if dt == nil {
 		logging.CLog().WithFields(logrus.Fields{
+			"genesis":    d.genesisTimestamp,
 			"interval":   interval,
 			"timestamp":  timestamp,
 			"tmpDynasty": tmpDynasty,
 			"curDynasty": curDynasty,
 		}).Fatal("Failed to get dynasty with current genesis and dynasty.")
 	}
 
-	//logging.VLog().WithFields(logrus.Fields{
-	//	"timestamp":  timestamp,
-	//	"curDynasty": curDynasty,
-	//	"dt":         dt,
-	//}).Debug("dynasty info.")
+	logging.VLog().WithFields(logrus.Fields{
+		"interval":   interval,
+		"tmpDynasty": tmpDynasty,
+		"timestamp":  timestamp,
+		"curDynasty": curDynasty,
+		"dt":         dt,
+	}).Debug("dynasty info.")
 
 	dynastyTrie, err := dt.Clone()
 	if err != nil {