use actual fee rate to build settlement tx

Author: keithsue

app/app.go

@@ -705,6 +705,7 @@ func New(
 		app.BankKeeper,
 		app.OracleKeeper,
 		app.TSSKeeper,
+		app.BtcBridgeKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 

testutil/keeper/liquidation.go

@@ -48,6 +48,7 @@ func LiquidationKeeper(t testing.TB) (keeper.Keeper, sdk.Context) {
 		app.BankKeeper,
 		app.OracleKeeper,
 		app.TSSKeeper,
+		app.BtcBridgeKeeper,
 		authority,
 	)
 

x/lending/types/expected_keepers.go

@@ -85,7 +85,9 @@ type DLCKeeper interface {
 type BtcBridgeKeeper interface {
 	DepositConfirmationDepth(ctx sdk.Context) int32
 	ValidateTransaction(ctx sdk.Context, tx string, prevTx string, blockHash string, proof []string, confirmationDepth int32) (*btcutil.Tx, *btcutil.Tx, error)
+
 	GetFeeRate(ctx sdk.Context) *btcbridgetypes.FeeRate
+	CheckFeeRate(ctx sdk.Context, feeRate *btcbridgetypes.FeeRate) error
 }
 
 // TSSKeeper defines the expected TSS keeper interface

x/liquidation/keeper/keeper.go

@@ -14,9 +14,10 @@ type Keeper struct {
 	storeKey storetypes.StoreKey
 	memKey   storetypes.StoreKey
 
-	bankKeeper   types.BankKeeper
-	oracleKeeper types.OracleKeeper
-	tssKeeper    types.TSSKeeper
+	bankKeeper      types.BankKeeper
+	oracleKeeper    types.OracleKeeper
+	tssKeeper       types.TSSKeeper
+	btcbridgeKeeper types.BtcBridgeKeeper
 
 	liquidatedDebtHandler types.LiquidatedDebtHandler
 
@@ -30,16 +31,18 @@ func NewKeeper(
 	bankKeeper types.BankKeeper,
 	oracleKeeper types.OracleKeeper,
 	tssKeeper types.TSSKeeper,
+	btcbridgeKeeper types.BtcBridgeKeeper,
 	authority string,
 ) *Keeper {
 	k := &Keeper{
-		cdc:          cdc,
-		storeKey:     storeKey,
-		memKey:       memKey,
-		bankKeeper:   bankKeeper,
-		oracleKeeper: oracleKeeper,
-		tssKeeper:    tssKeeper,
-		authority:    authority,
+		cdc:             cdc,
+		storeKey:        storeKey,
+		memKey:          memKey,
+		bankKeeper:      bankKeeper,
+		oracleKeeper:    oracleKeeper,
+		tssKeeper:       tssKeeper,
+		btcbridgeKeeper: btcbridgeKeeper,
+		authority:       authority,
 	}
 
 	// register signing request completed handler
@@ -81,6 +84,10 @@ func (k Keeper) TSSKeeper() types.TSSKeeper {
 	return k.tssKeeper
 }
 
+func (k Keeper) BtcBridgeKeeper() types.BtcBridgeKeeper {
+	return k.btcbridgeKeeper
+}
+
 func (k Keeper) LiquidatedDebtHandler() types.LiquidatedDebtHandler {
 	return k.liquidatedDebtHandler
 }

x/liquidation/module/abci.go

@@ -17,6 +17,17 @@ func EndBlocker(ctx sdk.Context, k keeper.Keeper) {
 func handleCompletedLiquidations(ctx sdk.Context, k keeper.Keeper) {
 	// get completed liquidations
 	liquidations := k.GetLiquidations(ctx, types.LiquidationStatus_LIQUIDATION_STATUS_LIQUIDATED)
+	if len(liquidations) == 0 {
+		return
+	}
+
+	// get fee rate
+	feeRate := k.BtcBridgeKeeper().GetFeeRate(ctx)
+	if err := k.BtcBridgeKeeper().CheckFeeRate(ctx, feeRate); err != nil {
+		k.Logger(ctx).Info("Failed to get fee rate to handle liquidation", "err", err)
+
+		return
+	}
 
 	for _, liquidation := range liquidations {
 		// handle liquidated debt(repay the lending pool)
@@ -28,9 +39,9 @@ func handleCompletedLiquidations(ctx sdk.Context, k keeper.Keeper) {
 		}
 
 		// build settlement tx
-		settlementTx, txHash, sigHashes, changeAmount, err := types.BuildSettlementTransaction(liquidation, k.GetLiquidationRecords(ctx, liquidation.Id), k.ProtocolLiquidationFeeCollector(ctx), 5)
+		settlementTx, txHash, sigHashes, changeAmount, err := types.BuildSettlementTransaction(liquidation, k.GetLiquidationRecords(ctx, liquidation.Id), k.ProtocolLiquidationFeeCollector(ctx), feeRate.Value)
 		if err != nil {
-			k.Logger(ctx).Info("Failed to build settlement transaction", "liquidation id", liquidation.Id, "err", err)
+			k.Logger(ctx).Info("Failed to build settlement transaction", "liquidation id", liquidation.Id, "fee rate", feeRate.Value, "err", err)
 
 			continue
 		}

x/liquidation/types/expected_keepers.go

@@ -7,6 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktype "github.com/cosmos/cosmos-sdk/x/bank/types"
 
+	btcbridgetypes "github.com/sideprotocol/side/x/btcbridge/types"
 	tsstypes "github.com/sideprotocol/side/x/tss/types"
 )
 
@@ -40,3 +41,9 @@ type TSSKeeper interface {
 
 	RegisterSigningRequestCompletedHandler(module string, handler tsstypes.SigningRequestCompletedHandler)
 }
+
+// BtcBridgeKeeper defines the expected BtcBridge keeper interface
+type BtcBridgeKeeper interface {
+	GetFeeRate(ctx sdk.Context) *btcbridgetypes.FeeRate
+	CheckFeeRate(ctx sdk.Context, feeRate *btcbridgetypes.FeeRate) error
+}