Archives/loop
2
0
Fork 0
mirror of https://github.com/lightninglabs/loop synced 2024-11-09 19:10:47 +00:00
Code Issues Releases Wiki Activity

Merge pull request #804 from starius/fix-AddSuccessToEstimator

Browse Source 
swap: fix leaf estimation in AddSuccessToEstimator
This commit is contained in:
Boris Nagaev 2024-08-12 12:28:41 -03:00 committed by GitHub
commit 7cfee83912
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 76 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
swap/htlc.go
View File

@ -266,8 +266,6 @@ func (h *Htlc) GenSuccessWitness(receiverSig []byte,
// AddSuccessToEstimator adds a successful spend to a weight estimator.
func (h *Htlc) AddSuccessToEstimator(estimator *input.TxWeightEstimator) error {
maxSuccessWitnessSize := h.MaxSuccessWitnessSize()
switch h.OutputType {
case HtlcP2TR:
// Generate tapscript.
@ -283,10 +281,20 @@ func (h *Htlc) AddSuccessToEstimator(estimator *input.TxWeightEstimator) error {
trHtlc.InternalPubKey, successLeaf, timeoutLeafHash[:],
)
estimator.AddTapscriptInput(maxSuccessWitnessSize, tapscript)
// The leaf witness size must be calculated without the byte
// that accounts for the number of witness elements, only the
// total size of all elements on the stack that are consumed by
// the revealed script should be counted. Consumed elements:
// - sigLength: 1 byte
// - sig: 64 bytes
// - preimage_length: 1 byte
// - preimage: 32 bytes
const leafWitnessSize = 1 + 64 + 1 + 32
estimator.AddTapscriptInput(leafWitnessSize, tapscript)
case HtlcP2WSH:
estimator.AddWitnessInput(maxSuccessWitnessSize)
estimator.AddWitnessInput(h.MaxSuccessWitnessSize())
}
return nil

66
sweepbatcher/greedy_batch_selection_test.go
View File

@ -18,7 +18,7 @@ const (
highFeeRate = chainfee.SatPerKWeight(30000)
coopInputWeight = lntypes.WeightUnit(230)
nonCoopInputWeight = lntypes.WeightUnit(521)
nonCoopInputWeight = lntypes.WeightUnit(393)
nonCoopPenalty = nonCoopInputWeight - coopInputWeight
coopNewBatchWeight = lntypes.WeightUnit(444)
nonCoopNewBatchWeight = coopNewBatchWeight + nonCoopPenalty
@ -31,7 +31,7 @@ const (
coopTwoSweepBatchWeight = coopNewBatchWeight + coopInputWeight
nonCoopTwoSweepBatchWeight = coopTwoSweepBatchWeight +
2*nonCoopPenalty
v2v3BatchWeight = nonCoopTwoSweepBatchWeight - 153
v2v3BatchWeight = nonCoopTwoSweepBatchWeight - 25
)
// testHtlcV2SuccessEstimator adds weight of non-cooperative input to estimator
@ -523,6 +523,37 @@ func TestSelectBatches(t *testing.T) {
NonCoopWeight: nonCoopNewBatchWeight,
NonCoopHint: true,
},
wantBestBatchesIds: []int32{2, newBatchSignal, 1},
},
{
name: "high fee noncoop sweep, large batches",
batches: []feeDetails{
{
BatchId: 1,
FeeRate: lowFeeRate,
CoopWeight: 10000,
NonCoopWeight: 15000,
},
{
BatchId: 2,
FeeRate: highFeeRate,
CoopWeight: 10000,
NonCoopWeight: 15000,
},
},
sweep: feeDetails{
FeeRate: highFeeRate,
CoopWeight: coopInputWeight,
NonCoopWeight: nonCoopInputWeight,
NonCoopHint: true,
},
oneSweepBatch: feeDetails{
FeeRate: highFeeRate,
CoopWeight: coopNewBatchWeight,
NonCoopWeight: nonCoopNewBatchWeight,
NonCoopHint: true,
},
wantBestBatchesIds: []int32{newBatchSignal, 2, 1},
},
@ -586,6 +617,37 @@ func TestSelectBatches(t *testing.T) {
NonCoopWeight: nonCoopNewBatchWeight,
NonCoopHint: true,
},
wantBestBatchesIds: []int32{1, newBatchSignal, 2},
},
{
name: "low fee noncoop sweep, large batches",
batches: []feeDetails{
{
BatchId: 1,
FeeRate: lowFeeRate,
CoopWeight: 10000,
NonCoopWeight: 15000,
},
{
BatchId: 2,
FeeRate: highFeeRate,
CoopWeight: 10000,
NonCoopWeight: 15000,
},
},
sweep: feeDetails{
FeeRate: lowFeeRate,
CoopWeight: coopInputWeight,
NonCoopWeight: nonCoopInputWeight,
NonCoopHint: true,
},
oneSweepBatch: feeDetails{
FeeRate: lowFeeRate,
CoopWeight: coopNewBatchWeight,
NonCoopWeight: nonCoopNewBatchWeight,
NonCoopHint: true,
},
wantBestBatchesIds: []int32{newBatchSignal, 1, 2},
},