sweepbatcher: fixes for presigned mode #952
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
starius
force-pushed
the
presigned-fixes2
branch
from
239e288 to
70dd1a7
Compare
bhandras
approved these changes
Jun 25, 2025
| go func() { | ||
| // Make sure this context doesn't expire so we | ||
| // successfully notify the caller. | ||
| ctx := context.WithoutCancel(ctx) |
There was a problem hiding this comment.
nit: alternatively we could just create a new context.Background() and use that.
There was a problem hiding this comment.
I prefer context.WithoutCancel, because it inherits key-values of the parent context. This is used for new logging.
| confirmedSet[txIn.PreviousOutPoint] = struct{}{} | ||
| } | ||
|
|
||
| // As a previous version of the batch transaction may get confirmed, |
There was a problem hiding this comment.
nit: I think this comment is a bit misleading as we don't really collect the non-confirmed sweeps here to feed them back to the batcher, we just notify those that confirmed and then start the monitoring for 3 conf after which we will do the collection and re-feeding.
There was a problem hiding this comment.
The comment was outdated. I updated it:
// As a previous version of the batch transaction may get confirmed,
// which does not contain the latest sweeps, we need to detect which
// sweeps are in the transaction to correctly calculate fee portions
// and notify proper sweeps.
sweepbatcher/presigned.go
Outdated
| @@ -604,8 +605,9 @@ func CheckSignedTx(unsignedTx, signedTx *wire.MsgTx, inputAmt btcutil.Amount, | |||
| unsignedOut := unsignedTx.TxOut[0] | |||
| signedOut := signedTx.TxOut[0] | |||
| if !bytes.Equal(unsignedOut.PkScript, signedOut.PkScript) { | |||
| return fmt.Errorf("mismatch of output pkScript: %v, %v", | |||
| unsignedOut.PkScript, signedOut.PkScript) | |||
| return fmt.Errorf("mismatch of output pkScript: %s, %s", | |||
sweepbatcher/sweep_batcher.go
Outdated
| infof("PresignSweepsGroup: nextBlockFeeRate is %v, inputs: %v, "+ | ||
| "destAddress: %v, destPkscript: %v sweepTimeout: %d", | ||
| nextBlockFeeRate, inputs, destAddress, | ||
| hex.EncodeToString(destPkscript), sweepTimeout) |
This is needed to have multiple spending registrations running and to send a notification to a specific spending registration.
In case of a reorg sweeps should not go to another batch but stay in the current batch until it is fully confirmed. Only after that the remaining sweeps are re-added to another batch. Field sweep.completed is now set to true only for fully-confirmed sweeps. In handleConf we now use batch.persist() (i.e. store.UpdateSweepBatch) instead of ConfirmBatch, because we set not only Confirmed flag, but also batchTxid.
There were two mistakes. In case of a swap with multiple sweeps only the fee of the first sweep of a swap was accounted. Rounding diff (the remainder) was attributed to all the sweeps rather than to the first (primary) sweep of the batch. The sweep to attribute the remainder was chosen by comparing SignatureScript which is always empty. New approach is to find the primary sweep and to compare its outpoint directly.
This is needed because sweepbatcher can use this channel in multiple select statements to unblock itself if the caller cancels.
It doesn't need loopdb, so remove that code.
Make sure that broadcasted tx has feeRate >= minRelayFee. Make sure that feeRate of broadcasted tx doesn't decrease.
Method Presign is not as reliable as SignTx, because it checks transaction by txid and can miss for example if LockTime is different. SignTx can do everything Presign was used for.
For presigned possible remaining groups, the destination address of the current batch was used instead of the destination address of an expected future batch. TODO: reproduce in unit test "purged". For this, each swap should have a separate destination address.
starius
force-pushed
the
presigned-fixes2
branch
from
59da056 to
1301904
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed TODO left from #891 : re-add sweeps to new batches only after fully confirmed.
In case of a reorg sweeps should not go to another batch but stay in the current batch until it is fully confirmed. Only after that the remaining sweeps are re-added to another batch. Field
sweep.completedis now set to true only for fully-confirmed sweeps.Fixed OnChainFeePortion values. There were two mistakes. In case of a swap with multiple sweeps only the fee of the first sweep of a swap was accounted. Another issue is that rounding diff (the remainder) was attributed to all the sweeps rather than to the first (primary) sweep of the batch. The sweep to attribute the remainder was chosen by comparing SignatureScript which is
always empty. New approach is to find the primary sweep and to compare its outpoint directly.
Pull Request Checklist
release_notes.mdif your PR contains major features, breaking changes or bugfixes