Merge pull request #147 from binance-chain/add_set_version

set version

Gopkg.toml

@@ -50,7 +50,7 @@
 [[override]]
   name = "github.com/tendermint/iavl"
   source = "github.com/binance-chain/bnc-tendermint-iavl"
-  branch = "release/v0.12.0-binance.1"
+  branch = "add_set_version"
 #  version = "=v0.12.0-binance.0"
 
 [[override]]

server/mock/store.go

@@ -14,6 +14,10 @@ type multiStore struct {
 	kv map[sdk.StoreKey]kvStore
 }
 
+func (ms multiStore) SetVersion(version int64) {
+	panic("not implemented")
+}
+
 func (ms multiStore) CacheMultiStore() sdk.CacheMultiStore {
 	panic("not implemented")
 }

store/iavlstore.go

@@ -70,6 +70,10 @@ func (st *IavlStore) GetImmutableTree() *iavl.ImmutableTree {
 	return st.Tree.ImmutableTree
 }
 
+func (st *IavlStore) SetVersion(version int64) {
+	st.Tree.SetVersion(version)
+}
+
 // Implements Committer.
 func (st *IavlStore) Commit() CommitID {
 	// Save a new version.

store/rootmultistore.go

@@ -199,6 +199,9 @@ func (rs *rootMultiStore) LastCommitID() CommitID {
 	return rs.lastCommitID
 }
 
+// Implements Committer/CommitStore.
+func (rs *rootMultiStore) SetVersion(version int64) {}
+
 // Implements Committer/CommitStore.
 func (rs *rootMultiStore) Commit() CommitID {
 	version := rs.lastCommitID.Version + 1
@@ -476,6 +479,11 @@ func commitStores(version int64, storeMap map[StoreKey]CommitStore) CommitInfo {
 			continue
 		}
 
+		// set version for store to commit, just to keep the same as the other stores
+		if sdk.ShouldSetStoreVersion(key.Name()) {
+			store.SetVersion(version - 1)
+		}
+
 		// Commit
 		commitID := store.Commit()
 

store/transientstore.go

@@ -1,8 +1,9 @@
 package store
 
 import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	dbm "github.com/tendermint/tendermint/libs/db"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 var _ KVStore = (*transientStore)(nil)
@@ -33,6 +34,9 @@ func (ts *transientStore) LastCommitID() (id CommitID) {
 	return
 }
 
+// Implements CommitStore
+func (ts *transientStore) SetVersion(version int64) {}
+
 // Implements KVStore
 func (ts *transientStore) Prefix(prefix []byte) KVStore {
 	return prefixStore{ts, prefix}

types/store.go

@@ -36,6 +36,7 @@ type Committer interface {
 	Commit() CommitID
 	LastCommitID() CommitID
 	SetPruning(PruningStrategy)
+	SetVersion(version int64)
 }
 
 // Stores of MultiStore must implement CommitStore.

types/upgrade.go

@@ -155,6 +155,15 @@ func ShouldCommitStore(storeKeyName string) bool {
 	return UpgradeMgr.GetHeight() >= storeKeyHeight
 }
 
+func ShouldSetStoreVersion(storeKeyName string) bool {
+	storeKeyHeight := UpgradeMgr.GetStoreKeyHeight(storeKeyName)
+	if storeKeyHeight == 0 {
+		return false
+	}
+
+	return UpgradeMgr.GetHeight() == storeKeyHeight
+}
+
 func IsMsgTypeSupported(msgType string) bool {
 	msgTypeHeight := UpgradeMgr.GetMsgTypeHeight(msgType)
 	if msgTypeHeight == 0 {