[SeiDB] Fix SS apply changeset version off by 1

storev2/rootmulti/store.go

@@ -91,7 +91,7 @@
 // Commit implements interface Committer, called by ABCI Commit
 func (rs *Store) Commit(bumpVersion bool) types.CommitID {
 	if !bumpVersion {
 		panic("Commit should always bump version in root multistore")
 	}
 	if err := rs.flush(); err != nil {
 		panic(err)
@@ -141,7 +141,7 @@
 // Flush all the pending changesets to commit store.
 func (rs *Store) flush() error {
 	var changeSets []*proto.NamedChangeSet
-	currentVersion := rs.lastCommitInfo.Version
+	currentVersion := rs.lastCommitInfo.Version + 1
 	for key := range rs.ckvStores {
 		// it'll unwrap the inter-block cache
 		store := rs.GetCommitKVStore(key)
@@ -206,8 +206,8 @@
 }
 
 // Implements interface CacheWrapper
 func (rs *Store) CacheWrap(_ types.StoreKey) types.CacheWrap {
 	return rs.CacheMultiStore().(types.CacheWrap)
 }
 
 // Implements interface CacheWrapper
@@ -356,11 +356,11 @@
 	if err := rs.scStore.Initialize(initialStores); err != nil {
 		return err
 	}
 	if version > 0 {
 		_, err := rs.scStore.LoadVersion(version, false)
 		if err != nil {
 			return nil
 		}
 	}
 
 	var treeUpgrades []*proto.TreeNameUpgrade
@@ -494,7 +494,7 @@
 		return sdkerrors.QueryResult(err)
 	}
 	var store types.Queryable
 	var commitInfo *types.CommitInfo
 
 	if !req.Prove && version < rs.lastCommitInfo.Version && rs.ssStore != nil {
 		// Serve abci query from ss store if no proofs needed
@@ -507,13 +507,13 @@
 			return sdkerrors.QueryResult(err)
 		}
 		store = types.Queryable(commitment.NewStore(scStore.GetTreeByName(storeName), rs.logger))
 		commitInfo = convertCommitInfo(scStore.LastCommitInfo())
 		commitInfo = amendCommitInfo(commitInfo, rs.storesParams)
 	} else {
 		// Serve directly from latest sc store
 		store = types.Queryable(commitment.NewStore(rs.scStore.GetTreeByName(storeName), rs.logger))
 		commitInfo = convertCommitInfo(rs.scStore.LastCommitInfo())
 		commitInfo = amendCommitInfo(commitInfo, rs.storesParams)
 	}
 
 	// trim the path and execute the query
@@ -522,9 +522,9 @@
 
 	if !req.Prove || !rootmulti.RequireProof(subPath) {
 		return res
 	} else if commitInfo != nil {
 		// Restore origin path and append proof op.
 		res.ProofOps.Ops = append(res.ProofOps.Ops, commitInfo.ProofOp(storeName))
 	}
 	if res.ProofOps == nil || len(res.ProofOps.Ops) == 0 {
 		return sdkerrors.QueryResult(errors.Wrap(sdkerrors.ErrInvalidRequest, "proof is unexpectedly empty; ensure height has not been pruned"))