Introduce interactive signing state flags for funded states. #3637
Conversation
|
👋 Thanks for assigning @wpaulino as a reviewer! |
dunxen
force-pushed
the
2025-02-interactivesigningstate
branch
2 times, most recently
from
4c6b6ab to
c1f430a
Compare
dunxen
changed the title
dunxen
force-pushed
the
2025-02-interactivesigningstate
branch
from
c1f430a to
e89ba58
Compare
Not yet. Tracked in #3636. Will need to be able to contribute inputs first to test a useful order of message exchange + restart. |
dunxen
force-pushed
the
2025-02-interactivesigningstate
branch
from
e89ba58 to
3b2ac55
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3637 +/- ##
==========================================
+ Coverage 89.37% 90.01% +0.63%
==========================================
Files 157 157
Lines 124095 129376 +5281
Branches 124095 129376 +5281
==========================================
+ Hits 110915 116452 +5537
+ Misses 10469 10187 -282
- Partials 2711 2737 +26 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
dunxen
force-pushed
the
2025-02-interactivesigningstate
branch
from
3b2ac55 to
5110ecc
Compare
|
@dunxen re-request when this is ready for review again, feel free to squash as well |
dunxen
force-pushed
the
2025-02-interactivesigningstate
branch
from
5110ecc to
1d96044
Compare
|
🔔 1st Reminder Hey @TheBlueMatt @jkczyz @wpaulino! This PR has been waiting for your review. |
| @@ -6924,11 +6933,72 @@ impl<SP: Deref> FundedChannel<SP> where | |||
| log_debug!(logger, "Reconnected channel {} with no loss", &self.context.channel_id()); | |||
| } | |||
|
|
|||
| // if next_funding_txid is set: | |||
There was a problem hiding this comment.
If possible, would be nice to get some test coverage in now for this
There was a problem hiding this comment.
Might be tricky at the moment, but makes sense to try do that now 👍
There was a problem hiding this comment.
Still tricky, but working on this now currently. I'll let you know if we'll have to defer this to a PR after "create outbound dual-funded channel" is complete.
dunxen
force-pushed
the
2025-02-interactivesigningstate
branch
from
1d96044 to
55e5f6f
Compare
|
🔔 2nd Reminder Hey @wpaulino! This PR has been waiting for your review. |
|
🔔 3rd Reminder Hey @wpaulino! This PR has been waiting for your review. |
|
🔔 4th Reminder Hey @wpaulino! This PR has been waiting for your review. |
|
🔔 5th Reminder Hey @wpaulino! This PR has been waiting for your review. |
|
🔔 6th Reminder Hey @wpaulino! This PR has been waiting for your review. |
dunxen
force-pushed
the
2025-02-interactivesigningstate
branch
from
21d3c78 to
692d59b
Compare
|
🔔 1st Reminder Hey @wpaulino! This PR has been waiting for your review. |
|
🔔 2nd Reminder Hey @wpaulino! This PR has been waiting for your review. |
Instead of having an explicit `ChannelContext::next_funding_txid` to set and read, we can get this value on the fly when it is appropriate to do so.
dunxen
force-pushed
the
2025-02-interactivesigningstate
branch
from
692d59b to
9ca7d03
Compare
|
🔔 3rd Reminder Hey @wpaulino! This PR has been waiting for your review. |
This follows the the specification closely in branching without being too verbose, so that it should be easy to follow the logic. See: https://github.com/lightning/bolts/blob/aa5207a/02-peer-protocol.md?plain=1#L2520-L2531
dunxen
force-pushed
the
2025-02-interactivesigningstate
branch
from
9ca7d03 to
b3c4f18
Compare
|
Changes: git diff-tree -U1 9ca7d03 b3c4f18
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 1eeca4aee..5111a5060 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -6600,6 +6600,5 @@ impl<SP: Deref> FundedChannel<SP> where
{
- if !matches!(
- self.context.channel_state,
- ChannelState::FundingNegotiated(flags) if flags.is_interactive_signing() || !flags.is_their_tx_signatures_sent()
- ) {
+ if self.interactive_tx_signing_session.is_none() ||
+ matches!(self.context.channel_state, ChannelState::FundingNegotiated(flags) if flags.is_their_tx_signatures_sent())
+ {
return Err(ChannelError::Ignore("Ignoring tx_signatures received outside of interactive signing".to_owned())); |
This intoduces the INTERACTIVE_SIGNING, THEIR_TX_SIGNATURES_SENT, and OUR_TX_SIGNATURES_SENT funded state flags. A top-level state flag for INTERACTIVE_SIGNING was avoided so that this work is compatible with splicing as well as V2 channel establishment (dual-funding). This commit also ensures that `ChannelPending` is only emitted after peers exchange `tx_signatures`.
We fully persist `InteractiveTxSigningSession` as it provides the full context of the constructed transaction which is still needed for signing.
When this config field is enabled, the dual_fund feature bit will be set which determines support when receiving `open_channel2` messages.
dunxen
force-pushed
the
2025-02-interactivesigningstate
branch
from
b3c4f18 to
fb00cb6
Compare
|
Changes: git diff-tree -U1 b3c4f18 fb00cb6
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 5111a5060..66305c042 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -6600,4 +6600,4 @@ impl<SP: Deref> FundedChannel<SP> where
{
- if self.interactive_tx_signing_session.is_none() ||
- matches!(self.context.channel_state, ChannelState::FundingNegotiated(flags) if flags.is_their_tx_signatures_sent())
+ if !self.context.channel_state.is_interactive_signing()
+ || self.context.channel_state.is_their_tx_signatures_sent()
{ |
This PR includes some deferred follow-ups extracted from #3423 and introduces new state flags to track interactive signing along with persistence of the minimum information needed from a signing session to reconstruct it.
A top-level state flag was avoided so that this work is compatible with splicing as well as V2 channel establishment (dual-funding).