chore: Add check for uneven stores' height

store/rootmulti/store.go

@@ -156,11 +156,7 @@ func (rs *Store) MountStoreWithDB(key types.StoreKey, typ types.StoreType, db db
  if _, ok := rs.keysByName[key.Name()]; ok {
  panic(fmt.Sprintf("store duplicate store key name %v", key))
  }
- rs.storesParams[key] = storeParams{
- key: key,
- typ: typ,
- db: db,
- }
+ rs.storesParams[key] = NewStoreParams(key, db, typ, 0)
  rs.keysByName[key.Name()] = key
 }
 
@@ -254,8 +250,10 @@ func (rs *Store) loadVersion(ver int64, upgrades *types.StoreUpgrades) error {
  commitID := rs.getCommitID(infos, key.Name())
 
  // If it has been added, set the initial version
- if upgrades.IsAdded(key.Name()) {
+ if upgrades.IsAdded(key.Name()) || upgrades.RenamedFrom(key.Name()) != "" {
  storeParams.initialVersion = uint64(ver) + 1
+ } else if commitID.Version != ver && storeParams.typ == types.StoreTypeIAVL {
+ return fmt.Errorf("version of store %s mismatch root store's version; expect %d got %d", key.Name(), ver, commitID.Version)
  }
 
  store, err := rs.loadCommitStoreFromParams(key, commitID, storeParams)
@@ -275,8 +273,7 @@ func (rs *Store) loadVersion(ver int64, upgrades *types.StoreUpgrades) error {
  // handle renames specially
  // make an unregistered key to satisfy loadCommitStore params
  oldKey := types.NewKVStoreKey(oldName)
- oldParams := storeParams
- oldParams.key = oldKey
+ oldParams := NewStoreParams(oldKey, storeParams.db, storeParams.typ, 0)
 
  // load from the old name
  oldStore, err := rs.loadCommitStoreFromParams(oldKey, rs.getCommitID(infos, oldName), oldParams)
@@ -1039,6 +1036,15 @@ type storeParams struct {
  initialVersion uint64
 }
 
+func NewStoreParams(key types.StoreKey, db dbm.DB, typ types.StoreType, initialVersion uint64) storeParams { // nolint
+ return storeParams{
+ key: key,
+ db: db,
+ typ: typ,
+ initialVersion: initialVersion,
+ }
+}
+
 func GetLatestVersion(db dbm.DB) int64 {
  bz, err := db.Get([]byte(latestVersionKey))
  if err != nil {

store/rootmulti/store_test.go

@@ -271,6 +271,12 @@ func TestMultistoreLoadWithUpgrade(t *testing.T) {
  require.Equal(t, migratedID.Version, int64(2))
 
  reload, _ := newMultiStoreWithModifiedMounts(db, pruningtypes.NewPruningOptions(pruningtypes.PruningNothing))
+ // unmount store3 since store3 was deleted
+ unmountStore(reload, "store3")
+
+ rs3, _ := reload.GetStoreByName("store3").(types.KVStore)
+ require.Nil(t, rs3)
+
  err = reload.LoadLatestVersion()
  require.Nil(t, err)
  require.Equal(t, migratedID, reload.LastCommitID())
@@ -606,6 +612,32 @@ func TestMultiStore_PruningRestart(t *testing.T) {
  }
 }
 
+// TestUnevenStoresHeightCheck tests if loading root store correctly errors when
+// there's any module store with the wrong height
+func TestUnevenStoresHeightCheck(t *testing.T) {
+ var db dbm.DB = dbm.NewMemDB()
+ store := newMultiStoreWithMounts(db, pruningtypes.NewPruningOptions(pruningtypes.PruningNothing))
+ err := store.LoadLatestVersion()
+ require.Nil(t, err)
+
+ // commit to increment store's height
+ store.Commit()
+
+ // mount store4 to root store
+ store.MountStoreWithDB(types.NewKVStoreKey("store4"), types.StoreTypeIAVL, nil)
+
+ // load the stores without upgrades
+ err = store.LoadLatestVersion()
+ require.Error(t, err)
+
+ // now, let's load with upgrades...
+ upgrades := &types.StoreUpgrades{
+ Added: []string{"store4"},
+ }
+ err = store.LoadLatestVersionAndUpgrade(upgrades)
+ require.Nil(t, err)
+}
+
 func TestSetInitialVersion(t *testing.T) {
  db := dbm.NewMemDB()
  multi := newMultiStoreWithMounts(db, pruningtypes.NewPruningOptions(pruningtypes.PruningNothing))
@@ -866,6 +898,13 @@ func newMultiStoreWithModifiedMounts(db dbm.DB, pruningOpts pruningtypes.Pruning
  return store, upgrades
 }
 
+func unmountStore(rootStore *Store, storeKeyName string) {
+ sk := rootStore.keysByName[storeKeyName]
+ delete(rootStore.stores, sk)
+ delete(rootStore.storesParams, sk)
+ delete(rootStore.keysByName, storeKeyName)
+}
+
 func checkStore(t *testing.T, store *Store, expect, got types.CommitID) {
  require.Equal(t, expect, got)
  require.Equal(t, expect, store.LastCommitID())

x/upgrade/types/storeloader_test.go

@@ -147,11 +147,6 @@ func TestSetLoader(t *testing.T) {
  res := app.Commit()
  require.NotNil(t, res.Data)
 
- // checking the case of the store being renamed
- if tc.setLoader != nil {
- checkStore(t, db, upgradeHeight, tc.origStoreKey, k, nil)
- }
-
  // check db is properly updated
  checkStore(t, db, upgradeHeight, tc.loadStoreKey, k, v)
  })