From d1e685b4db43baf6f6e90d53c46af16595af7c07 Mon Sep 17 00:00:00 2001
From: Chill Validation <92176880+chillyvee@users.noreply.github.com>
Date: Thu, 8 Jun 2023 08:13:23 +0900
Subject: [PATCH] fix: StateSync Restore by excluding memory store (#16449)

---
 CHANGELOG.md             | 1 +
 store/rootmulti/store.go | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77256c05e9cb..2b0c3efa2a3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -275,6 +275,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+* (store) [#16449](https://github.com/cosmos/cosmos-sdk/pull/16449) Fix StateSync Restore by excluding memory store
 * (cli) [#16312](https://github.com/cosmos/cosmos-sdk/pull/16312) Allow any addresses in `client.ValidatePromptAddress`.
 * (baseapp) [#16259](https://github.com/cosmos/cosmos-sdk/pull/16259) Ensure the `Context` block height is correct after `InitChain` and prior to the second block.
 * (x/staking) [#16043](https://github.com/cosmos/cosmos-sdk/pull/16043) Call `AfterUnbondingInitiated` hook for new unbonding entries only and fix `UnbondingDelegation` entries handling
diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go
index 473c8bc3f715..ca268ce7fe05 100644
--- a/store/rootmulti/store.go
+++ b/store/rootmulti/store.go
@@ -1037,7 +1037,8 @@ func (rs *Store) buildCommitInfo(version int64) *types.CommitInfo {
 	storeInfos := []types.StoreInfo{}
 	for _, key := range keys {
 		store := rs.stores[key]
-		if store.GetStoreType() == types.StoreTypeTransient {
+		storeType := store.GetStoreType()
+		if storeType == types.StoreTypeTransient || storeType == types.StoreTypeMemory {
 			continue
 		}
 		storeInfos = append(storeInfos, types.StoreInfo{