From dc65431f8b1af8b6c20c2d2b77ce143b031bd56c Mon Sep 17 00:00:00 2001
From: pr0n00gler <programmer10110@gmail.com>
Date: Thu, 26 Sep 2024 16:19:35 +0300
Subject: [PATCH] update market map admin

---
 app/upgrades/types.go                |  3 ++-
 app/upgrades/v5.0.0/constants.go     |  3 +++
 app/upgrades/v5.0.0/upgrades.go      | 18 ++++++++++++++++++
 app/upgrades/v5.0.0/upgrades_test.go | 20 ++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app/upgrades/types.go b/app/upgrades/types.go
index 51e44ef13..7e1450fb2 100644
--- a/app/upgrades/types.go
+++ b/app/upgrades/types.go
@@ -13,11 +13,12 @@ import (
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
 	ccvconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
-	dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper"
 	auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper"
 	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
 	marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper"
 
+	dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper"
+
 	dynamicfeeskeeper "github.com/neutron-org/neutron/v5/x/dynamicfees/keeper"
 
 	contractmanagerkeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper"
diff --git a/app/upgrades/v5.0.0/constants.go b/app/upgrades/v5.0.0/constants.go
index dcc1aff40..043690996 100644
--- a/app/upgrades/v5.0.0/constants.go
+++ b/app/upgrades/v5.0.0/constants.go
@@ -2,12 +2,15 @@ package v500
 
 import (
 	storetypes "cosmossdk.io/store/types"
+
 	"github.com/neutron-org/neutron/v5/app/upgrades"
 )
 
 const (
 	// UpgradeName defines the on-chain upgrade name.
 	UpgradeName = "v5.0.0"
+
+	MarketMapAuthorityMultisig = "neutron1anjpluecd0tdc0n8xzc3l5hua4h93wyq0x7v56"
 )
 
 var Upgrade = upgrades.Upgrade{
diff --git a/app/upgrades/v5.0.0/upgrades.go b/app/upgrades/v5.0.0/upgrades.go
index 143db2b7b..fb63577ff 100644
--- a/app/upgrades/v5.0.0/upgrades.go
+++ b/app/upgrades/v5.0.0/upgrades.go
@@ -5,9 +5,14 @@ import (
 	"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"
 	dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper"
 )
@@ -37,6 +42,11 @@ func CreateUpgradeHandler(
 			}
 		}
 
+		err = setMarketMapParams(ctx, keepers.MarketmapKeeper)
+		if err != nil {
+			return nil, err
+		}
+
 		ctx.Logger().Info(fmt.Sprintf("Migration {%s} applied", UpgradeName))
 		return vm, nil
 	}
@@ -57,3 +67,11 @@ func upgradeDexPause(ctx sdk.Context, k dexkeeper.Keeper) error {
 
 	return 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)
+}
diff --git a/app/upgrades/v5.0.0/upgrades_test.go b/app/upgrades/v5.0.0/upgrades_test.go
index 05cb9eb7a..77fd076a8 100644
--- a/app/upgrades/v5.0.0/upgrades_test.go
+++ b/app/upgrades/v5.0.0/upgrades_test.go
@@ -5,6 +5,7 @@ import (
 
 	"cosmossdk.io/math"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
+	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
 	v500 "github.com/neutron-org/neutron/v5/app/upgrades/v5.0.0"
@@ -27,6 +28,25 @@ func (suite *UpgradeTestSuite) SetupTest() {
 	suite.IBCConnectionTestSuite.SetupTest()
 }
 
+func (suite *UpgradeTestSuite) TestOracleUpgrade() {
+	app := suite.GetNeutronZoneApp(suite.ChainA)
+	ctx := suite.ChainA.GetContext()
+	t := suite.T()
+
+	upgrade := upgradetypes.Plan{
+		Name:   v500.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], v500.MarketMapAuthorityMultisig)
+	suite.Require().Equal(params.Admin, "neutron1hxskfdxpp5hqgtjj6am6nkjefhfzj359x0ar3z")
+}
+
 func (suite *UpgradeTestSuite) TestUpgradeDexPause() {
 	var (
 		app       = suite.GetNeutronZoneApp(suite.ChainA)