updating query for net staking amount

elys-network · Jan 20, 2025 · 8817466 · 8817466
1 parent 7f443c4
commit 8817466
Show file tree

Hide file tree

Showing 6 changed files with 540 additions and 543 deletions.
diff --git a/api/elys/masterchef/query.pulsar.go b/api/elys/masterchef/query.pulsar.go
diff --git a/proto/elys/leveragelp/tx.proto b/proto/elys/leveragelp/tx.proto
@@ -26,7 +26,8 @@ service Msg {
   rpc Dewhitelist(MsgDewhitelist) returns (MsgDewhitelistResponse);
   rpc UpdateStopLoss(MsgUpdateStopLoss) returns (MsgUpdateStopLossResponse);
   rpc ClosePositions(MsgClosePositions) returns (MsgClosePositionsResponse);
-  rpc UpdateEnabledPools(MsgUpdateEnabledPools) returns (MsgUpdateEnabledPoolsResponse);
+  rpc UpdateEnabledPools(MsgUpdateEnabledPools)
+      returns (MsgUpdateEnabledPoolsResponse);
 }
 message MsgOpen {
   option (cosmos.msg.v1.signer) = "creator";

diff --git a/proto/elys/masterchef/query.proto b/proto/elys/masterchef/query.proto
@@ -143,7 +143,7 @@ message QueryChainTVLResponse {
     (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
-  repeated cosmos.base.v1beta1.Coin borrowed = 6 [
+  repeated cosmos.base.v1beta1.Coin net_stakings = 6 [
     (gogoproto.nullable) = false,
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
   ];

diff --git a/proto/elys/perpetual/tx.proto b/proto/elys/perpetual/tx.proto
@@ -24,8 +24,8 @@ service Msg {
   rpc ClosePositions(MsgClosePositions) returns (MsgClosePositionsResponse);
   rpc UpdateTakeProfitPrice(MsgUpdateTakeProfitPrice)
       returns (MsgUpdateTakeProfitPriceResponse);
-  rpc UpdateEnabledPools(MsgUpdateEnabledPools) returns (MsgUpdateEnabledPoolsResponse);
-
+  rpc UpdateEnabledPools(MsgUpdateEnabledPools)
+      returns (MsgUpdateEnabledPoolsResponse);
 }
 message MsgOpen {
   option (cosmos.msg.v1.signer) = "creator";

diff --git a/x/masterchef/keeper/query_chain_tvl.go b/x/masterchef/keeper/query_chain_tvl.go
@@ -39,8 +39,6 @@ func (k Keeper) ChainTVL(goCtx context.Context, req *types.QueryChainTVLRequest)
 		return nil, status.Error(codes.NotFound, "asset profile not found")
 	}
 
-	baseCurrencyPrice := k.oracleKeeper.GetAssetPriceFromDenom(ctx, baseCurrencyEntry.Denom)
-
 	stableStakeTVL := k.stableKeeper.TVL(ctx, k.oracleKeeper, baseCurrencyEntry.Denom)
 	totalTVL = totalTVL.Add(stableStakeTVL.TruncateInt())
 
@@ -55,16 +53,14 @@ func (k Keeper) ChainTVL(goCtx context.Context, req *types.QueryChainTVLRequest)
 	stakedEdenValue := elysPrice.MulInt(stakedEden)
 	totalTVL = totalTVL.Add(stakedEdenValue.TruncateInt())
 
-	stableStakeParams := k.stableKeeper.GetParams(ctx)
 	stableStakeBalance := k.bankKeeper.GetBalance(ctx, authtypes.NewModuleAddress(stablestaketypes.ModuleName), baseCurrencyEntry.Denom)
-	borrowed := stableStakeParams.TotalValue.Sub(stableStakeBalance.Amount)
 
 	return &types.QueryChainTVLResponse{
 		Total:       totalTVL,
 		Pools:       poolsTVL.TruncateInt(),
 		UsdcStaking: stableStakeTVL.TruncateInt(),
 		StakedElys:  stakedElysValue.TruncateInt(),
 		StakedEden:  stakedEdenValue.TruncateInt(),
-		Borrowed:    sdk.NewCoins(sdk.NewCoin(baseCurrencyEntry.DisplayName, baseCurrencyPrice.MulInt(borrowed).TruncateInt())),
+		NetStakings: sdk.NewCoins(sdk.NewCoin(baseCurrencyEntry.DisplayName, stableStakeBalance.Amount)),
 	}, nil
 }