test cases fix

app/app.go

@@ -734,7 +734,7 @@ func New(
 	}
 	supportedFeatures := "iterator,staking,stargate,comdex"
 
-	wasmOpts = append(cwasm.RegisterCustomPlugins(&app.LockerKeeper, &app.TokenmintKeeper, &app.AssetKeeper, &app.Rewardskeeper, &app.CollectorKeeper, &app.LiquidationKeeper, &app.AuctionKeeper, &app.EsmKeeper, &app.VaultKeeper), wasmOpts...)
+	wasmOpts = append(cwasm.RegisterCustomPlugins(&app.LockerKeeper, &app.TokenmintKeeper, &app.AssetKeeper, &app.Rewardskeeper, &app.CollectorKeeper, &app.LiquidationKeeper, &app.AuctionKeeper, &app.EsmKeeper, &app.VaultKeeper, &app.LendKeeper, &app.LiquidityKeeper), wasmOpts...)
 
 	app.WasmKeeper = wasmkeeper.NewKeeper(
 		app.cdc,

app/wasm/bindings/query.go

@@ -26,6 +26,9 @@ type ComdexQuery struct {
 	ExtendedPairByApp                      *ExtendedPairByApp                      `json:"extended_pair_by_app,omitempty"`
 	CheckSurplusReward                     *CheckSurplusReward                     `json:"check_surplus_reward,omitempty"`
 	CheckWhitelistedAsset                  *CheckWhitelistedAsset                  `json:"check_whitelisted_asset,omitempty"`
+	CheckVaultCreated                      *CheckVaultCreated                      `json:"check_vault_created,omitempty"`
+	CheckBorrowed                          *CheckBorrowed                          `json:"check_borrowed,omitempty"`
+	CheckLiquidityProvided                 *CheckLiquidityProvided                 `json:"check_liquidity_provided,omitempty"`
 }
 
 type AppData struct {
@@ -251,3 +254,31 @@ type CheckWhitelistedAsset struct {
 type CheckWhitelistedAssetResponse struct {
 	Found bool `json:"found"`
 }
+
+type CheckVaultCreated struct {
+	Address string `json:"address"`
+	AppID   uint64 `json:"app_id"`
+}
+
+type VaultCreatedResponse struct {
+	IsCompleted bool `json:"is_completed"`
+}
+
+type CheckBorrowed struct {
+	AssetID uint64 `json:"asset_id"`
+	Address string `json:"address"`
+}
+
+type BorrowedResponse struct {
+	IsCompleted bool `json:"is_completed"`
+}
+
+type CheckLiquidityProvided struct {
+	AppID   uint64 `json:"app_id"`
+	PoolID  uint64 `json:"pool_id"`
+	Address string `json:"address"`
+}
+
+type LiquidityProvidedResponse struct {
+	IsCompleted bool `json:"is_completed"`
+}

app/wasm/queries.go

@@ -6,7 +6,9 @@ import (
 	assetKeeper "github.com/comdex-official/comdex/x/asset/keeper"
 	collectorkeeper "github.com/comdex-official/comdex/x/collector/keeper"
 	esmKeeper "github.com/comdex-official/comdex/x/esm/keeper"
+	lendKeeper "github.com/comdex-official/comdex/x/lend/keeper"
 	liquidationKeeper "github.com/comdex-official/comdex/x/liquidation/keeper"
+	liquidityKeeper "github.com/comdex-official/comdex/x/liquidity/keeper"
 	lockerkeeper "github.com/comdex-official/comdex/x/locker/keeper"
 	rewardsKeeper "github.com/comdex-official/comdex/x/rewards/keeper"
 	tokenMintKeeper "github.com/comdex-official/comdex/x/tokenmint/keeper"
@@ -22,6 +24,8 @@ type QueryPlugin struct {
 	liquidationKeeper *liquidationKeeper.Keeper
 	esmKeeper         *esmKeeper.Keeper
 	vaultKeeper       *vaultKeeper.Keeper
+	lendKeeper        *lendKeeper.Keeper
+	liquidityKeeper   *liquidityKeeper.Keeper
 }
 
 func NewQueryPlugin(
@@ -33,6 +37,8 @@ func NewQueryPlugin(
 	liquidation *liquidationKeeper.Keeper,
 	esmKeeper *esmKeeper.Keeper,
 	vaultKeeper *vaultKeeper.Keeper,
+	lendKeeper *lendKeeper.Keeper,
+	liquidityKeeper *liquidityKeeper.Keeper,
 ) *QueryPlugin {
 	return &QueryPlugin{
 		assetKeeper:       assetKeeper,
@@ -43,6 +49,8 @@ func NewQueryPlugin(
 		liquidationKeeper: liquidation,
 		esmKeeper:         esmKeeper,
 		vaultKeeper:       vaultKeeper,
+		lendKeeper:        lendKeeper,
+		liquidityKeeper:   liquidityKeeper,
 	}
 }
 
@@ -164,3 +172,26 @@ func (qp QueryPlugin) WasmCheckWhitelistedAsset(ctx sdk.Context, denom string) (
 	found = qp.assetKeeper.WasmCheckWhitelistedAssetQuery(ctx, denom)
 	return found
 }
+
+func (qp QueryPlugin) WasmCheckVaultCreated(ctx sdk.Context, address string, appID uint64) (found bool) {
+	_, found = qp.vaultKeeper.GetUserAppMappingData(ctx, address, appID)
+	return found
+}
+
+func (qp QueryPlugin) WasmCheckBorrowed(ctx sdk.Context, assetID uint64, address string) (found bool) {
+	found = qp.lendKeeper.WasmHasBorrowForAddressAndAsset(ctx, assetID, address)
+	return found
+}
+
+func (qp QueryPlugin) WasmCheckLiquidityProvided(ctx sdk.Context, appID, poolID uint64, address string) (found bool) {
+	farmer, err := sdk.AccAddressFromBech32(address)
+	if err != nil {
+		return false
+	}
+	_, found = qp.liquidityKeeper.GetActiveFarmer(ctx, appID, poolID, farmer)
+	_, found2 := qp.liquidityKeeper.GetQueuedFarmer(ctx, appID, poolID, farmer)
+	if found || found2 {
+		return true
+	}
+	return false
+}

app/wasm/query_plugin.go

@@ -307,6 +307,43 @@ func CustomQuerier(queryPlugin *QueryPlugin) func(ctx sdk.Context, request json.
 				return nil, sdkerrors.Wrap(err, "CheckWhitelistedAssetResponse query response")
 			}
 			return bz, nil
+		} else if comdexQuery.CheckVaultCreated != nil {
+			Address := comdexQuery.CheckVaultCreated.Address
+			AppID := comdexQuery.CheckVaultCreated.AppID
+			found := queryPlugin.WasmCheckVaultCreated(ctx, Address, AppID)
+			res := bindings.VaultCreatedResponse{
+				IsCompleted: found,
+			}
+			bz, err := json.Marshal(res)
+			if err != nil {
+				return nil, sdkerrors.Wrap(err, "VaultCreatedResponse query response")
+			}
+			return bz, nil
+		} else if comdexQuery.CheckBorrowed != nil {
+			AssetID := comdexQuery.CheckBorrowed.AssetID
+			Address := comdexQuery.CheckBorrowed.Address
+			found := queryPlugin.WasmCheckBorrowed(ctx, AssetID, Address)
+			res := bindings.BorrowedResponse{
+				IsCompleted: found,
+			}
+			bz, err := json.Marshal(res)
+			if err != nil {
+				return nil, sdkerrors.Wrap(err, "BorrowedResponse query response")
+			}
+			return bz, nil
+		} else if comdexQuery.CheckLiquidityProvided != nil {
+			AppID := comdexQuery.CheckLiquidityProvided.AppID
+			PoolID := comdexQuery.CheckLiquidityProvided.PoolID
+			Address := comdexQuery.CheckLiquidityProvided.Address
+			found := queryPlugin.WasmCheckLiquidityProvided(ctx, AppID, PoolID, Address)
+			res := bindings.LiquidityProvidedResponse{
+				IsCompleted: found,
+			}
+			bz, err := json.Marshal(res)
+			if err != nil {
+				return nil, sdkerrors.Wrap(err, "LiquidityProvidedResponse query response")
+			}
+			return bz, nil
 		}
 		return nil, wasmvmtypes.UnsupportedRequest{Kind: "unknown App Data query variant"}
 	}

app/wasm/test/messages_test.go

@@ -20,7 +20,9 @@ func TestWhitelistAssetLocker(t *testing.T) {
 		&comdex.CollectorKeeper,
 		&comdex.LiquidationKeeper,
 		&comdex.EsmKeeper,
-		&comdex.VaultKeeper)
+		&comdex.VaultKeeper,
+		&comdex.LendKeeper,
+		&comdex.LiquidityKeeper)
 	for _, tc := range []struct {
 		name            string
 		msg             *bindings.MsgWhiteListAssetLocker
@@ -61,7 +63,9 @@ func TestAddMsgAddExtendedPairsVault(t *testing.T) {
 		&comdex.CollectorKeeper,
 		&comdex.LiquidationKeeper,
 		&comdex.EsmKeeper,
-		&comdex.VaultKeeper)
+		&comdex.VaultKeeper,
+		&comdex.LendKeeper,
+		&comdex.LiquidityKeeper)
 	for _, tc := range []struct {
 		name            string
 		msg             *bindings.MsgAddExtendedPairsVault
@@ -116,7 +120,9 @@ func TestMsgSetCollectorLookupTable(t *testing.T) {
 		&comdex.CollectorKeeper,
 		&comdex.LiquidationKeeper,
 		&comdex.EsmKeeper,
-		&comdex.VaultKeeper)
+		&comdex.VaultKeeper,
+		&comdex.LendKeeper,
+		&comdex.LiquidityKeeper)
 	for _, tc := range []struct {
 		name            string
 		msg             *bindings.MsgSetCollectorLookupTable
@@ -165,7 +171,9 @@ func TestMsgSetAuctionMappingForApp(t *testing.T) {
 		&comdex.CollectorKeeper,
 		&comdex.LiquidationKeeper,
 		&comdex.EsmKeeper,
-		&comdex.VaultKeeper)
+		&comdex.VaultKeeper,
+		&comdex.LendKeeper,
+		&comdex.LiquidityKeeper)
 	for _, tc := range []struct {
 		name            string
 		msg             *bindings.MsgSetAuctionMappingForApp
@@ -213,7 +221,9 @@ func TestMsgUpdateCollectorLookupTable(t *testing.T) {
 		&comdex.CollectorKeeper,
 		&comdex.LiquidationKeeper,
 		&comdex.EsmKeeper,
-		&comdex.VaultKeeper)
+		&comdex.VaultKeeper,
+		&comdex.LendKeeper,
+		&comdex.LiquidityKeeper)
 	for _, tc := range []struct {
 		name            string
 		msg             *bindings.MsgUpdateCollectorLookupTable
@@ -262,7 +272,9 @@ func TestMsgUpdatePairsVault(t *testing.T) {
 		&comdex.CollectorKeeper,
 		&comdex.LiquidationKeeper,
 		&comdex.EsmKeeper,
-		&comdex.VaultKeeper)
+		&comdex.VaultKeeper,
+		&comdex.LendKeeper,
+		&comdex.LiquidityKeeper)
 	for _, tc := range []struct {
 		name            string
 		msg             *bindings.MsgUpdatePairsVault
@@ -315,7 +327,9 @@ func TestMsgWhitelistAppIDLiquidation(t *testing.T) {
 		&comdex.CollectorKeeper,
 		&comdex.LiquidationKeeper,
 		&comdex.EsmKeeper,
-		&comdex.VaultKeeper)
+		&comdex.VaultKeeper,
+		&comdex.LendKeeper,
+		&comdex.LiquidityKeeper)
 	for _, tc := range []struct {
 		name            string
 		msg             *bindings.MsgWhitelistAppIDLiquidation
@@ -360,7 +374,9 @@ func TestMsgRemoveWhitelistAppIDLiquidation(t *testing.T) {
 		&comdex.CollectorKeeper,
 		&comdex.LiquidationKeeper,
 		&comdex.EsmKeeper,
-		&comdex.VaultKeeper)
+		&comdex.VaultKeeper,
+		&comdex.LendKeeper,
+		&comdex.LiquidityKeeper)
 	for _, tc := range []struct {
 		name            string
 		msg             *bindings.MsgRemoveWhitelistAppIDLiquidation
@@ -401,7 +417,9 @@ func TestMsgAddAuctionParams(t *testing.T) {
 		&comdex.CollectorKeeper,
 		&comdex.LiquidationKeeper,
 		&comdex.EsmKeeper,
-		&comdex.VaultKeeper)
+		&comdex.VaultKeeper,
+		&comdex.LendKeeper,
+		&comdex.LiquidityKeeper)
 	for _, tc := range []struct {
 		name            string
 		msg             *bindings.MsgAddAuctionParams

app/wasm/wasm.go

@@ -8,7 +8,9 @@ import (
 	auctionKeeper "github.com/comdex-official/comdex/x/auction/keeper"
 	collectorKeeper "github.com/comdex-official/comdex/x/collector/keeper"
 	esmKeeper "github.com/comdex-official/comdex/x/esm/keeper"
+	lendKeeper "github.com/comdex-official/comdex/x/lend/keeper"
 	liquidationKeeper "github.com/comdex-official/comdex/x/liquidation/keeper"
+	liquidityKeeper "github.com/comdex-official/comdex/x/liquidity/keeper"
 	lockerkeeper "github.com/comdex-official/comdex/x/locker/keeper"
 	rewardsKeeper "github.com/comdex-official/comdex/x/rewards/keeper"
 	tokenMintkeeper "github.com/comdex-official/comdex/x/tokenmint/keeper"
@@ -25,8 +27,10 @@ func RegisterCustomPlugins(
 	auction *auctionKeeper.Keeper,
 	esm *esmKeeper.Keeper,
 	vault *vaultKeeper.Keeper,
+	lend *lendKeeper.Keeper,
+	liquidity *liquidityKeeper.Keeper,
 ) []wasmkeeper.Option {
-	comdexQueryPlugin := NewQueryPlugin(asset, locker, tokenMint, rewards, collector, liquidation, esm, vault)
+	comdexQueryPlugin := NewQueryPlugin(asset, locker, tokenMint, rewards, collector, liquidation, esm, vault, lend, liquidity)
 
 	appDataQueryPluginOpt := wasmkeeper.WithQueryPlugins(&wasmkeeper.QueryPlugins{
 		Custom: CustomQuerier(comdexQueryPlugin),

proto/comdex/auction/v1beta1/genesis.proto

@@ -20,4 +20,5 @@ message GenesisState {
   repeated AuctionParams auctionParams = 5
   [ (gogoproto.moretags) = "yaml:\"auctionParams\"", (gogoproto.nullable) = false ];
   Params params = 6 [(gogoproto.nullable) = false];
+  uint64 UserBiddingID  = 7 ;
 }

proto/comdex/bandoracle/v1beta1/tx.proto

@@ -25,6 +25,7 @@ message MsgFetchPriceData {
   uint64 prepare_gas = 9;
   uint64 execute_gas = 10;
   string client_id = 11 [(gogoproto.customname) = "ClientID"];
+  uint64 twa_batch_size = 12;
 }
 
 message MsgFetchPriceDataResponse {

proto/comdex/lend/v1beta1/tx.proto

@@ -35,9 +35,8 @@ service Msg {
   // FundModuleAccounts funds an existing module account
   rpc FundModuleAccounts(MsgFundModuleAccounts) returns (MsgFundModuleAccountsResponse);
 
-  rpc CalculateBorrowInterest(MsgCalculateBorrowInterest) returns (MsgCalculateBorrowInterestResponse);
+  rpc CalculateInterestAndRewards(MsgCalculateInterestAndRewards) returns (MsgCalculateInterestAndRewardsResponse);
 
-  rpc CalculateLendRewards(MsgCalculateLendRewards) returns (MsgCalculateLendRewardsResponse);
 }
 
 message MsgLend {
@@ -115,15 +114,10 @@ message MsgFundModuleAccounts {
   cosmos.base.v1beta1.Coin amount = 4 [(gogoproto.nullable) = false];
 }
 
-message MsgCalculateBorrowInterest {
+message MsgCalculateInterestAndRewards {
   string                   borrower = 1;
-  uint64                   borrow_id = 2;
 }
 
-message    MsgCalculateLendRewards{
-  string                   lender = 1;
-  uint64                   lend_id = 2;
-}
 
 message MsgLendResponse {}
 
@@ -147,6 +141,4 @@ message MsgBorrowAlternateResponse {}
 
 message MsgFundModuleAccountsResponse {}
 
-message MsgCalculateBorrowInterestResponse {}
-
-message MsgCalculateLendRewardsResponse {}
+message MsgCalculateInterestAndRewardsResponse {}

scripts/comdex_local_setup/states.py

@@ -411,15 +411,15 @@
         "name": "Vesting Contract",
         "contractAddressKey": "vesting_contract",
         "contractLink": "https://github.com/comdex-official/test-wasm-artifacts/raw/main/token_vesting.wasm",
-        "contractPath": f"{COMDEX_DIR_PATH}/scripts/comdex_local_setup/token_vesting.wasm",
+        "contractPath": f"./token_vesting.wasm",
         "initator": {},
         "formatKeys": []
     },
     {
         "name": "Locking Contract",
         "contractAddressKey": "locking_contract",
         "contractLink": "https://github.com/comdex-official/test-wasm-artifacts/raw/main/locking_contract.wasm",
-        "contractPath": f"{COMDEX_DIR_PATH}/scripts/comdex_local_setup/locking_contract.wasm",
+        "contractPath": f"./locking_contract.wasm",
         "initator": {
             "t1": {"period": 500, "weight": "0.25"},
             "t2": {"period": 1000, "weight": "0.50"},
@@ -434,17 +434,19 @@
                 "app_id": 1,
                 "total_rewards": "10000000000000",
                 "rewards_pending": "10000000000000",
-                "emmission_rate": "0.01",
+                "emission_rate": "0.01",
                 "distributed_rewards": "0",
             },
+            "min_lock_amount" : "200",
+            "admin":"comdex1qaqxur3esruxdmxtyhxl4safu88l273dfkplk2"
         },
         "formatKeys": ['vesting_contract']
     },
     {
         "name": "Governance Contract",
         "contractAddressKey": "governance_contract",
         "contractLink": "https://github.com/comdex-official/test-wasm-artifacts/raw/main/governance.wasm",
-        "contractPath": f"{COMDEX_DIR_PATH}/scripts/comdex_local_setup/governance.wasm",
+        "contractPath": f"./governance.wasm",
         "initator": {
             "threshold": {"threshold_quorum": {"threshold": "0.50", "quorum": "0.33"}},
             "target": "0.0.0.0:9090",

x/asset/keeper/asset_test.go

@@ -426,6 +426,7 @@ func (s *KeeperTestSuite) TestWasmUpdatePairsVault() {
 				ClosingFee:         sdk.MustNewDecFromStr("233.23"),
 				LiquidationPenalty: sdk.MustNewDecFromStr("0.56"),
 				DrawDownFee:        sdk.MustNewDecFromStr("0.29"),
+				IsVaultActive:      true,
 				DebtCeiling:        1000000000,
 				DebtFloor:          1000,
 				MinCr:              sdk.MustNewDecFromStr("1.8"),

x/auction/abci.go

@@ -34,20 +34,6 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper, assetKeeper expected.AssetKe
 			}
 		}
 
-		// lockedVaults := k.GetLockedVaults(ctx)
-
-		//if len(lockedVaults) > 0 {
-		//	err3 := k.DutchActivator(ctx, lockedVaults)
-		//	if err3 != nil {
-		//		ctx.Logger().Error("error in dutch activator")
-		//	}
-		//
-		//	err5 := k.LendDutchActivator(ctx, lockedVaults)
-		//	if err5 != nil {
-		//		ctx.Logger().Error("error in lend dutch activator")
-		//	}
-		//}
-
 		apps, appsFound := assetKeeper.GetApps(ctx)
 
 		if appsFound {