merge develop to main (#703)

medibloc · Jul 2, 2024 · 90ed12f · 90ed12f
1 parent 73dfc5d
commit 90ed12f
Show file tree

Hide file tree

Showing 9 changed files with 196 additions and 331 deletions.
diff --git a/.gitbook/guide/installation.md b/.gitbook/guide/installation.md
@@ -12,15 +12,15 @@ please clone the `panacea-core` project and build it.
 
 ```bash
 # Make sure to checkout the correct branch.
-git clone -b v2.2.0 https://github.com/medibloc/panacea-core
+git clone -b v2.2.1 https://github.com/medibloc/panacea-core
 cd panacea-core
 make install  # All binaries are installed in $GOPATH/bin
 ```
 
 Verify that the `panacead` binary is installed successfully.
 ```bash
 $ panacead version
-2.2.0
+2.2.1
 ```
 
 ## Import `panacea-core` as a Go dependency

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## [v2.2.1](https://github.com/medibloc/panacea-core/releases/tag/v2.2.1) - 2024-07-01
+
+### Improvements
+- [\#700](https://github.com/medibloc/panacea-core/pull/700) feat: Bump cosmos-sdk and ibc-go modules, update gov module's config size
+
 ## [v2.2.0](https://github.com/medibloc/panacea-core/releases/tag/v2.2.0) - 2024-03-14
 
 ### Improvements

diff --git a/app/app.go b/app/app.go
@@ -102,6 +102,7 @@ import (
 	"github.com/medibloc/panacea-core/v2/app/upgrades/v2_0_6"
 	"github.com/medibloc/panacea-core/v2/app/upgrades/v2_0_7"
 	"github.com/medibloc/panacea-core/v2/app/upgrades/v2_2_0"
+	"github.com/medibloc/panacea-core/v2/app/upgrades/v2_2_1"
 )
 
 const Name = "panacea"
@@ -174,6 +175,7 @@ var (
 		v2_0_6.Upgrade,
 		v2_0_7.Upgrade,
 		v2_2_0.Upgrade,
+		v2_2_1.Upgrade,
 	}
 )
 

diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -178,13 +178,11 @@ func (appKeepers *AppKeepersWithKey) InitKeyAndKeepers(
 		appCodec, appKeepers.keys[ibcexported.StoreKey], appKeepers.GetSubspace(ibcexported.ModuleName), appKeepers.StakingKeeper, appKeepers.UpgradeKeeper, appKeepers.ScopedIBCKeeper,
 	)
 
-	/*
-		Example of setting gov params:
-		govConfig.MaxMetadataLen = 10000
-	*/
+	govConfig := govtypes.DefaultConfig()
+	govConfig.MaxMetadataLen = 10200
 	appKeepers.GovKeeper = *govkeeper.NewKeeper(
 		appCodec, appKeepers.keys[govtypes.StoreKey], appKeepers.AccountKeeper, appKeepers.BankKeeper,
-		appKeepers.StakingKeeper, bApp.MsgServiceRouter(), govtypes.DefaultConfig(), authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		appKeepers.StakingKeeper, bApp.MsgServiceRouter(), govConfig, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
 	// Create Transfer Keepers

diff --git a/app/upgrades.go b/app/upgrades.go
diff --git a/app/upgrades/v2_2_1/types.go b/app/upgrades/v2_2_1/types.go
@@ -0,0 +1,12 @@
+package v2_2_1
+
+import (
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	"github.com/medibloc/panacea-core/v2/app/upgrades"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          "v2.2.1",
+	CreateUpgradeHandler: CreateUpgradeHandle,
+	StoreUpgrades:        storetypes.StoreUpgrades{},
+}
diff --git a/app/upgrades/v2_2_1/upgrade.go b/app/upgrades/v2_2_1/upgrade.go
@@ -0,0 +1,14 @@
+package v2_2_1
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	"github.com/medibloc/panacea-core/v2/app/keepers"
+)
+
+func CreateUpgradeHandle(mm *module.Manager, configurator module.Configurator, keepers *keepers.AppKeepersWithKey) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, configurator, fromVM)
+	}
+}