use dynamic fee rate for timeout refund tx

keithsue · keithsue · commit aa05a6228251 · 2025-06-23T20:14:45.000+08:00
diff --git a/x/lending/keeper/dlc.go b/x/lending/keeper/dlc.go
@@ -100,7 +100,13 @@ func (k Keeper) UpdateDLCMeta(ctx sdk.Context, loanId string, depositTxs []*psbt
 		return err
 	}
 
-	timeoutRefundTx, err := types.CreateTimeoutRefundTransaction(depositTxs, vaultPkScript, borrowerPkScript, internalKey, dlcMeta.TimeoutRefundScript, 1)
+	// get fee rate
+	feeRate := k.BtcBridgeKeeper().GetFeeRate(ctx)
+	if feeRate.Value == 0 {
+		feeRate.Value = types.DefaultFeeRate
+	}
+
+	timeoutRefundTx, err := types.CreateTimeoutRefundTransaction(depositTxs, vaultPkScript, borrowerPkScript, internalKey, dlcMeta.TimeoutRefundScript, feeRate.Value)
 	if err != nil {
 		return err
 	}
diff --git a/x/lending/types/lending.go b/x/lending/types/lending.go
@@ -24,6 +24,9 @@ var (
 
 	// initial borrow index
 	InitialBorrowIndex = sdkmath.LegacyOneDec()
+
+	// default fee rate
+	DefaultFeeRate = int64(1)
 )
 
 // GetExchangeRate calculates the sToken exchange rate according to the given params

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,13 @@ func (k Keeper) UpdateDLCMeta(ctx sdk.Context, loanId string, depositTxs []*psbt`
`100`	`100`	`return err`
`101`	`101`	`}`
`102`	`102`
`103`		`- timeoutRefundTx, err := types.CreateTimeoutRefundTransaction(depositTxs, vaultPkScript, borrowerPkScript, internalKey, dlcMeta.TimeoutRefundScript, 1)`
	`103`	`+ // get fee rate`
	`104`	`+ feeRate := k.BtcBridgeKeeper().GetFeeRate(ctx)`
	`105`	`+ if feeRate.Value == 0 {`
	`106`	`+ feeRate.Value = types.DefaultFeeRate`
	`107`	`+ }`
	`108`	`+`
	`109`	`+ timeoutRefundTx, err := types.CreateTimeoutRefundTransaction(depositTxs, vaultPkScript, borrowerPkScript, internalKey, dlcMeta.TimeoutRefundScript, feeRate.Value)`
`104`	`110`	`if err != nil {`
`105`	`111`	`return err`
`106`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@ var (`
`24`	`24`
`25`	`25`	`// initial borrow index`
`26`	`26`	`InitialBorrowIndex = sdkmath.LegacyOneDec()`
	`27`	`+`
	`28`	`+ // default fee rate`
	`29`	`+ DefaultFeeRate = int64(1)`
`27`	`30`	`)`
`28`	`31`
`29`	`32`	`// GetExchangeRate calculates the sToken exchange rate according to the given params`