[5/? ] - lnwallet: add taproot funding support to the internal wallet flow (reservations) #7344

Roasbeef · 2023-01-20T01:43:44Z

Change Description

This depends on #7340.

In this PR, we build on all the prior commits and integrate the new taproot channels into the existing internal funding flow. Along the way, we do some refactoring to unify things like signing and verifying incoming commitment transaction signatures.

For our local nonce, we use the existing functional option type to derive the nonce based on the initial shachain pre-image we'll use as our revocation.

We also hook up the new funding flow to the existing internal wallet integration tests:

⛰   go test -v -run=TestLightningWallet/btcwallet/btcd:single_funding_workflow_musig2
=== RUN   TestLightningWallet
=== PAUSE TestLightningWallet
=== CONT  TestLightningWallet
=== RUN   TestLightningWallet/btcwallet/btcd:single_funding_workflow_musig2
--- PASS: TestLightningWallet (7.94s)
    --- PASS: TestLightningWallet/btcwallet/btcd:single_funding_workflow_musig2 (0.46s)
PASS
ok  	github.com/lightningnetwork/lnd/lnwallet/test/btcd	8.225s

The last ~14 commits are new. Along the way some rebase issues were found and fixed in commits marked as [temp].

The next PR in this series will modify the channel state machine to understand the new commitment dance.

Steps to Test

Steps for reviewers to follow to test the change.

Pull Request Checklist

Testing

Your PR passes all CI checks.
Tests covering the positive and negative (error paths) are included.
Bug fixes contain tests triggering the bug to prevent regressions.

Code Style and Documentation

The change obeys the Code Documentation and Commenting guidelines, and lines wrap at 80.
Commits follow the Ideal Git Commit Structure.
Any new logging statements use an appropriate subsystem and logging level.
There is a change description in the release notes, or [skip ci] in the commit message for small changes.

📝 Please see our Contribution Guidelines for further guidance.

lnwallet/commitment.go

lnwallet/wallet.go

lnwallet/commitment.go

lnwallet/wallet.go

ellemouton

very nice!

channeldb/channel.go

lnwallet/commitment.go

lnwallet/channel.go

lnwallet/wallet.go

lnwallet/test/test_interface.go

lightninglabs-deploy · 2023-06-01T02:34:46Z

@Crypt-iQ: review reminder
@Roasbeef, remember to re-request review from reviewers when ready

Roasbeef · 2023-06-06T03:10:59Z

Initial round of comments addressed, PTAL!

lnwallet/commitment.go

lnwallet/channel.go

contractcourt/chain_watcher.go

yyforyongyu · 2023-06-07T09:16:59Z

lnwallet/wallet.go

+	// local commitment transaction. If we need to force close, then this
+	// is also what'll be used to sign that transaction.
+	if reservation.partialState.ChanType.IsTaproot() {
+		firstNoncePreimage, err := taprootNonceProducer.AtIndex(0)


So this is the nonce that's sent in open_channel by the funder and can be used to generate the final sig when receiving funding_signed.nonce from the fundee right?

Correct, this is where we use the counter based method to generate nonces we can always arrive at again.

In part 4, I started to also bind the nonce creation with the tx hash of the tx we're about to sign. However at this point, we need to send a nonce, and don't yet know the tx hash so we can't do so.

We'll still do that each time we go to sign a new commitment, as the tx hash then is already known.

channeldb/channel.go

lnwallet/commitment.go

Roasbeef · 2023-06-08T00:33:12Z

Latest round of comments addressed, PTAL!

yyforyongyu

Verrry close🤙🤙🤙 Need to fix the itest compile error, plus the linter error.

yyforyongyu · 2023-06-08T14:48:39Z

lnwallet/reservation.go

@@ -79,6 +92,8 @@ func (c CommitmentType) String() string {
 		return "anchors-zero-fee-second-level"
 	case CommitmentTypeScriptEnforcedLease:
 		return "script-enforced-lease"
+	case CommitmentTypeSimpleTaproot:
+		return "simple-taproot"


just occurs to me, why is this named simple taproot🤓?

So initial AJ had a much more feature complete and ambitious proposal to basically do everything (taproot, PTLCs, new commitment type, scriptless scripts) all in one. I thought it was a bit too much to bite off at once, so two spec meetings around I proposed a staged roll out proposal: musig2 output first, then PTLC+scriptless script, then commitment format changes). Thus was born "simple taproot".

lnwallet/commitment.go

contractcourt/chain_watcher.go

lnwallet/revocation_producer.go

ellemouton

LGTM 🔥 🥕⚡

A couple of linter errors to catch - most of them are lll ones

ellemouton · 2023-06-09T08:32:20Z

lnwallet/commitment.go

+		)
+
+		return &ScriptInfo{
+			PkScript: toLocalPkScript,


non blocking
am assuming we will calculate the witness script then for taproot chans at the time of spending since we would need to know which which branch we are spending in any case to build the control block at spend time. Other option would be to add a isLocalCommit bool to the CommitScriptToSelf method and then pre-compute and return the witness script & control block. That way we also dont have to derive the tree twice.

See later in the series, this is modified further to include the full script tree information.

yyforyongyu

Let's fix the linter errors and we can⛵️

yyforyongyu · 2023-06-09T09:24:35Z

lnwallet/channel.go


 	// Add anchor for local commitment tx, if any.
+	revocation, err := lc.channelState.RevocationProducer.AtIndex(
+		lc.currentHeight,


Leaving some notes for other reviewers, was wondering if lc.currentHeight is always updated to date here since NewAnchorResolutions makes a separate call to db and creates a new LightningWallet. This is fine as we'd only call it when StateCommitmentBroadcasted, which means the db has the latest view of the local commit, and no other goroutines can update it anymore because it's closed.

lnwallet/wallet.go

lnwallet/commitment.go

lnwallet/reservation.go

In this commit, we add a new wallet level channel type, along with the new fields we'll need to accept from both parties within the contribution messages. In this case, we now have a local nonce, along with the internal musig session.

We also update some of the resolutions (even though they aren't hooked up yet), as they need to be able to properly re-create the set of scripts.

…gReserveRequest

In this commit, we build on all the prior commits and integrate the new taproot channels into the existing internal funding flow. Along the way, we do some refactoring to unify things like signing and verifying incoming commitment transaction signatures. For our local nonce, we use the existing functional option type to derive the nonce based on the initial shachain pre-image we'll use as our revocation.

In this commit, we modify the starting logic to note attempt to add a tower client for taproot channels. Instead, we'll just log that this isn't available yet.

Roasbeef changed the title ~~[5/? ] - lnwallet:~~ [5/? ] - lnwallet: add taproot funding support to the internal wallet flow (reservations) Jan 20, 2023

Roasbeef added the taproot chans label Jan 20, 2023

Roasbeef mentioned this pull request Jan 20, 2023

[6/?] - lnwallet+chancloser: update channel state machine and co-op close for musig2 flow #7345

Merged

7 tasks

saubyk added this to the v0.16.0 milestone Jan 20, 2023

saubyk requested a review from yyforyongyu January 25, 2023 20:06

saubyk assigned Roasbeef Jan 26, 2023

joostjager reviewed Jan 31, 2023

View reviewed changes

lnwallet/commitment.go Outdated Show resolved Hide resolved

lnwallet/wallet.go Show resolved Hide resolved

lnwallet/commitment.go Show resolved Hide resolved

saubyk requested a review from Crypt-iQ January 31, 2023 18:07

saubyk modified the milestones: v0.16.0, v0.16.1 Feb 14, 2023

yyforyongyu reviewed Feb 20, 2023

View reviewed changes

lnwallet/commitment.go Outdated Show resolved Hide resolved

lnwallet/wallet.go Show resolved Hide resolved

ellemouton reviewed Mar 7, 2023

View reviewed changes

saubyk modified the milestones: v0.16.1, v0.17.0 Mar 13, 2023

Roasbeef changed the base branch from master to simple-taproot-chans-staging April 26, 2023 23:48

Roasbeef changed the base branch from simple-taproot-chans-staging to simple-taproot-funding April 27, 2023 00:02

Roasbeef force-pushed the simple-taproot-funding-reservation branch from be2c89c to 58e6bef Compare April 27, 2023 00:05

Roasbeef force-pushed the simple-taproot-funding branch from 8b3a3d6 to 6fc2387 Compare May 12, 2023 20:37

Roasbeef force-pushed the simple-taproot-funding-reservation branch from 58e6bef to ce6879c Compare May 12, 2023 20:44

Roasbeef force-pushed the simple-taproot-funding branch from 6fc2387 to 947096b Compare June 6, 2023 02:04

Roasbeef force-pushed the simple-taproot-funding-reservation branch 2 times, most recently from f8bc68e to e895d9d Compare June 6, 2023 03:10

Roasbeef requested review from ellemouton and yyforyongyu June 6, 2023 03:11

yyforyongyu reviewed Jun 7, 2023

View reviewed changes

ellemouton reviewed Jun 7, 2023

View reviewed changes

channeldb/channel.go Show resolved Hide resolved

lnwallet/commitment.go Outdated Show resolved Hide resolved

lnwallet/commitment.go Show resolved Hide resolved

lnwallet/commitment.go Outdated Show resolved Hide resolved

Roasbeef force-pushed the simple-taproot-funding branch 2 times, most recently from 691ecd9 to d22a0f9 Compare June 8, 2023 00:07

Roasbeef force-pushed the simple-taproot-funding-reservation branch 2 times, most recently from d76ae7a to bfaefbe Compare June 8, 2023 00:32

Roasbeef requested review from ellemouton and yyforyongyu June 8, 2023 00:32

yyforyongyu added the no-changelog label Jun 8, 2023

yyforyongyu requested changes Jun 8, 2023

View reviewed changes

Roasbeef force-pushed the simple-taproot-funding branch from d22a0f9 to 7c85f02 Compare June 9, 2023 00:20

Roasbeef force-pushed the simple-taproot-funding-reservation branch from bfaefbe to 4cab0ce Compare June 9, 2023 00:40

Roasbeef requested a review from yyforyongyu June 9, 2023 00:41

ellemouton approved these changes Jun 9, 2023

View reviewed changes

yyforyongyu requested changes Jun 9, 2023

View reviewed changes

Roasbeef force-pushed the simple-taproot-funding-reservation branch from 4cab0ce to 781a70f Compare June 14, 2023 03:29

Roasbeef added 9 commits June 13, 2023 22:51

channeldb: add new db type for taproot channels

b509aa3

lnwallet: update CommitScriptToSelf to add taproot awareness

4cd3eec

lnwallet: update CommitScriptToRemote to add taproot awareness

96c48ba

lnwallet: update CommitScriptAnchors to add taproot awareness

7225071

We also update some of the resolutions (even though they aren't hooked up yet), as they need to be able to properly re-create the set of scripts.

lnwallet: set new musig2 bool for chanfunding.Request in handleFundin…

88d1384

…gReserveRequest

lnwallet: add test case for musig2 channel funding

b4fa433

peer: soft-disable towers with taproot channels

2d4df80

In this commit, we modify the starting logic to note attempt to add a tower client for taproot channels. Instead, we'll just log that this isn't available yet.

Roasbeef force-pushed the simple-taproot-funding-reservation branch from 781a70f to 2d4df80 Compare June 14, 2023 03:54

Roasbeef changed the base branch from simple-taproot-funding to simple-taproot-chans-staging June 14, 2023 03:54

Roasbeef merged commit d91ae68 into lightningnetwork:simple-taproot-chans-staging Jun 14, 2023
21 of 24 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[5/? ] - lnwallet: add taproot funding support to the internal wallet flow (reservations) #7344

[5/? ] - lnwallet: add taproot funding support to the internal wallet flow (reservations) #7344

Roasbeef commented Jan 20, 2023 •

edited

ellemouton left a comment

lightninglabs-deploy commented Jun 1, 2023

Roasbeef commented Jun 6, 2023

yyforyongyu Jun 7, 2023

Roasbeef Jun 8, 2023

Roasbeef commented Jun 8, 2023

yyforyongyu left a comment

yyforyongyu Jun 8, 2023

Roasbeef Jun 9, 2023

ellemouton left a comment

ellemouton Jun 9, 2023

Roasbeef Jun 13, 2023

yyforyongyu left a comment

yyforyongyu Jun 9, 2023

[5/? ] - lnwallet: add taproot funding support to the internal wallet flow (reservations) #7344

[5/? ] - lnwallet: add taproot funding support to the internal wallet flow (reservations) #7344

Conversation

Roasbeef commented Jan 20, 2023 • edited

Change Description

Steps to Test

Pull Request Checklist

Testing

Code Style and Documentation

ellemouton left a comment

Choose a reason for hiding this comment

lightninglabs-deploy commented Jun 1, 2023

Roasbeef commented Jun 6, 2023

yyforyongyu Jun 7, 2023

Choose a reason for hiding this comment

Roasbeef Jun 8, 2023

Choose a reason for hiding this comment

Roasbeef commented Jun 8, 2023

yyforyongyu left a comment

Choose a reason for hiding this comment

yyforyongyu Jun 8, 2023

Choose a reason for hiding this comment

Roasbeef Jun 9, 2023

Choose a reason for hiding this comment

ellemouton left a comment

Choose a reason for hiding this comment

ellemouton Jun 9, 2023

Choose a reason for hiding this comment

Roasbeef Jun 13, 2023

Choose a reason for hiding this comment

yyforyongyu left a comment

Choose a reason for hiding this comment

yyforyongyu Jun 9, 2023

Choose a reason for hiding this comment

Roasbeef commented Jan 20, 2023 •

edited