multi: merge simple taproot channels staging branch into master #7904
Conversation
This file contains 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
|
One other thing I noticed while catching up the branch is that |
Pull reviewers statsStats of the last 30 days for lnd:
|
|
Took another stab at the rebased version, wasn't as bad as I thought it'd be after getting thru the first 30 or so, pushing that up shortly. |
Roasbeef
force-pushed
the
simple-taproot-chans-staging
branch
2 times, most recently
from
eac49f8
to
13f3419
Compare
In this commit, we update the Sig type to support ECDSA and schnorr signatures. We need to do this as the HTLC signatures will become schnorr sigs for taproot channels. The current spec draft opts to overload this field since both the sigs are actually 64 bytes in length. The only consideration with this move is that callers need to "coerce" a sig to the proper type if they need schnorr signatures.
In this commit, we add the new types that'll house musig signatures with and without their nonces. We send the nonce along with the sig everywhere but the co-op close flow.
This ensures that the caller doesn't need to worry about the TLV type ordering of the records the pass into the function.
In this commit, we add a helper function to take a taproot output key and turn it into a v1 witness program.
In this commit, we add GenTaprootFundingScript, which'll return the taproot pkScript and output for a taproot+musig2 channel. This uses musig2 key aggregation with sorting activated. The final key produced uses a bip86 tweak, meaning that the output key provably doesn't commit to any script path. In the future, we may want to permit this, as then it allows for a greater degree of programmability of the funding output.
This is a preparatory change for the upcoming "simple channel close" feature which'll utilize RBF to allow either side to resign the co-op close transaction for broadcast at any point.
The local nonce needs to be the one that's finalized to simulate us receiving the remote nonce, then generating the local nonce in a JIT style.
Otherwise, in the itests (which are mainly based on implicit negotiation), we won't try to open taproot chans when we actually need to. We may want to revisit this however, since it may lock in parties trying to use the defaults that aren't currently setting the explicit commit type during funding.
We keep in line with the existing test that uses implicit negotiation. In the future, we should modify to also have explicit negotiation as well.
In this commit, we remove the internal call to `InitRemoteMusigNonces`. We don't need this since when we go to process the remote party's chan reest message, we'll already call this method. Otherwise, we'll get an error here since the pending verification nonce has been wiped out after each call.
The first and second level taptweaks need to be stored in order to ensure the breach arb can play revocations at both the first and second level.
Co-op close for musig2 chans needs to use the proper witness size.
We also remove the old implicit negotiation as well, as we'll be updating tests to use explciit when required.
We use a helper function to ensure that anytime we're about to make a normal sighash, we consult the channel type to check if we should use the default value or sighash all explicitly.
This adds some extra assertions to ensure things like the taproot commitment weight estimation is correct.
In this commit, we carry out a new notion introduced during a recent spec meeting to use a feature bit plus 100 before the feature has been finalized in the spec. We split into the Final and Staging bits.
The prior commit removed implicit negotiation, so we'll need to make sure to use the explicit chan type feature vector when we go to negotiate.
In the master branch, the blocks are mined earlier, so we don't need to mine an extra set.
Roasbeef
force-pushed
the
simple-taproot-chans-staging
branch
from
13f3419
to
92da6b1
Compare
saubyk
approved these changes
Aug 23, 2023
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.
In this PR, we propose merging the simple taproot channels staging branch into the master branch. Each of the side branches has been progressively merged into the staging branch over the past few months in an incremental manner. The final PR was merged earlier today with a clean build on CI. The purpose of this PR is to catch up the master branch with all the changes up until now.
All the tests pass for me locally, but I had to make some changes for the on chain force close zero conf tests. The master branch now mines all the transactions in a single block, even if they're zero conf. While the master branch when the feature was branched off on would only mine again it it wasn't
private && zeroConf. Even though all the blocks are a mined now, I still spot an occasional flake where even though Carol should have gone to chain, she doesn't seem to execute on that.Fixes #6691