[Tier]: Add more fields to query (#657)

* add more fields * update query * fix * fix * fix
elys-network · Jul 17, 2024 · 07597e3 · 07597e3
1 parent d8fa76e
commit 07597e3
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 91 deletions.
diff --git a/proto/elys/tier/query.proto b/proto/elys/tier/query.proto
@@ -174,7 +174,9 @@ message QueryGetConsolidatedPriceRequest {
 }
 
 message QueryGetConsolidatedPriceResponse {
-  string price = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
+  string ammPrice = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
+  string oraclePrice = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
+  string oraclePriceDec = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
 }
 
 message QueryStakedRequest {

diff --git a/x/tier/keeper/portfolio.go b/x/tier/keeper/portfolio.go
@@ -246,24 +246,31 @@ func (k Keeper) RetrieveLeverageLpTotal(ctx sdk.Context, user sdk.AccAddress) sd
 	return totalValue
 }
 
-func (k Keeper) RetrieveConsolidatedPrice(ctx sdk.Context, denom string) (sdk.Dec, error) {
+func (k Keeper) RetrieveConsolidatedPrice(ctx sdk.Context, denom string) (sdk.Dec, sdk.Dec, sdk.Dec) {
 	if denom == ptypes.Eden {
 		denom = ptypes.Elys
 	}
-	tokenPrice := k.oracleKeeper.GetAssetPriceFromDenom(ctx, denom)
+	tokenPriceOracle := k.oracleKeeper.GetAssetPriceFromDenom(ctx, denom)
 	asset, found := k.assetProfileKeeper.GetEntryByDenom(ctx, denom)
 	if !found {
-		return sdk.ZeroDec(), types.ErrNotFound
+		tokenPriceOracle = sdk.NewDec(0)
 	}
-	if tokenPrice.Equal(sdk.ZeroDec()) {
-		tokenPrice = k.CalcAmmPrice(ctx, asset.Denom, asset.Decimals)
+	tokenPriceAmm := k.CalcAmmPrice(ctx, asset.Denom, asset.Decimals)
+	info, found := k.oracleKeeper.GetAssetInfo(ctx, denom)
+	tokenPriceOracleDec := sdk.ZeroDec()
+	if found {
+		tokenPriceOracleD, found := k.oracleKeeper.GetAssetPrice(ctx, info.Display)
+		if found {
+			tokenPriceOracleDec = tokenPriceOracleD.Price
+		}
 	}
-	return tokenPrice, nil
+
+	return tokenPriceOracle, tokenPriceAmm, tokenPriceOracleDec
 }
 
 func (k Keeper) CalcAmmPrice(ctx sdk.Context, denom string, decimal uint64) sdk.Dec {
 	usdcDenom, found := k.assetProfileKeeper.GetUsdcDenom(ctx)
-	if !found {
+	if !found || denom == usdcDenom {
 		return sdk.ZeroDec()
 	}
 	usdcPrice := k.oracleKeeper.GetAssetPriceFromDenom(ctx, usdcDenom)

diff --git a/x/tier/keeper/query_get_consolidated_price.go b/x/tier/keeper/query_get_consolidated_price.go
@@ -16,12 +16,11 @@ func (k Keeper) GetConsolidatedPrice(goCtx context.Context, req *types.QueryGetC
 
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	resp, err := k.RetrieveConsolidatedPrice(ctx, req.Denom)
-	if err != nil {
-		return nil, err
-	}
+	oracle, amm, oracleDec := k.RetrieveConsolidatedPrice(ctx, req.Denom)
 
 	return &types.QueryGetConsolidatedPriceResponse{
-		Price: resp,
+		AmmPrice:       amm,
+		OraclePrice:    oracle,
+		OraclePriceDec: oracleDec,
 	}, nil
 }
diff --git a/x/tier/types/expected_keepers.go b/x/tier/types/expected_keepers.go
@@ -35,6 +35,7 @@ type BankKeeper interface {
 }
 
 type OracleKeeper interface {
+	GetAssetInfo(ctx sdk.Context, denom string) (val oracletypes.AssetInfo, found bool)
 	GetAssetPrice(ctx sdk.Context, asset string) (oracletypes.Price, bool)
 	GetAssetPriceFromDenom(ctx sdk.Context, denom string) sdk.Dec
 	GetPriceFeeder(ctx sdk.Context, feeder string) (val oracletypes.PriceFeeder, found bool)