Backport cosmos#13530

Switcheo · Dec 1, 2022 · 3724930 · 3724930
1 parent 64b84ff
commit 3724930
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go
@@ -967,7 +967,16 @@ func commitStores(version int64, storeMap map[types.StoreKey]types.CommitKVStore
 	storeInfos := make([]types.StoreInfo, 0, len(storeMap))
 
 	for key, store := range storeMap {
-		commitID := store.Commit()
+		last := store.LastCommitID()
+
+		// If a commit event execution is interrupted, a new iavl store's version will be larger than the rootmulti's metadata, when the block is replayed, we should avoid committing that iavl store again.
+		var commitID types.CommitID
+		if last.Version >= version {
+			last.Version = version
+			commitID = last
+		} else {
+			commitID = store.Commit()
+		}
 
 		if store.GetStoreType() == types.StoreTypeTransient {
 			continue