From bf2b2a3d8888b61849ff3e191997621f3321ade4 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Fri, 23 Jun 2023 00:39:05 +0200 Subject: [PATCH 01/10] feat: add GB drain upgrade handler --- app/upgrades.go | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/upgrades.go b/app/upgrades.go index 28f7e86e3a..f18560ff21 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -3,6 +3,13 @@ package app import ( "cosmossdk.io/errors" "github.com/CosmWasm/wasmd/x/wasm" + ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" + icagenesis "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/genesis/types" + icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" + ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" + bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" + storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -15,12 +22,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/nft" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" - icagenesis "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/genesis/types" - icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" "github.com/umee-network/umee/v5/app/upgradev3" "github.com/umee-network/umee/v5/app/upgradev3x3" @@ -53,9 +54,17 @@ func (app UmeeApp) RegisterUpgradeHandlers(bool) { app.registerUpgrade("v4.4", upgradeInfo) app.registerUpgrade("v5.0", upgradeInfo, ugov.ModuleName, wasm.ModuleName) app.registerUpgrade("v5.1-alpha1", upgradeInfo, incentive.ModuleName) + app.registerUpgrade5_1(upgradeInfo) // TODO: set correct 5.1 name and add borrowFactor migration } +func (app *UmeeApp) registerUpgrade5_1(upgradeInfo upgradetypes.Plan) { + app.UpgradeKeeper.SetUpgradeHandler(upgradeInfo.Name, + func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + return fromVM, app.GravityKeeper.MigrateFundsToDrainAccount(ctx, sdk.MustAccAddressFromBech32("the_drain_account")) + }) +} + // performs upgrade from v4.2 to v4.3 func (app *UmeeApp) registerUpgrade4_3(upgradeInfo upgradetypes.Plan) { const planName = "v4.3" From 0e93d5972dc3eeddd4ff5676e4165c2248da420f Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Fri, 23 Jun 2023 11:41:52 +0200 Subject: [PATCH 02/10] fix --- app/upgrades.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/upgrades.go b/app/upgrades.go index f18560ff21..b6e38f8d12 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -59,9 +59,13 @@ func (app UmeeApp) RegisterUpgradeHandlers(bool) { } func (app *UmeeApp) registerUpgrade5_1(upgradeInfo upgradetypes.Plan) { - app.UpgradeKeeper.SetUpgradeHandler(upgradeInfo.Name, + planName := "v5.1" + app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - return fromVM, app.GravityKeeper.MigrateFundsToDrainAccount(ctx, sdk.MustAccAddressFromBech32("the_drain_account")) + if err := app.GravityKeeper.MigrateFundsToDrainAccount(ctx, sdk.MustAccAddressFromBech32("the_drain_account")); err != nil { + return nil, err + } + return app.mm.RunMigrations(ctx, app.configurator, fromVM) }) } From d0ac543fef56fa76abe42f7a2801b5849ed832ab Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Fri, 23 Jun 2023 11:44:40 +0200 Subject: [PATCH 03/10] fix format --- app/upgrades.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/upgrades.go b/app/upgrades.go index b6e38f8d12..b03f4b0ae9 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -3,12 +3,6 @@ package app import ( "cosmossdk.io/errors" "github.com/CosmWasm/wasmd/x/wasm" - ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" - icagenesis "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/genesis/types" - icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -22,6 +16,12 @@ import ( "github.com/cosmos/cosmos-sdk/x/nft" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" + icagenesis "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/genesis/types" + icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" + ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" + bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" "github.com/umee-network/umee/v5/app/upgradev3" "github.com/umee-network/umee/v5/app/upgradev3x3" From 11e5cbe19366a17a1bab0071cdd94b0b978ddc29 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Fri, 23 Jun 2023 11:49:18 +0200 Subject: [PATCH 04/10] fix format --- app/upgrades.go | 1 - 1 file changed, 1 deletion(-) diff --git a/app/upgrades.go b/app/upgrades.go index b03f4b0ae9..eb059ee893 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -3,7 +3,6 @@ package app import ( "cosmossdk.io/errors" "github.com/CosmWasm/wasmd/x/wasm" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" From 30b31646a9667a4e0c008e1a5ab7c0f0b00c01ca Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Wed, 28 Jun 2023 11:06:10 +0200 Subject: [PATCH 05/10] added todo --- app/upgrades.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/upgrades.go b/app/upgrades.go index eb059ee893..28028107e8 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -61,6 +61,7 @@ func (app *UmeeApp) registerUpgrade5_1(upgradeInfo upgradetypes.Plan) { planName := "v5.1" app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + // TODO: set the correct drain account. This will panic if executed. if err := app.GravityKeeper.MigrateFundsToDrainAccount(ctx, sdk.MustAccAddressFromBech32("the_drain_account")); err != nil { return nil, err } From 91abb151612a808612bdbffd646b7216e6ee919f Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Wed, 28 Jun 2023 15:40:34 +0200 Subject: [PATCH 06/10] remove gravity begin and end blocker --- app/app.go | 2 -- app/upgrades.go | 18 +++++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/app.go b/app/app.go index 55e42cd13e..0c65eeaed0 100644 --- a/app/app.go +++ b/app/app.go @@ -736,7 +736,6 @@ func New( icatypes.ModuleName, // ibcfeetypes.ModuleName, leveragetypes.ModuleName, oracletypes.ModuleName, - gravitytypes.ModuleName, bech32ibctypes.ModuleName, uibc.ModuleName, ugov.ModuleName, @@ -756,7 +755,6 @@ func New( paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, icatypes.ModuleName, // ibcfeetypes.ModuleName, leveragetypes.ModuleName, - gravitytypes.ModuleName, bech32ibctypes.ModuleName, uibc.ModuleName, ugov.ModuleName, diff --git a/app/upgrades.go b/app/upgrades.go index 28028107e8..1374c5c1c2 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -3,6 +3,13 @@ package app import ( "cosmossdk.io/errors" "github.com/CosmWasm/wasmd/x/wasm" + ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" + icagenesis "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/genesis/types" + icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" + ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" + bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" + storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -15,12 +22,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/nft" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" - icagenesis "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/genesis/types" - icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" "github.com/umee-network/umee/v5/app/upgradev3" "github.com/umee-network/umee/v5/app/upgradev3x3" @@ -52,7 +53,6 @@ func (app UmeeApp) RegisterUpgradeHandlers(bool) { app.registerUpgrade4_3(upgradeInfo) app.registerUpgrade("v4.4", upgradeInfo) app.registerUpgrade("v5.0", upgradeInfo, ugov.ModuleName, wasm.ModuleName) - app.registerUpgrade("v5.1-alpha1", upgradeInfo, incentive.ModuleName) app.registerUpgrade5_1(upgradeInfo) // TODO: set correct 5.1 name and add borrowFactor migration } @@ -61,6 +61,10 @@ func (app *UmeeApp) registerUpgrade5_1(upgradeInfo upgradetypes.Plan) { planName := "v5.1" app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + app.storeUpgrade(planName, upgradeInfo, storetypes.StoreUpgrades{ + Added: []string{incentive.ModuleName}, + }) + // TODO: set the correct drain account. This will panic if executed. if err := app.GravityKeeper.MigrateFundsToDrainAccount(ctx, sdk.MustAccAddressFromBech32("the_drain_account")); err != nil { return nil, err From 5390e491b416bb887700b5ec433aa67ff6c952b6 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Wed, 28 Jun 2023 15:41:34 +0200 Subject: [PATCH 07/10] remove gravity begin and end blocker --- app/upgrades.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/upgrades.go b/app/upgrades.go index 1374c5c1c2..9bd10b18f2 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -3,13 +3,6 @@ package app import ( "cosmossdk.io/errors" "github.com/CosmWasm/wasmd/x/wasm" - ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" - icagenesis "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/genesis/types" - icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -22,6 +15,12 @@ import ( "github.com/cosmos/cosmos-sdk/x/nft" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" + icagenesis "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/genesis/types" + icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" + ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" + bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" "github.com/umee-network/umee/v5/app/upgradev3" "github.com/umee-network/umee/v5/app/upgradev3x3" From e3908145f5e1b809c91c590898229ba4a93266ed Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Wed, 28 Jun 2023 15:50:01 +0200 Subject: [PATCH 08/10] lint --- app/upgrades.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/upgrades.go b/app/upgrades.go index 9bd10b18f2..d507b20ec2 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -65,7 +65,10 @@ func (app *UmeeApp) registerUpgrade5_1(upgradeInfo upgradetypes.Plan) { }) // TODO: set the correct drain account. This will panic if executed. - if err := app.GravityKeeper.MigrateFundsToDrainAccount(ctx, sdk.MustAccAddressFromBech32("the_drain_account")); err != nil { + if err := app.GravityKeeper.MigrateFundsToDrainAccount( + ctx, + sdk.MustAccAddressFromBech32("the_drain_account"), + ); err != nil { return nil, err } return app.mm.RunMigrations(ctx, app.configurator, fromVM) From d697d675c31400347ba03e8fea2011963c76869f Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Wed, 28 Jun 2023 22:03:04 +0200 Subject: [PATCH 09/10] re-add gb in begin blocker end blocker --- app/app.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/app.go b/app/app.go index 0c65eeaed0..55e42cd13e 100644 --- a/app/app.go +++ b/app/app.go @@ -736,6 +736,7 @@ func New( icatypes.ModuleName, // ibcfeetypes.ModuleName, leveragetypes.ModuleName, oracletypes.ModuleName, + gravitytypes.ModuleName, bech32ibctypes.ModuleName, uibc.ModuleName, ugov.ModuleName, @@ -755,6 +756,7 @@ func New( paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, icatypes.ModuleName, // ibcfeetypes.ModuleName, leveragetypes.ModuleName, + gravitytypes.ModuleName, bech32ibctypes.ModuleName, uibc.ModuleName, ugov.ModuleName, From 3757dddbaffdca81ca20c298277345861acf1965 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 29 Jun 2023 11:12:42 +0200 Subject: [PATCH 10/10] upgrade gb to latest --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9ca79bf847..0afbff0690 100644 --- a/go.mod +++ b/go.mod @@ -334,7 +334,7 @@ require ( replace ( github.com/CosmWasm/wasmd => github.com/notional-labs/wasmd v0.31.0-umee.46 - github.com/Gravity-Bridge/Gravity-Bridge/module => github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-9 + github.com/Gravity-Bridge/Gravity-Bridge/module => github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-10 github.com/cosmos/cosmos-sdk => github.com/umee-network/cosmos-sdk v0.46.13-umee // dgrijalva/jwt-go is deprecated and doesn't receive security updates. github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 diff --git a/go.sum b/go.sum index 17a2f1e7af..8ea76af234 100644 --- a/go.sum +++ b/go.sum @@ -1463,8 +1463,8 @@ github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iL github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-9 h1:uo8+3gFo/EhQtjbiP7AfN0Pqx6ddFf9iWcvlfeChNsY= -github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-9/go.mod h1:NR6UwQPZUoLckpOtCxgROWNEDzepe2JhxQ2u9cL+pbo= +github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-10 h1:aKj8zwDz6vZO/mOVCgLvEKI9PbZaF3AH4UJKv5npElg= +github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-10/go.mod h1:NR6UwQPZUoLckpOtCxgROWNEDzepe2JhxQ2u9cL+pbo= github.com/umee-network/bech32-ibc v0.3.3 h1:wUX5uSYZl8yiFdttOvunfRihsE4miYmzl7pK2FEUs+U= github.com/umee-network/bech32-ibc v0.3.3/go.mod h1:UbhzCKN+Z7RoUdCkAanmIy+wufwQ/aQJrDEoVORhC2Y= github.com/umee-network/cosmos-sdk v0.46.13-umee h1:EeSalZHGoWdkKkCNhNd80jzRMNEQWLyDPUU5aUJQpIs=