chore: Add check for uneven stores' height

store/rootmulti/store.go

@@ -246,6 +246,8 @@ func (rs *Store) loadVersion(ver int64, upgrades *types.StoreUpgrades) error {
  // If it has been added, set the initial version
  if upgrades.IsAdded(key.Name()) {
  storeParams.initialVersion = uint64(ver) + 1
+ } else if commitID.Version != ver {
+ return fmt.Errorf("version of store %s mismatch root store's version", key.Name())
  }
 
  store, err := rs.loadCommitStoreFromParams(key, commitID, storeParams)

store/rootmulti/store_test.go

@@ -605,6 +605,30 @@ func TestMultiStore_PruningRestart(t *testing.T) {
  }
 }
 
+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))