Feature/dev

app/app.go

@@ -164,6 +164,7 @@ import (
 
 	cwasm "github.com/comdex-official/comdex/app/wasm"
 
+	mv5 "github.com/comdex-official/comdex/app/upgrades/mainnet/v5"
 	tv1_0_0 "github.com/comdex-official/comdex/app/upgrades/testnet/v1_0_0"
 	tv2_0_0 "github.com/comdex-official/comdex/app/upgrades/testnet/v2_0_0"
 	tv3_0_0 "github.com/comdex-official/comdex/app/upgrades/testnet/v3_0_0"
@@ -551,7 +552,6 @@ func New(
 		app.cdc,
 		app.keys[assettypes.StoreKey],
 		app.GetSubspace(assettypes.ModuleName),
-		&app.MarketKeeper,
 		&app.Rewardskeeper,
 		&app.VaultKeeper,
 		&app.BandoracleKeeper,
@@ -695,7 +695,6 @@ func New(
 		app.GetSubspace(lockertypes.ModuleName),
 		app.BankKeeper,
 		&app.AssetKeeper,
-		&app.MarketKeeper,
 		&app.CollectorKeeper,
 		&app.EsmKeeper,
 		&app.Rewardskeeper,
@@ -1223,6 +1222,30 @@ func upgradeHandlers(upgradeInfo storetypes.UpgradeInfo, a *App, storeUpgrades *
 		storeUpgrades = &storetypes.StoreUpgrades{}
 	case upgradeInfo.Name == tv4_0_0.UpgradeNameV4_4_0 && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
 		storeUpgrades = &storetypes.StoreUpgrades{}
+
+	// prepare store for main net upgrade v5.0.0
+	case upgradeInfo.Name == mv5.UpgradeName && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
+		storeUpgrades = &storetypes.StoreUpgrades{
+			Added: []string{
+				assettypes.ModuleName,
+				auctiontypes.ModuleName,
+				bandoraclemoduletypes.ModuleName,
+				collectortypes.ModuleName,
+				esmtypes.ModuleName,
+				liquidationtypes.ModuleName,
+				liquiditytypes.ModuleName,
+				lockertypes.ModuleName,
+				markettypes.ModuleName,
+				rewardstypes.ModuleName,
+				tokenminttypes.ModuleName,
+				vaulttypes.ModuleName,
+				feegrant.ModuleName,
+				icacontrollertypes.StoreKey,
+				icahosttypes.StoreKey,
+				authz.ModuleName,
+			},
+		}
 	}
+
 	return storeUpgrades
 }

app/upgrades/mainnet/v5/constants.go

@@ -0,0 +1,15 @@
+package v5
+
+const (
+	UpgradeName   = "v5.0.0"
+	UpgradeHeight = ""
+	UpgradeInfo   = `'{
+		"binaries": {
+			"darwin/arm64":"",
+			"darwin/x86_64":"",
+			"linux/arm64":"",
+			"linux/x86_64":"",
+			"windows/x86_64":""
+		}
+	}'`
+)

app/upgrades/mainnet/v5/upgrades.go

@@ -0,0 +1,316 @@
+package v5
+
+import (
+	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
+	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
+	"github.com/comdex-official/comdex/app/wasm/bindings"
+	assetkeeper "github.com/comdex-official/comdex/x/asset/keeper"
+	assettypes "github.com/comdex-official/comdex/x/asset/types"
+	auctionkeeper "github.com/comdex-official/comdex/x/auction/keeper"
+	collectorkeeper "github.com/comdex-official/comdex/x/collector/keeper"
+	liquidationkeeper "github.com/comdex-official/comdex/x/liquidation/keeper"
+	liquiditykeeper "github.com/comdex-official/comdex/x/liquidity/keeper"
+	liquiditytypes "github.com/comdex-official/comdex/x/liquidity/types"
+	lockerkeeper "github.com/comdex-official/comdex/x/locker/keeper"
+	lockertypes "github.com/comdex-official/comdex/x/locker/types"
+	rewardskeeper "github.com/comdex-official/comdex/x/rewards/keeper"
+	rewardstypes "github.com/comdex-official/comdex/x/rewards/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts"
+	icacontrollertypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types"
+	icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types"
+	icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"
+	ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
+)
+
+func IntializeStates(
+	ctx sdk.Context,
+	assetKeeper assetkeeper.Keeper,
+	liquidityKeeper liquiditykeeper.Keeper,
+	collectorkeeper collectorkeeper.Keeper,
+	auctionkeeper auctionkeeper.Keeper,
+	lockerkeeper lockerkeeper.Keeper,
+	rewardskeeper rewardskeeper.Keeper,
+	liquidationkeeper liquidationkeeper.Keeper,
+) {
+	apps := []assettypes.AppData{
+		{Name: "CSWAP", ShortName: "cswap", MinGovDeposit: sdk.ZeroInt(), GovTimeInSeconds: 0, GenesisToken: []assettypes.MintGenesisToken{}},
+		{Name: "HARBOR", ShortName: "hbr", MinGovDeposit: sdk.NewInt(10000000), GovTimeInSeconds: 300, GenesisToken: []assettypes.MintGenesisToken{}},
+	}
+	for _, app := range apps {
+		err := assetKeeper.AddAppRecords(ctx, app)
+		if err != nil {
+			panic(err)
+		}
+	}
+
+	assets := []assettypes.Asset{
+		{Name: "ATOM", Denom: "uatom", Decimals: 1000000, IsOnChain: false, IsOraclePriceRequired: true},
+		{Name: "CMDX", Denom: "ucmdx", Decimals: 1000000, IsOnChain: false, IsOraclePriceRequired: true},
+		{Name: "CMST", Denom: "ucmst", Decimals: 1000000, IsOnChain: false, IsOraclePriceRequired: false},
+		{Name: "OSMO", Denom: "uosmo", Decimals: 1000000, IsOnChain: false, IsOraclePriceRequired: true},
+		{Name: "cATOM", Denom: "ucatom", Decimals: 1000000, IsOnChain: false, IsOraclePriceRequired: false},
+		{Name: "cCMDX", Denom: "uccmdx", Decimals: 1000000, IsOnChain: false, IsOraclePriceRequired: false},
+		{Name: "cCMST", Denom: "uccmst", Decimals: 1000000, IsOnChain: false, IsOraclePriceRequired: false},
+		{Name: "cOSMO", Denom: "ucosmo", Decimals: 1000000, IsOnChain: false, IsOraclePriceRequired: false},
+		{Name: "HARBOR", Denom: "uharbor", Decimals: 1000000, IsOnChain: true, IsOraclePriceRequired: false},
+	}
+
+	for _, asset := range assets {
+		err := assetKeeper.AddAssetRecords(ctx, asset)
+		if err != nil {
+			panic(err)
+		}
+	}
+	// add pairs
+	pairs := []assettypes.Pair{
+		{AssetIn: 1, AssetOut: 3},
+		{AssetIn: 2, AssetOut: 3},
+		{AssetIn: 4, AssetOut: 3},
+	}
+
+	for _, pair := range pairs {
+		err := assetKeeper.AddPairsRecords(ctx, pair)
+		if err != nil {
+			panic(err)
+		}
+	}
+
+	// add extended pairs
+	extPairs := []*bindings.MsgAddExtendedPairsVault{
+		{
+			AppID: 2, PairID: 2, StabilityFee: sdk.MustNewDecFromStr("0.045"), ClosingFee: sdk.MustNewDecFromStr("0"), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
+			DrawDownFee: sdk.MustNewDecFromStr("0.01"), IsVaultActive: true, DebtCeiling: 100000000000000, DebtFloor: 1000000, IsStableMintVault: false, MinCr: sdk.MustNewDecFromStr("2.0"),
+			PairName: "CMDX-A", AssetOutOraclePrice: false, AssetOutPrice: 1000000, MinUsdValueLeft: 10000000000,
+		},
+		{
+			AppID: 2, PairID: 2, StabilityFee: sdk.MustNewDecFromStr("0.035"), ClosingFee: sdk.MustNewDecFromStr("0"), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
+			DrawDownFee: sdk.MustNewDecFromStr("0.01"), IsVaultActive: true, DebtCeiling: 100000000000000, DebtFloor: 1000000, IsStableMintVault: false, MinCr: sdk.MustNewDecFromStr("2.4"),
+			PairName: "CMDX-B", AssetOutOraclePrice: false, AssetOutPrice: 1000000, MinUsdValueLeft: 10000000000,
+		},
+		{
+			AppID: 2, PairID: 2, StabilityFee: sdk.MustNewDecFromStr("0.025"), ClosingFee: sdk.MustNewDecFromStr("0"), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
+			DrawDownFee: sdk.MustNewDecFromStr("0.01"), IsVaultActive: true, DebtCeiling: 100000000000000, DebtFloor: 1000000, IsStableMintVault: false, MinCr: sdk.MustNewDecFromStr("2.8"),
+			PairName: "CMDX-C", AssetOutOraclePrice: false, AssetOutPrice: 1000000, MinUsdValueLeft: 10000000000,
+		},
+		{
+			AppID: 2, PairID: 3, StabilityFee: sdk.MustNewDecFromStr("0.045"), ClosingFee: sdk.MustNewDecFromStr("0"), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
+			DrawDownFee: sdk.MustNewDecFromStr("0.01"), IsVaultActive: true, DebtCeiling: 100000000000000, DebtFloor: 1000000, IsStableMintVault: false, MinCr: sdk.MustNewDecFromStr("1.6"),
+			PairName: "OSMO-A", AssetOutOraclePrice: false, AssetOutPrice: 1000000, MinUsdValueLeft: 10000000000,
+		},
+		{
+			AppID: 2, PairID: 3, StabilityFee: sdk.MustNewDecFromStr("0.035"), ClosingFee: sdk.MustNewDecFromStr("0"), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
+			DrawDownFee: sdk.MustNewDecFromStr("0.01"), IsVaultActive: true, DebtCeiling: 100000000000000, DebtFloor: 1000000, IsStableMintVault: false, MinCr: sdk.MustNewDecFromStr("1.9"),
+			PairName: "OSMO-B", AssetOutOraclePrice: false, AssetOutPrice: 1000000, MinUsdValueLeft: 10000000000,
+		},
+		{
+			AppID: 2, PairID: 3, StabilityFee: sdk.MustNewDecFromStr("0.025"), ClosingFee: sdk.MustNewDecFromStr("0"), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
+			DrawDownFee: sdk.MustNewDecFromStr("0.01"), IsVaultActive: true, DebtCeiling: 100000000000000, DebtFloor: 1000000, IsStableMintVault: false, MinCr: sdk.MustNewDecFromStr("2.2"),
+			PairName: "OSMO-C", AssetOutOraclePrice: false, AssetOutPrice: 1000000, MinUsdValueLeft: 10000000000,
+		},
+		{
+			AppID: 2, PairID: 1, StabilityFee: sdk.MustNewDecFromStr("0.045"), ClosingFee: sdk.MustNewDecFromStr("0"), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
+			DrawDownFee: sdk.MustNewDecFromStr("0.01"), IsVaultActive: true, DebtCeiling: 100000000000000, DebtFloor: 1000000, IsStableMintVault: false, MinCr: sdk.MustNewDecFromStr("1.4"),
+			PairName: "ATOM-A", AssetOutOraclePrice: false, AssetOutPrice: 1000000, MinUsdValueLeft: 10000000000,
+		},
+		{
+			AppID: 2, PairID: 1, StabilityFee: sdk.MustNewDecFromStr("0.035"), ClosingFee: sdk.MustNewDecFromStr("0"), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
+			DrawDownFee: sdk.MustNewDecFromStr("0.01"), IsVaultActive: true, DebtCeiling: 100000000000000, DebtFloor: 1000000, IsStableMintVault: false, MinCr: sdk.MustNewDecFromStr("1.7"),
+			PairName: "ATOM-B", AssetOutOraclePrice: false, AssetOutPrice: 1000000, MinUsdValueLeft: 10000000000,
+		},
+		{
+			AppID: 2, PairID: 1, StabilityFee: sdk.MustNewDecFromStr("0.025"), ClosingFee: sdk.MustNewDecFromStr("0"), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
+			DrawDownFee: sdk.MustNewDecFromStr("0.01"), IsVaultActive: true, DebtCeiling: 100000000000000, DebtFloor: 1000000, IsStableMintVault: false, MinCr: sdk.MustNewDecFromStr("2.0"),
+			PairName: "ATOM-C", AssetOutOraclePrice: false, AssetOutPrice: 1000000, MinUsdValueLeft: 10000000000,
+		},
+	}
+
+	for _, extPair := range extPairs {
+		err := assetKeeper.WasmAddExtendedPairsVaultRecords(ctx, extPair)
+		if err != nil {
+			panic(err)
+		}
+	}
+	// add collector params
+	collector := bindings.MsgSetCollectorLookupTable{
+		AppID:            2,
+		CollectorAssetID: 3,
+		SecondaryAssetID: 9,
+		SurplusThreshold: 100000000000000,
+		DebtThreshold:    1000000000,
+		LockerSavingRate: sdk.MustNewDecFromStr("0.015"),
+		LotSize:          200000000,
+		BidFactor:        sdk.MustNewDecFromStr("0.01"),
+		DebtLotSize:      2000000,
+	}
+
+	err := collectorkeeper.WasmSetCollectorLookupTable(ctx, &collector)
+	if err != nil {
+		panic(err)
+	}
+
+	// add auction params
+
+	auctionParam := bindings.MsgAddAuctionParams{
+		AppID:                  2,
+		AuctionDurationSeconds: 21600,
+		BidDurationSeconds:     10800,
+		Buffer:                 sdk.MustNewDecFromStr("1.5"),
+		Cusp:                   sdk.MustNewDecFromStr("0.85"),
+		DebtID:                 2,
+		DutchID:                3,
+		PriceFunctionType:      1,
+		Step:                   360,
+		SurplusID:              1,
+	}
+	err = auctionkeeper.AddAuctionParams(ctx, &auctionParam)
+	if err != nil {
+		panic(err)
+	}
+	// add auction mapping
+	auction := bindings.MsgSetAuctionMappingForApp{
+		AppID:                2,
+		AssetIDs:             3,
+		IsSurplusAuctions:    false,
+		IsDebtAuctions:       false,
+		IsDistributor:        false,
+		AssetOutOraclePrices: false,
+		AssetOutPrices:       1000000,
+	}
+
+	err = collectorkeeper.WasmSetAuctionMappingForApp(ctx, &auction)
+	if err != nil {
+		panic(err)
+	}
+
+	// whitlist cmst for locker
+	locker := lockertypes.MsgAddWhiteListedAssetRequest{
+		AppId:   2,
+		AssetId: 3,
+	}
+	_, err = lockerkeeper.AddWhiteListedAsset(ctx.Context(), &locker)
+	if err != nil {
+		panic(err)
+	}
+	// whielist for locker rewards
+	reward := rewardstypes.WhitelistAsset{
+		AppMappingId: 2,
+		AssetId:      3,
+	}
+	_, err = rewardskeeper.Whitelist(sdk.WrapSDKContext(ctx), &reward)
+	if err != nil {
+		panic(err)
+	}
+	// whitlist for vaultInterest
+	vInterest := rewardstypes.WhitelistAppIdVault{
+		AppMappingId: 2,
+	}
+	_, err = rewardskeeper.WhitelistAppVault(ctx.Context(), &vInterest)
+	if err != nil {
+		panic(err)
+	}
+
+	// whitlist for liquidation
+	err = liquidationkeeper.WasmWhitelistAppIDLiquidation(ctx, 2)
+	if err != nil {
+		panic(err)
+	}
+
+	type LiquidityPair struct {
+		AppID          uint64
+		From           string
+		BaseCoinDenom  string
+		QuoteCoinDenom string
+	}
+
+	liquidityPairs := []LiquidityPair{
+		{AppID: 1, From: "comdex12gfx7e3p08ljrwhq4lxz0360czcv9jpzajlytv", BaseCoinDenom: "uatom", QuoteCoinDenom: "ucmdx"},
+		{AppID: 1, From: "comdex12gfx7e3p08ljrwhq4lxz0360czcv9jpzajlytv", BaseCoinDenom: "uosmo", QuoteCoinDenom: "ucmdx"},
+	}
+
+	for _, lpair := range liquidityPairs {
+		msg := liquiditytypes.NewMsgCreatePair(
+			lpair.AppID, sdk.MustAccAddressFromBech32(lpair.From), lpair.BaseCoinDenom, lpair.QuoteCoinDenom,
+		)
+		_, err := liquidityKeeper.CreatePair(ctx, msg, true)
+		if err != nil {
+			panic(err)
+		}
+	}
+}
+
+// CreateUpgradeHandler creates an SDK upgrade handler for v5
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	wasmKeeper wasmkeeper.Keeper,
+	assetKeeper assetkeeper.Keeper,
+	liquidityKeeper liquiditykeeper.Keeper,
+	collectorkeeper collectorkeeper.Keeper,
+	auctionkeeper auctionkeeper.Keeper,
+	lockerkeeper lockerkeeper.Keeper,
+	rewardskeeper rewardskeeper.Keeper,
+	liquidationkeeper liquidationkeeper.Keeper,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		// Refs:
+		// - https://docs.cosmos.network/master/building-modules/upgrade.html#registering-migrations
+		// - https://docs.cosmos.network/master/migrations/chain-upgrade-guide-044.html#chain-upgrade
+
+		// Deleting these modules from the upgrades current state
+		// Add Interchain Accounts host module
+		// set the ICS27 consensus version so InitGenesis is not run
+		fromVM[icatypes.ModuleName] = mm.Modules[icatypes.ModuleName].ConsensusVersion()
+
+		// create ICS27 Controller submodule params, controller module not enabled.
+		controllerParams := icacontrollertypes.Params{}
+
+		// create ICS27 Host submodule params
+
+		// create ICS27 Host submodule params
+		hostParams := icahosttypes.Params{
+			HostEnabled: true,
+			AllowMessages: []string{
+				sdk.MsgTypeURL(&ibctransfertypes.MsgTransfer{}),
+				sdk.MsgTypeURL(&banktypes.MsgSend{}),
+				sdk.MsgTypeURL(&stakingtypes.MsgDelegate{}),
+				sdk.MsgTypeURL(&stakingtypes.MsgBeginRedelegate{}),
+				sdk.MsgTypeURL(&stakingtypes.MsgCreateValidator{}),
+				sdk.MsgTypeURL(&stakingtypes.MsgEditValidator{}),
+				sdk.MsgTypeURL(&stakingtypes.MsgUndelegate{}),
+				sdk.MsgTypeURL(&distrtypes.MsgWithdrawDelegatorReward{}),
+				sdk.MsgTypeURL(&distrtypes.MsgSetWithdrawAddress{}),
+				sdk.MsgTypeURL(&distrtypes.MsgWithdrawValidatorCommission{}),
+				sdk.MsgTypeURL(&distrtypes.MsgFundCommunityPool{}),
+				sdk.MsgTypeURL(&govtypes.MsgVote{}),
+			},
+		}
+		// No changes in existing module and their states,
+		// This upgrades adds new modules and new states in the existing store
+
+		icamodule, correctTypecast := mm.Modules[icatypes.ModuleName].(ica.AppModule)
+		if !correctTypecast {
+			panic("mm.Modules[icatypes.ModuleName] is not of type ica.AppModule")
+		}
+		icamodule.InitModule(ctx, controllerParams, hostParams)
+		newVM, err := mm.RunMigrations(ctx, configurator, fromVM)
+		if err != nil {
+			return newVM, err
+		}
+
+		IntializeStates(ctx, assetKeeper, liquidityKeeper, collectorkeeper, auctionkeeper, lockerkeeper, rewardskeeper, liquidationkeeper)
+
+		// update wasm to permission
+		wasmParams := wasmKeeper.GetParams(ctx)
+		wasmParams.CodeUploadAccess = wasmtypes.AllowNobody
+		wasmKeeper.SetParams(ctx, wasmParams)
+
+		return newVM, err
+	}
+}

app/upgrades/testnet/v1_0_0/constants.go

@@ -1,4 +1,4 @@
-package v1_0_0
+package v1_0_0 //nolint:revive,stylecheck
 
 const (
 	UpgradeName   = "v1.0.0"

app/upgrades/testnet/v1_0_0/upgrades.go

@@ -1,4 +1,4 @@
-package v1_0_0
+package v1_0_0 //nolint:revive,stylecheck
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"