add asset metadata to pool config

Author: keithsue

api/side/lending/lending.pulsar.go

@@ -16,6 +16,13 @@ enum PoolStatus {
     PAUSED = 2;
 }
 
+message AssetMetadata {
+    string denom = 1;
+    string symbol = 2;
+    string price_symbol = 3;
+    int32 decimals = 4;
+}
+
 // Pool tranche config
 message PoolTrancheConfig {
   // maturity duration in seconds
@@ -28,47 +35,51 @@ message PoolTrancheConfig {
 
 // Pool config
 message PoolConfig {
+    // collateral asset metadata
+    AssetMetadata collateral_asset = 1 [(gogoproto.nullable) = false];
+    // lending asset metadata
+    AssetMetadata lending_asset = 2 [(gogoproto.nullable) = false];
     // supply cap
-    string supply_cap = 1 [
+    string supply_cap = 3 [
       (gogoproto.customtype) = "cosmossdk.io/math.Int",
       (gogoproto.nullable) = false
     ];
     // borrow cap
-    string borrow_cap = 2 [
+    string borrow_cap = 4 [
       (gogoproto.customtype) = "cosmossdk.io/math.Int",
       (gogoproto.nullable) = false
     ];
     // minimum amount to be borrowed
-    string min_borrow_amount = 3 [
+    string min_borrow_amount = 5 [
       (gogoproto.customtype) = "cosmossdk.io/math.Int",
       (gogoproto.nullable) = false
     ];
     // maximum amount to be borrowed
-    string max_borrow_amount = 4 [
+    string max_borrow_amount = 6 [
       (gogoproto.customtype) = "cosmossdk.io/math.Int",
       (gogoproto.nullable) = false
     ];
     // tranches
-    repeated PoolTrancheConfig tranches = 5 [(gogoproto.nullable) = false];
+    repeated PoolTrancheConfig tranches = 7 [(gogoproto.nullable) = false];
     // request fee
-    cosmos.base.v1beta1.Coin request_fee = 6 [
+    cosmos.base.v1beta1.Coin request_fee = 8 [
       (gogoproto.nullable) = false
     ];
     // origination fee
-    string origination_fee = 7 [
+    string origination_fee = 9 [
       (gogoproto.customtype) = "cosmossdk.io/math.Int",
       (gogoproto.nullable) = false
     ];
     // reserve factor permille
-    uint32 reserve_factor = 8;
+    uint32 reserve_factor = 10;
     // referral fee factor permille
-    uint32 referral_fee_factor = 9;
+    uint32 referral_fee_factor = 11;
     // maximum ltv percent
-    uint32 max_ltv = 10;
+    uint32 max_ltv = 12;
     // liquidation ltv percent
-    uint32 liquidation_threshold = 11;
+    uint32 liquidation_threshold = 13;
     // indicates if the pool is paused
-    bool paused = 12;
+    bool paused = 14;
 }
 
 // Pool tranche

api/side/lending/tx.pulsar.go

@@ -40,10 +40,8 @@ message MsgCreatePool {
     string authority = 1;
     // pool id
     string id = 2;
-    // lending asset
-    string lending_asset = 3;
     // pool config
-    PoolConfig config = 4 [(gogoproto.nullable) = false];
+    PoolConfig config = 3 [(gogoproto.nullable) = false];
 }
 
 message MsgCreatePoolResponse{}

proto/side/lending/lending.proto

@@ -40,7 +40,7 @@ func (k Keeper) GetCetInfos(ctx sdk.Context, loanId string, collateralAmount sdk
 		liquidationEvent = k.dlcKeeper.GetEvent(ctx, loan.LiquidationEventId)
 	} else if collateralAmount.Amount.IsPositive() {
 		liquidationPrice := types.GetLiquidationPrice(collateralAmount.Amount, loan.BorrowAmount.Amount, loan.Maturity, loan.BorrowAPR, k.GetBlocksPerYear(ctx), poolConfig.LiquidationThreshold)
-		liquidationEvent = k.dlcKeeper.GetEventByPrice(ctx, "BTCUSD", liquidationPrice.String())
+		liquidationEvent = k.dlcKeeper.GetEventByPrice(ctx, types.GetPricePair(poolConfig), liquidationPrice.String())
 	}
 
 	defaultLiquidationEvent := k.dlcKeeper.GetEvent(ctx, loan.DefaultLiquidationEventId)

proto/side/lending/tx.proto

@@ -265,13 +265,15 @@ func (m msgServer) SubmitCets(goCtx context.Context, msg *types.MsgSubmitCets) (
 		return nil, nil
 	}
 
+	pricePair := types.GetPricePair(poolConfig)
+
 	liquidationPrice := types.GetLiquidationPrice(collateralAmount, loan.BorrowAmount.Amount, loan.Maturity, loan.BorrowAPR, m.GetBlocksPerYear(ctx), poolConfig.LiquidationThreshold)
-	if !m.dlcKeeper.HasEventByPrice(ctx, "BTCUSD", liquidationPrice.String()) {
+	if !m.dlcKeeper.HasEventByPrice(ctx, pricePair, liquidationPrice.String()) {
 		errRejected = errorsmod.Wrap(types.ErrInvalidEvent, "liquidation event does not exist")
 		return nil, nil
 	}
 
-	liquidationEvent := m.dlcKeeper.GetEventByPrice(ctx, "BTCUSD", liquidationPrice.String())
+	liquidationEvent := m.dlcKeeper.GetEventByPrice(ctx, pricePair, liquidationPrice.String())
 	if liquidationEvent.HasTriggered {
 		errRejected = errorsmod.Wrap(types.ErrInvalidEvent, "liquidation event has triggered")
 		return nil, nil
@@ -283,7 +285,7 @@ func (m msgServer) SubmitCets(goCtx context.Context, msg *types.MsgSubmitCets) (
 		return nil, err
 	}
 
-	currentPrice, err := m.GetPrice(ctx, "BTCUSD")
+	currentPrice, err := m.GetPrice(ctx, pricePair)
 	if err != nil {
 		return nil, err
 	}
@@ -396,7 +398,7 @@ func (m msgServer) Approve(goCtx context.Context, msg *types.MsgApprove) (*types
 
 	// authorization submitted
 	if authorizationId == m.GetAuthorizationId(ctx, msg.Vault) {
-		currentPrice, err := m.GetPrice(ctx, "BTCUSD")
+		currentPrice, err := m.GetPrice(ctx, types.GetPricePair(m.GetPool(ctx, loan.VaultAddress).Config))
 		if err != nil {
 			return nil, err
 		}

x/lending/keeper/dlc.go

@@ -33,7 +33,7 @@ func (m msgServer) CreatePool(goCtx context.Context, msg *types.MsgCreatePool) (
 
 	pool := &types.LendingPool{
 		Id:           msg.Id,
-		Supply:       sdk.NewCoin(msg.LendingAsset, sdkmath.ZeroInt()),
+		Supply:       sdk.NewCoin(msg.Config.LendingAsset.Denom, sdkmath.ZeroInt()),
 		TotalSTokens: sdk.NewCoin(msg.Id, sdkmath.ZeroInt()),
 		Tranches:     types.NewTranches(msg.Config.Tranches),
 		Config:       msg.Config,

x/lending/keeper/msg_server_loan.go

@@ -109,7 +109,7 @@ func (k Keeper) LiquidationEvent(goCtx context.Context, req *types.QueryLiquidat
 
 	liquidationPrice := types.GetLiquidationPrice(collateralAmount.Amount, borrowedAmount.Amount, trancheConfig.Maturity, trancheConfig.BorrowAPR, k.GetBlocksPerYear(ctx), poolConfig.LiquidationThreshold)
 
-	event := k.dlcKeeper.GetEventByPrice(ctx, "BTCUSD", liquidationPrice.String())
+	event := k.dlcKeeper.GetEventByPrice(ctx, types.GetPricePair(poolConfig), liquidationPrice.String())
 	if event == nil {
 		return nil, status.Error(codes.NotFound, "liquidation event does not exist")
 	}

x/lending/keeper/msg_server_pool.go

@@ -43,13 +43,14 @@ func handleActiveLoans(ctx sdk.Context, k keeper.Keeper) {
 
 		var liquidationInterest sdkmath.Int
 
-		currentPrice, err := k.GetPrice(ctx, "BTCUSD")
+		pool := k.GetPool(ctx, loan.PoolId)
+		pricePair := types.GetPricePair(pool.Config)
+
+		currentPrice, err := k.GetPrice(ctx, pricePair)
 		if err != nil {
-			k.Logger(ctx).Info("failed to get price", "err", err)
+			k.Logger(ctx).Info("failed to get price", "pair", pricePair, "err", err)
 		}
 
-		pool := k.GetPool(ctx, loan.PoolId)
-
 		dlcMeta := k.GetDLCMeta(ctx, loan.VaultAddress)
 
 		// check if the loan has defaulted
@@ -96,20 +97,23 @@ func handleActiveLoans(ctx sdk.Context, k keeper.Keeper) {
 
 		// create liquidation if defaulted or liquidated
 		if loan.Status == types.LoanStatus_Defaulted || loan.Status == types.LoanStatus_Liquidated {
+			collateralDenom := pool.Config.CollateralAsset.Denom
+			debtDenom := pool.Config.LendingAsset.Denom
+
 			liquidation := k.LiquidationKeeper().CreateLiquidation(ctx, &liquidationtypes.Liquidation{
 				LoanId:                       loan.VaultAddress,
 				Debtor:                       loan.Borrower,
 				DCM:                          loan.DCM,
-				CollateralAmount:             sdk.NewCoin("sat", loan.CollateralAmount),
-				ActualCollateralAmount:       sdk.NewCoin("sat", sdkmath.NewInt(types.GetLiquidationCetOutput(liquidationCet))),
-				DebtAmount:                   sdk.NewCoin(pool.Supply.Denom, loan.BorrowAmount.Amount.Add(liquidationInterest)),
+				CollateralAmount:             sdk.NewCoin(collateralDenom, loan.CollateralAmount),
+				ActualCollateralAmount:       sdk.NewCoin(collateralDenom, sdkmath.NewInt(types.GetLiquidationCetOutput(liquidationCet))),
+				DebtAmount:                   sdk.NewCoin(debtDenom, loan.BorrowAmount.Amount.Add(liquidationInterest)),
 				LiquidatedPrice:              currentPrice,
 				LiquidatedTime:               ctx.BlockTime(),
-				LiquidatedCollateralAmount:   sdk.NewCoin("sat", sdkmath.ZeroInt()),
-				LiquidatedDebtAmount:         sdk.NewCoin(pool.Supply.Denom, sdkmath.ZeroInt()),
-				LiquidationBonusAmount:       sdk.NewCoin("sat", sdkmath.ZeroInt()),
-				ProtocolLiquidationFee:       sdk.NewCoin("sat", sdkmath.ZeroInt()),
-				UnliquidatedCollateralAmount: sdk.NewCoin("sat", sdkmath.ZeroInt()),
+				LiquidatedCollateralAmount:   sdk.NewCoin(collateralDenom, sdkmath.ZeroInt()),
+				LiquidatedDebtAmount:         sdk.NewCoin(debtDenom, sdkmath.ZeroInt()),
+				LiquidationBonusAmount:       sdk.NewCoin(collateralDenom, sdkmath.ZeroInt()),
+				ProtocolLiquidationFee:       sdk.NewCoin(collateralDenom, sdkmath.ZeroInt()),
+				UnliquidatedCollateralAmount: sdk.NewCoin(collateralDenom, sdkmath.ZeroInt()),
 				LiquidationCet:               liquidationCet,
 			})
 

x/lending/keeper/queries.go

@@ -4,11 +4,13 @@ import (
 	"encoding/hex"
 	fmt "fmt"
 	"strconv"
+	"strings"
 	"time"
 
 	errorsmod "cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/sideprotocol/side/crypto/adaptor"
 )
 
@@ -78,6 +80,11 @@ func AdaptorPointFromSecret(secret []byte) string {
 	return hex.EncodeToString(adaptor.SecretToPubKey(secret))
 }
 
+// GetPricePair gets the price pair from the given pool config
+func GetPricePair(poolConfig PoolConfig) string {
+	return fmt.Sprintf("%s%s", strings.ToUpper(poolConfig.CollateralAsset.PriceSymbol), strings.ToUpper(poolConfig.LendingAsset.PriceSymbol))
+}
+
 // HasSupplyCap returns true if the supply cap set in the given pool, false otherwise
 func HasSupplyCap(pool *LendingPool) bool {
 	return pool.Config.SupplyCap.IsPositive()
@@ -180,6 +187,14 @@ func NewTranches(trancheConfigs []PoolTrancheConfig) []PoolTranche {
 
 // ValidatePoolConfig validates the given pool config
 func ValidatePoolConfig(config PoolConfig) error {
+	if err := validateAssetMetadata(config.CollateralAsset); err != nil {
+		return err
+	}
+
+	if err := validateAssetMetadata(config.LendingAsset); err != nil {
+		return err
+	}
+
 	if config.SupplyCap.IsNil() || config.SupplyCap.IsNegative() {
 		return errorsmod.Wrap(ErrInvalidPoolConfig, "supply cap can not be nil or negative")
 	}
@@ -235,6 +250,26 @@ func ValidatePoolConfig(config PoolConfig) error {
 	return nil
 }
 
+func validateAssetMetadata(metadata AssetMetadata) error {
+	if err := sdk.ValidateDenom(metadata.Denom); err != nil {
+		return errorsmod.Wrapf(ErrInvalidPoolConfig, "invalid asset denom")
+	}
+
+	if len(metadata.Symbol) == 0 {
+		return errorsmod.Wrapf(ErrInvalidPoolConfig, "invalid asset symbol")
+	}
+
+	if len(metadata.PriceSymbol) == 0 {
+		return errorsmod.Wrapf(ErrInvalidPoolConfig, "invalid asset price symbol")
+	}
+
+	if metadata.Decimals < 0 {
+		return errorsmod.Wrapf(ErrInvalidPoolConfig, "invalid asset decimals")
+	}
+
+	return nil
+}
+
 // validatePoolTrancheConfig validates the given tranche config
 func validatePoolTranches(tranches []PoolTrancheConfig) error {
 	if len(tranches) == 0 {