Merge pull request #597 from HaoyangLiu/release0.6

IRISHUB-710: fix wrong example command and add log in replay
irisnet · Nov 14, 2018 · a802a7e · a802a7e
2 parents b38f464 + 8a57bcf
commit a802a7e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/app.go b/app/app.go
@@ -369,9 +369,13 @@ func (app *IrisApp) replay() int64 {
 	}
 	var loadHeight int64
 	if blockStore.Height() == curState.LastBlockHeight {
+		app.Logger.Info(fmt.Sprintf("blockstore height equals to current state height %d", curState.LastBlockHeight))
+		app.Logger.Info("Just reset state DB to last height")
 		sm.SaveState(stateDB, preState)
 		loadHeight = preState.LastBlockHeight
 	} else if blockStore.Height() == curState.LastBlockHeight+1 {
+		app.Logger.Info(fmt.Sprintf("blockstore height %d, current state height %d", blockStore.Height(), curState.LastBlockHeight))
+		app.Logger.Info(fmt.Sprintf("Retreat block %d in block store and reset state DB to last height", blockStore.Height()))
 		blockStore.RetreatLastBlock()
 		sm.SaveState(stateDB, preState)
 		loadHeight = preState.LastBlockHeight

diff --git a/version/version.go b/version/version.go
@@ -7,7 +7,7 @@ import (
 )
 
 // Version - Iris Version
-const Version = "0.6.1"
+const Version = "0.6.2"
 
 // GitCommit set by build flags
 var GitCommit = ""