diff --git a/sweep/fee_bumper.go b/sweep/fee_bumper.go index 9bd0cdf66..f44f5e11d 100644 --- a/sweep/fee_bumper.go +++ b/sweep/fee_bumper.go @@ -132,13 +132,14 @@ func (r *BumpRequest) MaxFeeRateAllowed() (chainfee.SatPerKWeight, error) { maxFeeRateAllowed := chainfee.NewSatPerKWeight(r.Budget, size) if maxFeeRateAllowed > r.MaxFeeRate { log.Debugf("Budget feerate %v exceeds MaxFeeRate %v, use "+ - "MaxFeeRate instead", maxFeeRateAllowed, r.MaxFeeRate) + "MaxFeeRate instead, txWeight=%v", maxFeeRateAllowed, + r.MaxFeeRate, size) return r.MaxFeeRate, nil } log.Debugf("Budget feerate %v below MaxFeeRate %v, use budget feerate "+ - "instead", maxFeeRateAllowed, r.MaxFeeRate) + "instead, txWeight=%v", maxFeeRateAllowed, r.MaxFeeRate, size) return maxFeeRateAllowed, nil } @@ -361,6 +362,10 @@ func (t *TxPublisher) initializeFeeFunction( // Get the initial conf target. confTarget := calcCurrentConfTarget(t.currentHeight, req.DeadlineHeight) + log.Debugf("Initializing fee function with conf target=%v, budget=%v, "+ + "maxFeeRateAllowed=%v", confTarget, req.Budget, + maxFeeRateAllowed) + // Initialize the fee function and return it. // // TODO(yy): return based on differet req.Strategy? diff --git a/sweep/sweeper.go b/sweep/sweeper.go index 85d9ad5e8..24ed52782 100644 --- a/sweep/sweeper.go +++ b/sweep/sweeper.go @@ -84,13 +84,19 @@ type ParamsUpdate struct { // String returns a human readable interpretation of the sweep parameters. func (p Params) String() string { + deadline := "none" + p.DeadlineHeight.WhenSome(func(d int32) { + deadline = fmt.Sprintf("%d", d) + }) + + exclusiveGroup := "none" if p.ExclusiveGroup != nil { - return fmt.Sprintf("fee=%v, force=%v, exclusive_group=%v", - p.Fee, p.Force, *p.ExclusiveGroup) + exclusiveGroup = fmt.Sprintf("%d", *p.ExclusiveGroup) } - return fmt.Sprintf("fee=%v, force=%v, exclusive_group=nil", - p.Fee, p.Force) + return fmt.Sprintf("fee=%v, force=%v, exclusive_group=%v, budget=%v, "+ + "deadline=%v", p.Fee, p.Force, exclusiveGroup, p.Budget, + deadline) } // SweepState represents the current state of a pending input. @@ -518,10 +524,10 @@ func (s *UtxoSweeper) SweepInput(input input.Input, absoluteTimeLock, _ := input.RequiredLockTime() log.Infof("Sweep request received: out_point=%v, witness_type=%v, "+ "relative_time_lock=%v, absolute_time_lock=%v, amount=%v, "+ - "parent=(%v), params=(%v)", input.OutPoint(), + "parent=(%v), params=(%v), currentHeight=%v", input.OutPoint(), input.WitnessType(), input.BlocksToMaturity(), absoluteTimeLock, btcutil.Amount(input.SignDesc().Output.Value), - input.UnconfParent(), params) + input.UnconfParent(), params, s.currentHeight) sweeperInput := &sweepInputMessage{ input: input, @@ -1667,9 +1673,9 @@ func (s *UtxoSweeper) handleBumpEventTxReplaced(r *BumpResult) error { return err } - log.Infof("RBFed tx=%v(fee=%v, feerate=%v) with new tx=%v(fee=%v, "+ - "feerate=%v)", record.Txid, record.Fee, record.FeeRate, - tr.Txid, tr.Fee, tr.FeeRate) + log.Infof("RBFed tx=%v(fee=%v sats, feerate=%v sats/kw) with new "+ + "tx=%v(fee=%v, "+"feerate=%v)", record.Txid, record.Fee, + record.FeeRate, tr.Txid, tr.Fee, tr.FeeRate) // The old sweeping tx has been replaced by a new one, we will update // the tx record in the sweeper db.