Merge branch 'main' into dwedul/1760-fix-cmd-tests

# Conflicts:
#	.github/workflows/test.yml

.github/workflows/test.yml

@@ -52,7 +52,6 @@ jobs:
         # TODO[1760]: Re-analyze how long tests tests take and change the splitting back to be based on speed.
         run: |
           grep -vF \
-            -e 'github.com/provenance-io/provenance/app' \
             -e 'github.com/provenance-io/provenance/internal/antewrapper' \
             -e 'github.com/provenance-io/provenance/x/ibchooks' \
             -e 'github.com/provenance-io/provenance/x/ibcratelimit/module' \
@@ -61,7 +60,6 @@ jobs:
             pkgs.txt > pkgs.txt.tmp
           split -d -n l/3 pkgs.txt.tmp pkgs.txt.part.
           printf '%s\n' \
-            'github.com/provenance-io/provenance/app' \
             'github.com/provenance-io/provenance/internal/antewrapper' \
             'github.com/provenance-io/provenance/x/ibchooks' \
             'github.com/provenance-io/provenance/x/ibcratelimit/module' \

CHANGELOG.md

@@ -65,6 +65,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
   *  Msgfees module param migration [#1936](https://github.com/provenance-io/provenance/pull/1936).
   *  Name module param migration [#1937](https://github.com/provenance-io/provenance/pull/1937).
   *  IbcHooks module param migration [#1939](https://github.com/provenance-io/provenance/pull/1939).
+  *  Bank module param migration [#1967](https://github.com/provenance-io/provenance/pull/1967).
 * Restore the hold module [#1930](https://github.com/provenance-io/provenance/pull/1930).
 * Restore gov-prop cli commands and fix next key decoding [#1930](https://github.com/provenance-io/provenance/pull/1930).
 * Switch to InputOutputCoinsProv for exchange transfers [#1930](https://github.com/provenance-io/provenance/pull/1930).

app/upgrades.go

@@ -314,20 +314,18 @@ func migrateBaseappParams(ctx sdk.Context, app *App) error {
 // won't run on its own. This is the only part of that migration that we still need to have
 // done, and this brings us in-line with format the bank state on v4.
 // TODO: delete with the umber handlers.
-func migrateBankParams(ctx sdk.Context, app *App) (err error) {
+func migrateBankParams(ctx sdk.Context, app *App) error {
 	ctx.Logger().Info("Migrating bank params.")
-	defer func() {
-		if err != nil {
-			ctx.Logger().Error(fmt.Sprintf("Unable to migrate bank params, error: %s.", err))
-		}
-		ctx.Logger().Info("Done migrating bank params.")
-	}()
 
-	bankParamsSpace, ok := app.ParamsKeeper.GetSubspace(banktypes.ModuleName)
-	if !ok {
-		return fmt.Errorf("params subspace not found: %q", banktypes.ModuleName)
+	bankParams := banktypes.Params{DefaultSendEnabled: true}
+	err := app.BankKeeper.SetParams(ctx, bankParams)
+	if err != nil {
+		ctx.Logger().Error(fmt.Sprintf("Unable to migrate bank params, error: %s.", err))
+		return fmt.Errorf("could not store new bank params: %w", err)
 	}
-	return app.BankKeeper.MigrateParamsProv(ctx, bankParamsSpace)
+
+	ctx.Logger().Info("Done migrating bank params.")
+	return nil
 }
 
 // migrateAttributeParams migrates to new Attribute Params store