-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'releases/v5.x' into feat/v5-no-signature-checker
- Loading branch information
Showing
99 changed files
with
2,538 additions
and
2,670 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ linters: | |
| enable: | ||
| - dogsled | ||
| - errcheck | ||
| - exportloopref | ||
| - copyloopvar | ||
| - goconst | ||
| - gocritic | ||
| - gofumpt | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package v510 | ||
|
|
||
| import ( | ||
| storetypes "cosmossdk.io/store/types" | ||
|
|
||
| "github.com/neutron-org/neutron/v5/app/upgrades" | ||
| ) | ||
|
|
||
| const ( | ||
| // UpgradeName defines the on-chain upgrade name. | ||
| UpgradeName = "v5.1.0" | ||
| MarketMapAuthorityMultisig = "neutron1ldvrvhyvtssm0ptdq23hhaltprx8ctmjh92kzfs55sz2z997n76s72wr86" | ||
| ) | ||
|
|
||
| var Upgrade = upgrades.Upgrade{ | ||
| UpgradeName: UpgradeName, | ||
| CreateUpgradeHandler: CreateUpgradeHandler, | ||
| StoreUpgrades: storetypes.StoreUpgrades{}, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package v510 | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| upgradetypes "cosmossdk.io/x/upgrade/types" | ||
| adminmoduletypes "github.com/cosmos/admin-module/v2/x/adminmodule/types" | ||
| "github.com/cosmos/cosmos-sdk/codec" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/types/module" | ||
| authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" | ||
| marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper" | ||
| marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types" | ||
|
|
||
| "github.com/neutron-org/neutron/v5/app/upgrades" | ||
| ) | ||
|
|
||
| func CreateUpgradeHandler( | ||
| mm *module.Manager, | ||
| configurator module.Configurator, | ||
| keepers *upgrades.UpgradeKeepers, | ||
| _ upgrades.StoreKeys, | ||
| _ 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) | ||
| if err != nil { | ||
| return vm, err | ||
| } | ||
|
|
||
| err = setMarketMapParams(ctx, keepers.MarketmapKeeper) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| ctx.Logger().Info(fmt.Sprintf("Migration {%s} applied", UpgradeName)) | ||
| return vm, nil | ||
| } | ||
| } | ||
|
|
||
| func setMarketMapParams(ctx sdk.Context, marketmapKeeper *marketmapkeeper.Keeper) error { | ||
| marketmapParams := marketmaptypes.Params{ | ||
| MarketAuthorities: []string{authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), MarketMapAuthorityMultisig}, | ||
| Admin: authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), | ||
| } | ||
| return marketmapKeeper.SetParams(ctx, marketmapParams) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package v510_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| upgradetypes "cosmossdk.io/x/upgrade/types" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/stretchr/testify/suite" | ||
|
|
||
| v510 "github.com/neutron-org/neutron/v5/app/upgrades/v5.1.0" | ||
| "github.com/neutron-org/neutron/v5/testutil" | ||
| ) | ||
|
|
||
| type UpgradeTestSuite struct { | ||
| testutil.IBCConnectionTestSuite | ||
| } | ||
|
|
||
| func TestKeeperTestSuite(t *testing.T) { | ||
| suite.Run(t, new(UpgradeTestSuite)) | ||
| } | ||
|
|
||
| func (suite *UpgradeTestSuite) SetupTest() { | ||
| suite.IBCConnectionTestSuite.SetupTest() | ||
| } | ||
|
|
||
| func (suite *UpgradeTestSuite) TestUpgrade() { | ||
| app := suite.GetNeutronZoneApp(suite.ChainA) | ||
| ctx := suite.ChainA.GetContext().WithChainID("neutron-1") | ||
| t := suite.T() | ||
|
|
||
| upgrade := upgradetypes.Plan{ | ||
| Name: v510.UpgradeName, | ||
| Info: "some text here", | ||
| Height: 100, | ||
| } | ||
| require.NoError(t, app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade)) | ||
|
|
||
| params, err := app.MarketMapKeeper.GetParams(ctx) | ||
| suite.Require().NoError(err) | ||
| suite.Require().Equal(params.MarketAuthorities[0], "neutron1hxskfdxpp5hqgtjj6am6nkjefhfzj359x0ar3z") | ||
| suite.Require().Equal(params.MarketAuthorities[1], v510.MarketMapAuthorityMultisig) | ||
| suite.Require().Equal(params.Admin, "neutron1hxskfdxpp5hqgtjj6am6nkjefhfzj359x0ar3z") | ||
| } |
Oops, something went wrong.