From 82e2e842e5456550fb5cc9de87d1f1b16dd6bcfa Mon Sep 17 00:00:00 2001 From: Lockwarr Date: Thu, 21 Nov 2024 11:14:08 +0200 Subject: [PATCH] feat: upgrade v0.6.8-rc and increase default wasm query gas limit --- app/app.go | 4 ++-- app/upgrades/v068-rc/constants.go | 19 ++++++++++++++++++ app/upgrades/v068-rc/upgrades.go | 33 +++++++++++++++++++++++++++++++ cmd/nolusd/root.go | 2 +- 4 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 app/upgrades/v068-rc/constants.go create mode 100644 app/upgrades/v068-rc/upgrades.go diff --git a/app/app.go b/app/app.go index ee9db3b1..45b273e3 100644 --- a/app/app.go +++ b/app/app.go @@ -53,7 +53,7 @@ import ( "github.com/Nolus-Protocol/nolus-core/app/keepers" appparams "github.com/Nolus-Protocol/nolus-core/app/params" "github.com/Nolus-Protocol/nolus-core/app/upgrades" - v067 "github.com/Nolus-Protocol/nolus-core/app/upgrades/v067" + v068rc "github.com/Nolus-Protocol/nolus-core/app/upgrades/v068-rc" "github.com/Nolus-Protocol/nolus-core/docs" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" @@ -68,7 +68,7 @@ const ( var ( DefaultNodeHome string - Upgrades = []upgrades.Upgrade{v067.Upgrade} + Upgrades = []upgrades.Upgrade{v068rc.Upgrade} ) var ( diff --git a/app/upgrades/v068-rc/constants.go b/app/upgrades/v068-rc/constants.go new file mode 100644 index 00000000..1e61f555 --- /dev/null +++ b/app/upgrades/v068-rc/constants.go @@ -0,0 +1,19 @@ +package v068rc + +import ( + store "cosmossdk.io/store/types" + "github.com/Nolus-Protocol/nolus-core/app/upgrades" +) + +const ( + // UpgradeName defines the on-chain upgrades name. + UpgradeName = "v0.6.8-rc" +) + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateUpgradeHandler, + StoreUpgrades: store.StoreUpgrades{ + Added: []string{}, + }, +} diff --git a/app/upgrades/v068-rc/upgrades.go b/app/upgrades/v068-rc/upgrades.go new file mode 100644 index 00000000..f5d37de0 --- /dev/null +++ b/app/upgrades/v068-rc/upgrades.go @@ -0,0 +1,33 @@ +package v068rc + +import ( + "context" + "fmt" + + "github.com/Nolus-Protocol/nolus-core/app/keepers" + + upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + keepers *keepers.AppKeepers, + codec codec.Codec, +) upgradetypes.UpgradeHandler { + return func(c context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + ctx := sdk.UnwrapSDKContext(c) + + ctx.Logger().Info("Starting module migrations...") + vm, err := mm.RunMigrations(ctx, configurator, vm) //nolint:contextcheck + if err != nil { + return vm, err + } + + ctx.Logger().Info(fmt.Sprintf("Migration {%s} applied", UpgradeName)) + return vm, nil + } +} diff --git a/cmd/nolusd/root.go b/cmd/nolusd/root.go index 7ba6c537..b7a297ed 100644 --- a/cmd/nolusd/root.go +++ b/cmd/nolusd/root.go @@ -108,7 +108,7 @@ var ( { Section: "wasm", Key: "query_gas_limit", - Value: "2000000", + Value: "5000000", }, }