improve liquidation price query

Author: keithsue

api/side/lending/query.pulsar.go

@@ -121,7 +121,8 @@ message QueryLiquidationPriceRequest {
 }
 
 message QueryLiquidationPriceResponse {
-    string liquidation_price = 1;
+    string price = 1;
+    string pair = 2;
 }
 
 message QueryDlcEventCountRequest {}

docs/static/openapi.yml

@@ -143,7 +143,7 @@ func (k Keeper) UpdateDLCEvent(ctx sdk.Context, loanId string) {
 
 	// update outcomes
 	dlcEvent.Outcomes = []string{
-		fmt.Sprintf("Liquidated at %s", types.FormatPrice(loan.LiquidationPrice, types.GetPricePair(pool.Config))),
+		fmt.Sprintf("Liquidated at %s", types.FormatPriceWithPair(loan.LiquidationPrice, types.GetPricePair(pool.Config))),
 		fmt.Sprintf("Default liquidated at %d", loan.MaturityTime),
 		"Repaid",
 	}

proto/side/lending/query.proto

@@ -138,7 +138,8 @@ func (k Keeper) LiquidationPrice(goCtx context.Context, req *types.QueryLiquidat
 	liquidationPrice := types.GetLiquidationPrice(collateralAmount.Amount, int(poolConfig.CollateralAsset.Decimals), borrowedAmount.Amount, int(poolConfig.LendingAsset.Decimals), trancheConfig.Maturity, trancheConfig.BorrowAPR, k.GetBlocksPerYear(ctx), poolConfig.LiquidationThreshold, poolConfig.CollateralAsset.IsBasePriceAsset)
 
 	return &types.QueryLiquidationPriceResponse{
-		LiquidationPrice: types.FormatPrice(liquidationPrice, types.GetPricePair(poolConfig)),
+		Price: types.FormatPrice(liquidationPrice),
+		Pair:  types.GetPricePair(poolConfig),
 	}, nil
 }
 

x/lending/keeper/dlc.go

@@ -6,10 +6,11 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/shopspring/decimal"
+
 	errorsmod "cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/shopspring/decimal"
 
 	"github.com/sideprotocol/side/bitcoin/crypto/adaptor"
 	liquidationtypes "github.com/sideprotocol/side/x/liquidation/types"
@@ -108,10 +109,16 @@ func GetPricePair(poolConfig PoolConfig) string {
 
 // FormatPrice formats the given price
 // Assume that the given price is valid
-func FormatPrice(price sdkmath.LegacyDec, pair string) string {
+func FormatPrice(price sdkmath.LegacyDec) string {
 	decimalPrice, _ := decimal.NewFromString(price.String())
 
-	return fmt.Sprintf("%s%s", decimalPrice.String(), pair)
+	return decimalPrice.String()
+}
+
+// FormatPrice formats the given price with the specified pair
+// Assume that the given price is valid
+func FormatPriceWithPair(price sdkmath.LegacyDec, pair string) string {
+	return fmt.Sprintf("%s%s", FormatPrice(price), pair)
 }
 
 // NormalizePrice normalizes the given price