akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sweep: use bucket ids

Browse Source 
Using a fee rate just as an identifier can be confusing.
This commit is contained in:
Joost Jager 2019-12-09 10:20:23 +01:00
parent 8c43232f66
commit 50078216ca
No known key found for this signature in database
GPG Key ID: A61B9D4C393C59C7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sweep/sweeper.go
View File

@ -638,12 +638,10 @@ func (s *UtxoSweeper) collector(blockEpochs <-chan *chainntnfs.BlockEpoch) {
// bucketForFeeReate determines the proper bucket for a fee rate. This is done // bucketForFeeReate determines the proper bucket for a fee rate. This is done
// in order to batch inputs with similar fee rates together. // in order to batch inputs with similar fee rates together.
func (s *UtxoSweeper) bucketForFeeRate( func (s *UtxoSweeper) bucketForFeeRate(
feeRate chainfee.SatPerKWeight) chainfee.SatPerKWeight { feeRate chainfee.SatPerKWeight) int {
minBucket := s.relayFeeRate + chainfee.SatPerKWeight(s.cfg.FeeRateBucketSize) minBucket := s.relayFeeRate + chainfee.SatPerKWeight(s.cfg.FeeRateBucketSize)
return chainfee.SatPerKWeight( return int(math.Ceil(float64(feeRate) / float64(minBucket)))
math.Ceil(float64(feeRate) / float64(minBucket)),
)
} }
// clusterBySweepFeeRate takes the set of pending inputs within the UtxoSweeper // clusterBySweepFeeRate takes the set of pending inputs within the UtxoSweeper
@ -651,7 +649,7 @@ func (s *UtxoSweeper) bucketForFeeRate(
// sweep fee rate, which is determined by calculating the average fee rate of // sweep fee rate, which is determined by calculating the average fee rate of
// all inputs within that cluster. // all inputs within that cluster.
func (s *UtxoSweeper) clusterBySweepFeeRate() []inputCluster { func (s *UtxoSweeper) clusterBySweepFeeRate() []inputCluster {
bucketInputs := make(map[chainfee.SatPerKWeight]pendingInputs) bucketInputs := make(map[int]pendingInputs)
inputFeeRates := make(map[wire.OutPoint]chainfee.SatPerKWeight) inputFeeRates := make(map[wire.OutPoint]chainfee.SatPerKWeight)
// First, we'll group together all inputs with similar fee rates. This // First, we'll group together all inputs with similar fee rates. This
@ -662,12 +660,12 @@ func (s *UtxoSweeper) clusterBySweepFeeRate() []inputCluster {
log.Warnf("Skipping input %v: %v", op, err) log.Warnf("Skipping input %v: %v", op, err)
continue continue
} }
bucket := s.bucketForFeeRate(feeRate) feeGroup := s.bucketForFeeRate(feeRate)
inputs, ok := bucketInputs[bucket] inputs, ok := bucketInputs[feeGroup]
if !ok { if !ok {
inputs = make(pendingInputs) inputs = make(pendingInputs)
bucketInputs[bucket] = inputs bucketInputs[feeGroup] = inputs
} }
input.lastFeeRate = feeRate input.lastFeeRate = feeRate