Merge pull request #15 from HaoyangLiu/0.23.1-rc0-iris1-hotfix

Add RetreatLastBlock interface for replay

blockchain/store.go

@@ -186,6 +186,19 @@ func (bs *BlockStore) SaveBlock(block *types.Block, blockParts *types.PartSet, s
 	bs.db.SetSync(nil, nil)
 }
 
+func (bs *BlockStore) RetreatLastBlock() {
+	height := bs.height
+
+	bs.db.Delete(calcBlockMetaKey(height))
+	bs.db.Delete(calcBlockCommitKey(height-1))
+	bs.db.Delete(calcSeenCommitKey(height))
+
+	BlockStoreStateJSON{Height: height-1 }.Save(bs.db)
+
+	// Flush
+	bs.db.SetSync(nil, nil)
+}
+
 func (bs *BlockStore) saveBlockPart(height int64, index int, part *types.Part) {
 	if height != bs.Height()+1 {
 		cmn.PanicSanity(cmn.Fmt("BlockStore can only save contiguous blocks. Wanted %v, got %v", bs.Height()+1, height))

consensus/replay_test.go

@@ -629,6 +629,8 @@ func (bs *mockBlockStore) LoadBlockMeta(height int64) *types.BlockMeta {
 func (bs *mockBlockStore) LoadBlockPart(height int64, index int) *types.Part { return nil }
 func (bs *mockBlockStore) SaveBlock(block *types.Block, blockParts *types.PartSet, seenCommit *types.Commit) {
 }
+func (bs *mockBlockStore) RetreatLastBlock() {
+}
 func (bs *mockBlockStore) LoadBlockCommit(height int64) *types.Commit {
 	return bs.commits[height-1]
 }

state/services.go

@@ -65,6 +65,7 @@ type BlockStoreRPC interface {
 type BlockStore interface {
 	BlockStoreRPC
 	SaveBlock(block *types.Block, blockParts *types.PartSet, seenCommit *types.Commit)
+	RetreatLastBlock()
 }
 
 //-----------------------------------------------------------------------------------------------------