From eda6721e313efcb97ee5101b69d25cd3ea3822fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Jan 2024 19:25:48 -0800 Subject: [PATCH 1/2] chore(deps): bump google.golang.org/grpc from 1.60.1 to 1.61.0 (#367) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.60.1 to 1.61.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.60.1...v1.61.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f05014d9..6f77fabb 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 - google.golang.org/grpc v1.60.1 + google.golang.org/grpc v1.61.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.5.1 mvdan.cc/gofumpt v0.5.0 diff --git a/go.sum b/go.sum index 828b5913..1d6b9a8e 100644 --- a/go.sum +++ b/go.sum @@ -2204,8 +2204,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= -google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= +google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= From e90242cda22ddc9fd5571b8b37a2e35d694db3b3 Mon Sep 17 00:00:00 2001 From: Adam Wozniak <29418299+adamewozniak@users.noreply.github.com> Date: Tue, 30 Jan 2024 11:50:29 -0800 Subject: [PATCH 2/2] chore: remove old rc upgrades (#369) * chore: remove v0.3.0-rc upgrades * Update app/upgrades.go --- app/upgrades.go | 66 ------------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/app/upgrades.go b/app/upgrades.go index e5b84867..81aa074b 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -35,12 +35,6 @@ func (app App) RegisterUpgradeHandlers() { app.registerUpgrade0_2_1(upgradeInfo) app.registerUpgrade0_2_2(upgradeInfo) app.registerUpgrade0_3_0(upgradeInfo) - app.registerUpgrade0_3_0Rc2(upgradeInfo) - app.registerUpgrade0_3_0Rc3(upgradeInfo) - app.registerUpgrade0_3_0Rc4(upgradeInfo) - app.registerUpgrade0_3_0Rc5(upgradeInfo) - app.registerUpgrade0_3_0Rc6(upgradeInfo) - app.registerUpgrade0_3_0Rc7(upgradeInfo) } // performs upgrade from v0.1.3 to v0.1.4 @@ -156,66 +150,6 @@ func (app *App) registerUpgrade0_3_0(upgradeInfo upgradetypes.Plan) { }) } -func (app *App) registerUpgrade0_3_0Rc2(_ upgradetypes.Plan) { - const planName = "v0.3.0-rc2" - app.UpgradeKeeper.SetUpgradeHandler(planName, - func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Upgrade handler execution", "name", planName) - return app.mm.RunMigrations(ctx, app.configurator, fromVM) - }, - ) -} - -func (app *App) registerUpgrade0_3_0Rc3(_ upgradetypes.Plan) { - const planName = "v0.3.0-rc3" - app.UpgradeKeeper.SetUpgradeHandler(planName, - func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Upgrade handler execution", "name", planName) - return app.mm.RunMigrations(ctx, app.configurator, fromVM) - }, - ) -} - -func (app *App) registerUpgrade0_3_0Rc4(_ upgradetypes.Plan) { - const planName = "v0.3.0-rc4" - app.UpgradeKeeper.SetUpgradeHandler(planName, - func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Upgrade handler execution", "name", planName) - return app.mm.RunMigrations(ctx, app.configurator, fromVM) - }, - ) -} - -func (app *App) registerUpgrade0_3_0Rc5(_ upgradetypes.Plan) { - const planName = "v0.3.0-rc5" - app.UpgradeKeeper.SetUpgradeHandler(planName, - func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Upgrade handler execution", "name", planName) - return app.mm.RunMigrations(ctx, app.configurator, fromVM) - }, - ) -} - -func (app *App) registerUpgrade0_3_0Rc6(_ upgradetypes.Plan) { - const planName = "v0.3.0-rc6" - app.UpgradeKeeper.SetUpgradeHandler(planName, - func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Upgrade handler execution", "name", planName) - return app.mm.RunMigrations(ctx, app.configurator, fromVM) - }, - ) -} - -func (app *App) registerUpgrade0_3_0Rc7(_ upgradetypes.Plan) { - const planName = "v0.3.0-rc7" - app.UpgradeKeeper.SetUpgradeHandler(planName, - func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Upgrade handler execution", "name", planName) - return app.mm.RunMigrations(ctx, app.configurator, fromVM) - }, - ) -} - // helper function to check if the store loader should be upgraded func (app *App) storeUpgrade(planName string, ui upgradetypes.Plan, stores storetypes.StoreUpgrades) { if ui.Name == planName && !app.UpgradeKeeper.IsSkipHeight(ui.Height) {