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

sweeper: define method createInputClusters

Browse Source
This commit is contained in:
Johan T. Halseth 2020-11-06 11:22:10 +01:00
parent 0e14e0d904
commit 128087044f
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sweep/sweeper.go
View File

@ -647,7 +647,7 @@ func (s *UtxoSweeper) collector(blockEpochs <-chan *chainntnfs.BlockEpoch) {
// this to ensure any inputs which have had their fee // this to ensure any inputs which have had their fee
// rate bumped are broadcast first in order enforce the // rate bumped are broadcast first in order enforce the
// RBF policy. // RBF policy.
inputClusters := s.clusterBySweepFeeRate() inputClusters := s.createInputClusters()
sort.Slice(inputClusters, func(i, j int) bool { sort.Slice(inputClusters, func(i, j int) bool {
return inputClusters[i].sweepFeeRate > return inputClusters[i].sweepFeeRate >
inputClusters[j].sweepFeeRate inputClusters[j].sweepFeeRate
@ -750,17 +750,26 @@ func (s *UtxoSweeper) bucketForFeeRate(
return 1 + int(feeRate-s.relayFeeRate)/s.cfg.FeeRateBucketSize return 1 + int(feeRate-s.relayFeeRate)/s.cfg.FeeRateBucketSize
} }
// createInputClusters creates a list of input clusters from the set of pending
// inputs known by the UtxoSweeper.
func (s *UtxoSweeper) createInputClusters() []inputCluster {
inputs := s.pendingInputs
feeClusters := s.clusterBySweepFeeRate(inputs)
return feeClusters
}
// clusterBySweepFeeRate takes the set of pending inputs within the UtxoSweeper // clusterBySweepFeeRate takes the set of pending inputs within the UtxoSweeper
// and clusters those together with similar fee rates. Each cluster contains a // and clusters those together with similar fee rates. Each cluster contains a
// 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(inputs pendingInputs) []inputCluster {
bucketInputs := make(map[int]*bucketList) bucketInputs := make(map[int]*bucketList)
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
// is done by determining the fee rate bucket they should belong in. // is done by determining the fee rate bucket they should belong in.
for op, input := range s.pendingInputs { for op, input := range inputs {
feeRate, err := s.feeRateForPreference(input.params.Fee) feeRate, err := s.feeRateForPreference(input.params.Fee)
if err != nil { if err != nil {
log.Warnf("Skipping input %v: %v", op, err) log.Warnf("Skipping input %v: %v", op, err)
@ -836,7 +845,7 @@ func (s *UtxoSweeper) scheduleSweep(currentHeight int32) error {
// We'll only start our timer once we have inputs we're able to sweep. // We'll only start our timer once we have inputs we're able to sweep.
startTimer := false startTimer := false
for _, cluster := range s.clusterBySweepFeeRate() { for _, cluster := range s.createInputClusters() {
// Examine pending inputs and try to construct lists of inputs. // Examine pending inputs and try to construct lists of inputs.
// We don't need to obtain the coin selection lock, because we // We don't need to obtain the coin selection lock, because we
// just need an indication as to whether we can sweep. More // just need an indication as to whether we can sweep. More