band integrated

app/app.go

@@ -552,7 +552,6 @@ func New(
 		app.cdc,
 		app.keys[assettypes.StoreKey],
 		app.GetSubspace(assettypes.ModuleName),
-		&app.MarketKeeper,
 		&app.Rewardskeeper,
 		&app.VaultKeeper,
 		&app.BandoracleKeeper,
@@ -696,7 +695,6 @@ func New(
 		app.GetSubspace(lockertypes.ModuleName),
 		app.BankKeeper,
 		&app.AssetKeeper,
-		&app.MarketKeeper,
 		&app.CollectorKeeper,
 		&app.EsmKeeper,
 		&app.Rewardskeeper,

app/upgrades/mainnet/v5/upgrades.go

@@ -84,33 +84,51 @@ func IntializeStates(
 
 	// add extended pairs
 	extPairs := []*bindings.MsgAddExtendedPairsVault{
-		{AppID: 2, PairID: 2, StabilityFee: sdk.MustNewDecFromStr("0.045"), ClosingFee: sdk.MustNewDecFromStr("0"), LiquidationPenalty: sdk.MustNewDecFromStr("0.15"),
+		{
+			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"),
+			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"),
+			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"),
+			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"),
+			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"),
+			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"),
+			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"),
+			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"),
+			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},
+			PairName: "ATOM-C", AssetOutOraclePrice: false, AssetOutPrice: 1000000, MinUsdValueLeft: 10000000000,
+		},
 	}
 
 	for _, extPair := range extPairs {
@@ -180,7 +198,7 @@ func IntializeStates(
 	if err != nil {
 		panic(err)
 	}
-	//whielist for locker rewards
+	// whielist for locker rewards
 	reward := rewardstypes.WhitelistAsset{
 		AppMappingId: 2,
 		AssetId:      3,

proto/comdex/bandoracle/v1beta1/genesis.proto

@@ -11,8 +11,5 @@ option go_package = "github.com/comdex-official/comdex/x/bandoracle/types";
 message GenesisState {
     Params params = 1 [(gogoproto.nullable) = false ];
     string port_id = 2;
-    repeated Market markets = 3 [
-        (gogoproto.moretags) = "yaml:\"markets\"",
-        (gogoproto.nullable) = false
-    ];
+    bool flag = 3;
 }

proto/comdex/collector/v1beta1/collector.proto

@@ -45,7 +45,6 @@ message AppToAssetIdCollectorMapping {
   uint64 app_id = 1 [(gogoproto.moretags) = "yaml:\"app_id\""];
   uint64 asset_id = 2 [(gogoproto.moretags) = "yaml:\"asset_id\""];
   CollectorData collector = 3 [
-    (gogoproto.nullable) = false,
     (gogoproto.moretags) = "yaml:\"collector\""];
 }
 

proto/comdex/market/v1beta1/genesis.proto

@@ -9,8 +9,8 @@ option (gogoproto.equal_all)           = false;
 option (gogoproto.goproto_getters_all) = false;
 
 message GenesisState {
-    repeated Market markets = 1 [
-        (gogoproto.moretags) = "yaml:\"markets\"",
+    repeated TimeWeightedAverage timeWeightedAverage = 1 [
+        (gogoproto.moretags) = "yaml:\"timeWeightedAverage\"",
         (gogoproto.nullable) = false
     ];
 }

proto/comdex/market/v1beta1/market.proto

@@ -7,15 +7,6 @@ option go_package = "github.com/comdex-official/comdex/x/market/types";
 option (gogoproto.equal_all) = false;
 option (gogoproto.goproto_getters_all) = false;
 
-message Market {
-  string symbol = 1 [(gogoproto.moretags) = "yaml:\"symbol\""];
-  uint64 script_id = 2 [
-    (gogoproto.customname) = "ScriptID",
-    (gogoproto.moretags) = "yaml:\"script_id\""
-  ];
-  uint64 rates = 3;
-}
-
 message TimeWeightedAverage {
   uint64 asset_id = 1 [
     (gogoproto.customname) = "AssetID",

proto/comdex/market/v1beta1/query.proto

@@ -17,22 +17,22 @@ message QueryMarketsRequest {
 }
 
 message QueryMarketsResponse {
-  repeated Market markets = 1 [
+  repeated TimeWeightedAverage timeWeightedAverage = 1 [
     (gogoproto.nullable) = false,
-    (gogoproto.moretags) = "yaml:\"markets\""
+    (gogoproto.moretags) = "yaml:\"time_weighted_average\""
   ];
   cosmos.base.query.v1beta1.PageResponse pagination = 2
   [(gogoproto.moretags) = "yaml:\"pagination\""];
 }
 
 message QueryMarketRequest {
-  string symbol = 1 [(gogoproto.moretags) = "yaml:\"symbol\""];
+  uint64 assetID = 1 [(gogoproto.moretags) = "yaml:\"asset_id\""];
 }
 
 message QueryMarketResponse {
-  Market market = 1 [
+  TimeWeightedAverage timeWeightedAverage = 1 [
     (gogoproto.nullable) = false,
-    (gogoproto.moretags) = "yaml:\"market\""
+    (gogoproto.moretags) = "yaml:\"time_weighted_average\""
   ];
 }
 
@@ -47,10 +47,10 @@ message QueryParamsResponse {
 
 service Query {
   rpc QueryMarkets(QueryMarketsRequest) returns (QueryMarketsResponse) {
-    option (google.api.http).get = "/comdex/market/v1beta1/markets";
+    option (google.api.http).get = "/comdex/market/v1beta1/timeWeightedAverage";
   }
   rpc QueryMarket(QueryMarketRequest) returns (QueryMarketResponse) {
-    option (google.api.http).get = "/comdex/market/v1beta1/markets/{symbol}";
+    option (google.api.http).get = "/comdex/market/v1beta1/timeWeightedAverage/{assetID}";
   }
   rpc QueryParams(QueryParamsRequest) returns (QueryParamsResponse) {
     option (google.api.http).get = "/comdex/market/v1beta1/params";

proto/comdex/rewards/v1beta1/query.proto

@@ -48,6 +48,9 @@ service Query {
   rpc QueryWhitelistedAppIdsVault(QueryWhitelistedAppIdsVaultRequest) returns (QueryWhitelistedAppIdsVaultResponse) {
     option (google.api.http).get = "/comdex/rewards/v1beta1/whitelisted_appids_Vault";
   }
+  rpc QueryExternalRewardLends(QueryExternalRewardLendsRequest) returns (QueryExternalRewardLendsResponse) {
+    option (google.api.http).get = "/comdex/rewards/v1beta1/lend_external_rewards";
+  }
 }
 
 
@@ -173,6 +176,19 @@ message QueryWhitelistedAppIdsVaultResponse {
   repeated uint64 whitelistedAppIdsVault = 1
   [(gogoproto.moretags) = "yaml:\"whitelistedAppIdsVault\""];
 
+  cosmos.base.query.v1beta1.PageResponse pagination = 2
+  [(gogoproto.moretags) = "yaml:\"pagination\""];
+}
+
+message QueryExternalRewardLendsRequest{
+  cosmos.base.query.v1beta1.PageRequest pagination = 1
+  [(gogoproto.moretags) = "yaml:\"pagination\""];
+}
+
+message QueryExternalRewardLendsResponse {
+  repeated Lend_external_rewards lend_external_rewards = 1
+  [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"lend_external_rewards\""];
+
   cosmos.base.query.v1beta1.PageResponse pagination = 2
   [(gogoproto.moretags) = "yaml:\"pagination\""];
 }

proto/comdex/rewards/v1beta1/rewards.proto

@@ -162,16 +162,16 @@ message Lend_external_rewards{
   uint64 app_mapping_id = 2 [
     (gogoproto.moretags) = "yaml:\"app_mapping_id\""
   ];
-  repeated Rewards_asset_pool_data rewards_asset_pool_data = 3 [
+  Rewards_asset_pool_data rewards_asset_pool_data = 3 [
     (gogoproto.moretags) = "yaml:\"rewards_asset_pool_data\""
   ];
   cosmos.base.v1beta1.Coin total_rewards = 4 [
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "yaml:\"total_rewards\"",
     (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.Coin"
   ];
-  uint64 reward_asset_id = 5 [
-    (gogoproto.moretags) = "yaml:\"epoch_id\""
+  int64 master_pool_id = 5 [
+    (gogoproto.moretags) = "yaml:\"master_pool_id\""
   ];
   int64 duration_days = 6 [
     (gogoproto.moretags) = "yaml:\"duration_days\""
@@ -212,4 +212,10 @@ message Rewards_asset_pool_data{
   repeated uint64 asset_id = 2 [
     (gogoproto.moretags) = "yaml:\"asset_id\""
   ];
+  uint64 c_swap_app_id = 3 [
+  (gogoproto.moretags) = "yaml:\"c_swap_app_id\""
+  ];
+  uint64 c_swap_min_lock_amount = 4 [
+    (gogoproto.moretags) = "yaml:\"c_swap_min_lock_amount\""
+  ];
 }

proto/comdex/rewards/v1beta1/tx.proto

@@ -13,6 +13,7 @@ service Msg {
   rpc CreateGauge(MsgCreateGauge) returns (MsgCreateGaugeResponse);
   rpc ExternalRewardsLockers(ActivateExternalRewardsLockers) returns (ActivateExternalRewardsLockersResponse);
   rpc ExternalRewardsVault(ActivateExternalRewardsVault) returns (ActivateExternalRewardsVaultResponse);
+  rpc ExternalRewardsLend(ActivateExternalRewardsLend) returns (ActivateExternalRewardsLendResponse);
 }
 
 message MsgCreateGauge {
@@ -131,7 +132,7 @@ message ActivateExternalRewardsVault {
     (gogoproto.moretags) = "yaml:\"app_mapping_id\""
   ];
   uint64 extended_Pair_Id = 2 [
-    (gogoproto.moretags) = "yaml:\"asset_id\""
+    (gogoproto.moretags) = "yaml:\"extended_Pair_Id\""
   ];
   cosmos.base.v1beta1.Coin total_rewards = 3 [
     (gogoproto.nullable) = false,
@@ -149,4 +150,41 @@ message ActivateExternalRewardsVault {
   ];
 }
 
-message ActivateExternalRewardsVaultResponse {}
+message ActivateExternalRewardsVaultResponse {}
+
+message ActivateExternalRewardsLend {
+  uint64 app_mapping_id = 1 [
+    (gogoproto.moretags) = "yaml:\"app_mapping_id\""
+  ];
+  uint64 c_pool_Id = 2 [
+    (gogoproto.moretags) = "yaml:\"c_pool_Id\""
+  ];
+  repeated uint64 asset_id= 3 [
+    (gogoproto.moretags) = "yaml:\"asset_id\""
+  ];
+  uint64 c_swap_app_id = 4 [
+    (gogoproto.moretags) = "yaml:\"c_swap_app_id\""
+  ];
+  uint64 c_swap_min_lock_amount = 5 [
+    (gogoproto.moretags) = "yaml:\"c_swap_app_id\""
+  ];
+  cosmos.base.v1beta1.Coin total_rewards = 6 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"total_rewards\"",
+    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.Coin"
+  ];
+  int64 master_pool_id = 7 [
+    (gogoproto.moretags) = "yaml:\"master_pool_id\""
+  ];
+  int64 duration_days = 8 [
+    (gogoproto.moretags) = "yaml:\"duration_days\""
+  ];
+  int64 min_lockup_time_seconds = 9 [
+    (gogoproto.moretags) = "yaml:\"min_lockup_time_seconds\""
+  ];
+  string depositor = 10 [
+    (gogoproto.moretags) = "yaml:\"depositor\""
+  ];
+}
+
+message ActivateExternalRewardsLendResponse {}

x/asset/expected/keeper.go

@@ -3,16 +3,10 @@ package expected
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/comdex-official/comdex/x/market/types"
 	rewardstypes "github.com/comdex-official/comdex/x/rewards/types"
 	vaulttypes "github.com/comdex-official/comdex/x/vault/types"
 )
 
-type MarketKeeper interface {
-	GetMarketForAsset(ctx sdk.Context, id uint64) (types.Market, bool)
-	GetPriceForMarket(ctx sdk.Context, symbol string) (uint64, bool)
-}
-
 type RewardsKeeper interface {
 	GetAppIDByApp(ctx sdk.Context, appID uint64) (uint64, bool)
 	CalculationOfRewards(ctx sdk.Context, amount sdk.Int, lsr sdk.Dec, bTime int64) (sdk.Dec, error)

x/asset/keeper/asset.go

@@ -256,37 +256,3 @@ func (k Keeper) UpdateAssetRecords(ctx sdk.Context, msg types.Asset) error {
 	k.SetAsset(ctx, asset)
 	return nil
 }
-
-func (k Keeper) AddPairsRecords(ctx sdk.Context, msg types.Pair) error {
-	if !k.HasAsset(ctx, msg.AssetIn) {
-		return types.ErrorAssetDoesNotExist
-	}
-	if !k.HasAsset(ctx, msg.AssetOut) {
-		return types.ErrorAssetDoesNotExist
-	}
-	if msg.AssetIn == msg.AssetOut {
-		return types.ErrorDuplicateAsset
-	}
-	pairs := k.GetPairs(ctx)
-	for _, data := range pairs {
-		if data.AssetIn == msg.AssetIn && data.AssetOut == msg.AssetOut {
-			return types.ErrorDuplicatePair
-		} else if (data.AssetIn == msg.AssetOut) && (data.AssetOut == msg.AssetIn) {
-			return types.ErrorReversePairAlreadyExist
-		}
-	}
-
-	var (
-		id   = k.GetPairID(ctx)
-		pair = types.Pair{
-			Id:       id + 1,
-			AssetIn:  msg.AssetIn,
-			AssetOut: msg.AssetOut,
-		}
-	)
-
-	k.SetPairID(ctx, pair.Id)
-	k.SetPair(ctx, pair)
-
-	return nil
-}

x/asset/keeper/keeper.go

@@ -14,13 +14,12 @@ type Keeper struct {
 	cdc        codec.BinaryCodec
 	key        sdk.StoreKey
 	params     paramstypes.Subspace
-	oracle     expected.MarketKeeper
 	rewards    expected.RewardsKeeper
 	vault      expected.VaultKeeper
 	bandoracle expected.Bandoraclekeeper
 }
 
-func NewKeeper(cdc codec.BinaryCodec, key sdk.StoreKey, params paramstypes.Subspace, oracle expected.MarketKeeper, rewards expected.RewardsKeeper, vault expected.VaultKeeper, bandoracle expected.Bandoraclekeeper) Keeper {
+func NewKeeper(cdc codec.BinaryCodec, key sdk.StoreKey, params paramstypes.Subspace, rewards expected.RewardsKeeper, vault expected.VaultKeeper, bandoracle expected.Bandoraclekeeper) Keeper {
 	if !params.HasKeyTable() {
 		params = params.WithKeyTable(assettypes.ParamKeyTable())
 	}
@@ -29,7 +28,6 @@ func NewKeeper(cdc codec.BinaryCodec, key sdk.StoreKey, params paramstypes.Subsp
 		cdc:        cdc,
 		key:        key,
 		params:     params,
-		oracle:     oracle,
 		rewards:    rewards,
 		vault:      vault,
 		bandoracle: bandoracle,