Use the default store loader when an upgrade doesn't need a custom on…

…e. (#1852) (#1853)

* Make sure the store loader isn't nil.

* Add changelog entry.

CHANGELOG.md

@@ -62,6 +62,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Bug Fixes
 
 * Prevent funds from going to or from a marker without the transfer agent having deposit or withdraw access (respectively) [#1834](https://github.com/provenance-io/provenance/issues/1834).
+* Ensure the store loader isn't nil when the handling an upgrade [1852](https://github.com/provenance-io/provenance/pull/1852).
 
 ### API Breaking
 

RELEASE_CHANGELOG.md

@@ -19,6 +19,7 @@
 ### Bug Fixes
 
 * Prevent funds from going to or from a marker without the transfer agent having deposit or withdraw access (respectively) [#1834](https://github.com/provenance-io/provenance/issues/1834).
+* Ensure the store loader isn't nil when the handling an upgrade [1852](https://github.com/provenance-io/provenance/pull/1852).
 
 ### API Breaking
 

app/app.go

@@ -1059,7 +1059,7 @@ func New(
 	}
 
 	// Currently in an upgrade hold for this block.
-	storeLoader := baseapp.DefaultStoreLoader
+	var storeLoader baseapp.StoreLoader
 	if upgradeInfo.Name != "" && upgradeInfo.Height == app.LastBlockHeight()+1 {
 		if app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 			app.Logger().Info("Skipping upgrade based on height",
@@ -1077,6 +1077,9 @@ func New(
 			storeLoader = GetUpgradeStoreLoader(app, upgradeInfo)
 		}
 	}
+	if storeLoader == nil {
+		storeLoader = baseapp.DefaultStoreLoader
+	}
 
 	// Verify configuration settings
 	storeLoader = ValidateWrapper(app.Logger(), appOpts, storeLoader)