Merge pull request #673 from comdex-official/feature/dev

Handler added for testnet Upgrade
comdex-official · Jan 31, 2023 · dfc30c7 · dfc30c7
2 parents a3b435a + 138843b
commit dfc30c7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/app/app.go b/app/app.go
@@ -1211,8 +1211,8 @@ func (a *App) ModuleAccountsPermissions() map[string][]string {
 
 func (a *App) registerUpgradeHandlers() {
 	a.UpgradeKeeper.SetUpgradeHandler(
-		mv8.UpgradeName800,
-		mv8.CreateUpgradeHandler800(a.mm, a.configurator, a.AssetKeeper, a.LendKeeper, a.AuctionKeeper),
+		mv8.UpgradeName810,
+		mv8.CreateUpgradeHandler810(a.mm, a.configurator),
 	)
 	// When a planned update height is reached, the old binary will panic
 	// writing on disk the height and name of the update that triggered it
@@ -1268,6 +1268,9 @@ func upgradeHandlers(upgradeInfo storetypes.UpgradeInfo, a *App, storeUpgrades *
 
 	case upgradeInfo.Name == mv8.UpgradeName800 && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
 		storeUpgrades = &storetypes.StoreUpgrades{}
+
+	case upgradeInfo.Name == mv8.UpgradeName810 && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
+		storeUpgrades = &storetypes.StoreUpgrades{}
 	}
 
 	return storeUpgrades

diff --git a/app/upgrades/mainnet/v8/constants.go b/app/upgrades/mainnet/v8/constants.go
@@ -1,7 +1,7 @@
 package v8
 
 const (
-	UpgradeName800   = "v8.1.0"
+	UpgradeName800   = "v8.0.0"
 	UpgradeHeight800 = ""
 	UpgradeInfo800   = `'{
 		"binaries": {
@@ -13,3 +13,17 @@ const (
 		}
 	}'`
 )
+
+const (
+	UpgradeName810   = "v8.1.0.beta"
+	UpgradeHeight810 = ""
+	UpgradeInfo810   = `'{
+		"binaries": {
+			"darwin/arm64":"",
+			"darwin/x86_64":"",
+			"linux/arm64":"",
+			"linux/x86_64":"",
+			"windows/x86_64":""
+		}
+	}'`
+)
diff --git a/app/upgrades/mainnet/v8/upgrades.go b/app/upgrades/mainnet/v8/upgrades.go
@@ -14,7 +14,7 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
-func UpdateExtendedPairVaults(ctx sdk.Context, assetKeeper assetkeeper.Keeper) {
+func UpdateExtendedPairVaultsAndAsset(ctx sdk.Context, assetKeeper assetkeeper.Keeper) {
 	extPairs := []*bindings.MsgUpdatePairsVault{
 		{
 			AppID: 2, ExtPairID: 2, StabilityFee: sdk.MustNewDecFromStr("1"), ClosingFee: sdk.ZeroDec(), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
@@ -53,6 +53,11 @@ func UpdateExtendedPairVaults(ctx sdk.Context, assetKeeper assetkeeper.Keeper) {
 			fmt.Println("err in updating extended pair ", extPair.ExtPairID)
 		}
 	}
+	asset, found := assetKeeper.GetAsset(ctx, 17)
+	if found {
+		asset.Denom = "ibc/2ABB3F0A1DA07D7F83D5004A4A16A4D4A264067AA85E15A4885D0AB8C0E4587B"
+		assetKeeper.SetAsset(ctx, asset)
+	}
 }
 
 func Dec(s string) sdk.Dec {
@@ -189,17 +194,12 @@ func UpdateAuctionParams(
 	}
 }
 
-func CreateUpgradeHandler800(
+func CreateUpgradeHandler810(
 	mm *module.Manager,
 	configurator module.Configurator,
-	assetKeeper assetkeeper.Keeper,
-	lendKeeper lendkeeper.Keeper,
-	auctionKeeper auctionkeeper.Keeper,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
 		newVM, err := mm.RunMigrations(ctx, configurator, fromVM)
-		UpdateAuctionParams(ctx, assetKeeper, lendKeeper, auctionKeeper)
-		UpdateExtendedPairVaults(ctx, assetKeeper)
 		return newVM, err
 	}
 }