Use RetreatLastBlock if blockHeight=stateHeight+1

irisnet · Nov 13, 2018 · aaa26a6 · aaa26a6
1 parent 2c5d88d
commit aaa26a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -55,7 +55,7 @@
 [[override]]
   name = "github.com/tendermint/tendermint"
   source = "https://github.com/irisnet/tendermint.git"
-  version = "=v0.23.1-rc0-iris1"
+  version = "=v0.23.1-rc0-iris2"
 
 [[constraint]]
   name = "github.com/rakyll/statik"

diff --git a/app/app.go b/app/app.go
@@ -372,7 +372,9 @@ func (app *IrisApp) replay() int64 {
 		sm.SaveState(stateDB, preState)
 		loadHeight = preState.LastBlockHeight
 	} else if blockStore.Height() == curState.LastBlockHeight+1 {
-		loadHeight = curState.LastBlockHeight
+		blockStore.RetreatLastBlock()
+		sm.SaveState(stateDB, preState)
+		loadHeight = preState.LastBlockHeight
 	} else {
 		panic(errors.New("tendermint block store height should be at most one ahead of the its state height"))
 	}