lightningd: don't disconnect when sending error for unknown channel_reestablish - #9427

Open
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop
Open

lightningd: don't disconnect when sending error for unknown channel_reestablish#9427
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop

Conversation

@vincenzopalazzo

Copy link
Copy Markdown
Collaborator

Recreated from #9404 (original head fork went private; identical commits, no content changes). Originally opened 2026-08-12.

♻️ Re-creation of #8988, which was auto-closed on 2026-08-11 when my fork was detached from the repository network (GitHub cannot reopen PRs closed by a detachment). Branch content is unchanged (head 592381a58); the previous review discussion remains on #8988.

Note: the outstanding review feedback from @nGoline on #8988 (cite BOLT #1error semantics in the PR) still applies and is being addressed.

Summary

  • When receiving WIRE_CHANNEL_REESTABLISH for an unknown channel, send the error without disconnecting
  • Prevents a race where the disconnect arrives before the error, leaving the peer with a stale saved channel in DUALOPEND_OPEN_COMMIT_READY that retries indefinitely

The bug: during dual-funding, if one side saves the channel (reaches DUALOPEND_OPEN_COMMIT_READY) but the other deletes its unsaved copy on disconnect, reconnects create an infinite loop. The saved side sends CHANNEL_REESTABLISH, the other side sends error + disconnect. The disconnect races with the error delivery -- if the peer's dualopend doesn't receive the error before the socket closes, dualopen_errmsg is called with disconnect=false, which calls channel_fail_transient instead of deleting the channel, and the cycle repeats.

By not disconnecting, the error reliably reaches the peer's dualopend, which processes it via peer_failed_received_errmsg(disconnect=true) and properly deletes the stale channel.

Test plan

  • Verify make check-units passes (done locally)
  • CI integration tests, particularly test_disconnect_opener

Fixes#8822

@vincenzopalazzo

Copy link
Copy Markdown
CollaboratorAuthor

Hi @daywalker90 👋 — this replaces #9404 (auto-closed when my fork went private; identical commits). Fixes the disconnect-on-unknown-channel_reestablish reconnect loop hitting dual-fund peers. Targeting v26.09 — would appreciate a review before the RC cut, happy to address feedback.

vincenzopalazzo added a commit to vincenzopalazzo/lightning that referenced this pull request Aug 17, 2026
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
…eestablish
When a peer sends WIRE_CHANNEL_REESTABLISH for a channel we don't know
about (e.g. dual-funding, where we deleted the unsaved channel on
disconnect but the peer saved it in DUALOPEND_OPEN_COMMIT_READY), we
sent an error and hung up.
Our error does make it onto the wire: disconnect_peer() -> drain_peer()
in connectd/multiplex.c gives peer_outq 5 seconds to flush first. The
race is on the receiving node: its connectd hands the error to dualopend
and tears the subds down on EOF at the same time, and when dualopend
loses that race lightningd only sees "Owning subdaemon dualopend died"
(subd.c passes peer_fd=NULL, disconnect=false), so dualopen_errmsg()
keeps the DUALOPEND_OPEN_COMMIT_READY channel for a later reconnect.
It then reestablishes on every reconnect, and we error and hang up
again.
BOLT ElementsProject#1 only requires that a node sending `error` fails the channel(s)
the error refers to; it never says to drop the connection, and here we
don't know the channel, so there is nothing for us to fail. So send the
error and stay connected: the peer's dualopend then reliably reads it
and forgets the channel.
Since we no longer hang up, bound how many unknown-channel
reestablishes we answer on a single connection, so a peer can't use
this to make us log and write errors indefinitely.
Changelog-Fixed: dual-funding reconnect loop when peer doesn't know about a saved channel
Fixes: ElementsProject#8822
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Sets up ElementsProject#8822: l1 drops the last tx_complete after dualopend has decided
the commitment is ready, so l1 saves a DUALOPEND_OPEN_COMMIT_READY
channel that l2 never saved. On reconnect l1 reestablishes a channel l2
doesn't know, and l2 has to answer with an error and stay connected.
Note this pins the new behaviour rather than the loop itself: the loop
is a race on l1's side (see the previous commit), and locally l1 wins it
and forgets the channel even without the fix, so a strict xfail
reproduction would just be flaky. The test does fail without the fix,
on l2 hanging up.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the fix/dual-funding-reconnect-loop branch from 623c770 to 92767d6CompareAugust 17, 2026 11:35
/* How many channel_reestablish for channels we don't know we answer without
* hanging up. An honest peer needs one per stale channel; past that it's
* cheaper for us to make them reconnect (which connectd rate-limits). */
#define MAX_UNKNOWN_CHANNEL_REESTABLISHES 10

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 10?

@daywalker90

daywalker90 commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator
____________________________ test_disconnect_opener ____________________________
[gw4] linux -- Python 3.10.20 /home/runner/work/lightning/lightning/.venv/bin/python
node_factory = <pyln.testing.utils.NodeFactory object at 0x7f4d3abdca90>
@pytest.mark.openchannel('v1')
@pytest.mark.openchannel('v2')
# FIXME: https://github.com/ElementsProject/lightning/issues/8822
@pytest.mark.flaky(reruns=1)
def test_disconnect_opener(node_factory):
# Now error on opener side during channel open.
disconnects = ['-WIRE_OPEN_CHANNEL',
'+WIRE_OPEN_CHANNEL',
'-WIRE_FUNDING_CREATED']
if EXPERIMENTAL_DUAL_FUND:
disconnects = ['-WIRE_OPEN_CHANNEL2',
'+WIRE_OPEN_CHANNEL2',
'-WIRE_TX_ADD_INPUT',
'+WIRE_TX_ADD_INPUT',
'-WIRE_TX_ADD_OUTPUT',
'+WIRE_TX_ADD_OUTPUT',
'-WIRE_TX_COMPLETE',
'=WIRE_TX_COMPLETE']
l1 = node_factory.get_node(disconnect=disconnects,
may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l2 = node_factory.get_node(may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l1.fundwallet(2000000)
for d in disconnects:
l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
> with pytest.raises(RpcError):
E Failed: DID NOT RAISE <class 'pyln.client.lightning.RpcError'>
tests/test_connection.py:507: Failed

This is a test related to this PR if i'm not mistaken and it failed in CI: https://github.com/ElementsProject/lightning/actions/runs/32025646089/job/96039521307?pr=9427

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dual-funding can leave peers unable to reconnect

3 participants

@vincenzopalazzo@daywalker90@Andezion
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

lightningd: don't disconnect when sending error for unknown channel_reestablish - #9427

Open
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop
Open

lightningd: don't disconnect when sending error for unknown channel_reestablish#9427
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop

Conversation

@vincenzopalazzo

Copy link
Copy Markdown
Collaborator

Recreated from #9404 (original head fork went private; identical commits, no content changes). Originally opened 2026-08-12.

♻️ Re-creation of #8988, which was auto-closed on 2026-08-11 when my fork was detached from the repository network (GitHub cannot reopen PRs closed by a detachment). Branch content is unchanged (head 592381a58); the previous review discussion remains on #8988.

Note: the outstanding review feedback from @nGoline on #8988 (cite BOLT #1error semantics in the PR) still applies and is being addressed.

Summary

  • When receiving WIRE_CHANNEL_REESTABLISH for an unknown channel, send the error without disconnecting
  • Prevents a race where the disconnect arrives before the error, leaving the peer with a stale saved channel in DUALOPEND_OPEN_COMMIT_READY that retries indefinitely

The bug: during dual-funding, if one side saves the channel (reaches DUALOPEND_OPEN_COMMIT_READY) but the other deletes its unsaved copy on disconnect, reconnects create an infinite loop. The saved side sends CHANNEL_REESTABLISH, the other side sends error + disconnect. The disconnect races with the error delivery -- if the peer's dualopend doesn't receive the error before the socket closes, dualopen_errmsg is called with disconnect=false, which calls channel_fail_transient instead of deleting the channel, and the cycle repeats.

By not disconnecting, the error reliably reaches the peer's dualopend, which processes it via peer_failed_received_errmsg(disconnect=true) and properly deletes the stale channel.

Test plan

  • Verify make check-units passes (done locally)
  • CI integration tests, particularly test_disconnect_opener

Fixes#8822

@vincenzopalazzo

Copy link
Copy Markdown
CollaboratorAuthor

Hi @daywalker90 👋 — this replaces #9404 (auto-closed when my fork went private; identical commits). Fixes the disconnect-on-unknown-channel_reestablish reconnect loop hitting dual-fund peers. Targeting v26.09 — would appreciate a review before the RC cut, happy to address feedback.

vincenzopalazzo added a commit to vincenzopalazzo/lightning that referenced this pull request Aug 17, 2026
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
…eestablish
When a peer sends WIRE_CHANNEL_REESTABLISH for a channel we don't know
about (e.g. dual-funding, where we deleted the unsaved channel on
disconnect but the peer saved it in DUALOPEND_OPEN_COMMIT_READY), we
sent an error and hung up.
Our error does make it onto the wire: disconnect_peer() -> drain_peer()
in connectd/multiplex.c gives peer_outq 5 seconds to flush first. The
race is on the receiving node: its connectd hands the error to dualopend
and tears the subds down on EOF at the same time, and when dualopend
loses that race lightningd only sees "Owning subdaemon dualopend died"
(subd.c passes peer_fd=NULL, disconnect=false), so dualopen_errmsg()
keeps the DUALOPEND_OPEN_COMMIT_READY channel for a later reconnect.
It then reestablishes on every reconnect, and we error and hang up
again.
BOLT ElementsProject#1 only requires that a node sending `error` fails the channel(s)
the error refers to; it never says to drop the connection, and here we
don't know the channel, so there is nothing for us to fail. So send the
error and stay connected: the peer's dualopend then reliably reads it
and forgets the channel.
Since we no longer hang up, bound how many unknown-channel
reestablishes we answer on a single connection, so a peer can't use
this to make us log and write errors indefinitely.
Changelog-Fixed: dual-funding reconnect loop when peer doesn't know about a saved channel
Fixes: ElementsProject#8822
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Sets up ElementsProject#8822: l1 drops the last tx_complete after dualopend has decided
the commitment is ready, so l1 saves a DUALOPEND_OPEN_COMMIT_READY
channel that l2 never saved. On reconnect l1 reestablishes a channel l2
doesn't know, and l2 has to answer with an error and stay connected.
Note this pins the new behaviour rather than the loop itself: the loop
is a race on l1's side (see the previous commit), and locally l1 wins it
and forgets the channel even without the fix, so a strict xfail
reproduction would just be flaky. The test does fail without the fix,
on l2 hanging up.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the fix/dual-funding-reconnect-loop branch from 623c770 to 92767d6CompareAugust 17, 2026 11:35
/* How many channel_reestablish for channels we don't know we answer without
* hanging up. An honest peer needs one per stale channel; past that it's
* cheaper for us to make them reconnect (which connectd rate-limits). */
#define MAX_UNKNOWN_CHANNEL_REESTABLISHES 10

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 10?

@daywalker90

daywalker90 commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator
____________________________ test_disconnect_opener ____________________________
[gw4] linux -- Python 3.10.20 /home/runner/work/lightning/lightning/.venv/bin/python
node_factory = <pyln.testing.utils.NodeFactory object at 0x7f4d3abdca90>
@pytest.mark.openchannel('v1')
@pytest.mark.openchannel('v2')
# FIXME: https://github.com/ElementsProject/lightning/issues/8822
@pytest.mark.flaky(reruns=1)
def test_disconnect_opener(node_factory):
# Now error on opener side during channel open.
disconnects = ['-WIRE_OPEN_CHANNEL',
'+WIRE_OPEN_CHANNEL',
'-WIRE_FUNDING_CREATED']
if EXPERIMENTAL_DUAL_FUND:
disconnects = ['-WIRE_OPEN_CHANNEL2',
'+WIRE_OPEN_CHANNEL2',
'-WIRE_TX_ADD_INPUT',
'+WIRE_TX_ADD_INPUT',
'-WIRE_TX_ADD_OUTPUT',
'+WIRE_TX_ADD_OUTPUT',
'-WIRE_TX_COMPLETE',
'=WIRE_TX_COMPLETE']
l1 = node_factory.get_node(disconnect=disconnects,
may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l2 = node_factory.get_node(may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l1.fundwallet(2000000)
for d in disconnects:
l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
> with pytest.raises(RpcError):
E Failed: DID NOT RAISE <class 'pyln.client.lightning.RpcError'>
tests/test_connection.py:507: Failed

This is a test related to this PR if i'm not mistaken and it failed in CI: https://github.com/ElementsProject/lightning/actions/runs/32025646089/job/96039521307?pr=9427

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dual-funding can leave peers unable to reconnect

3 participants

@vincenzopalazzo@daywalker90@Andezion
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

lightningd: don't disconnect when sending error for unknown channel_reestablish - #9427

Open
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop
Open

lightningd: don't disconnect when sending error for unknown channel_reestablish#9427
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop

Conversation

@vincenzopalazzo

Copy link
Copy Markdown
Collaborator

Recreated from #9404 (original head fork went private; identical commits, no content changes). Originally opened 2026-08-12.

♻️ Re-creation of #8988, which was auto-closed on 2026-08-11 when my fork was detached from the repository network (GitHub cannot reopen PRs closed by a detachment). Branch content is unchanged (head 592381a58); the previous review discussion remains on #8988.

Note: the outstanding review feedback from @nGoline on #8988 (cite BOLT #1error semantics in the PR) still applies and is being addressed.

Summary

  • When receiving WIRE_CHANNEL_REESTABLISH for an unknown channel, send the error without disconnecting
  • Prevents a race where the disconnect arrives before the error, leaving the peer with a stale saved channel in DUALOPEND_OPEN_COMMIT_READY that retries indefinitely

The bug: during dual-funding, if one side saves the channel (reaches DUALOPEND_OPEN_COMMIT_READY) but the other deletes its unsaved copy on disconnect, reconnects create an infinite loop. The saved side sends CHANNEL_REESTABLISH, the other side sends error + disconnect. The disconnect races with the error delivery -- if the peer's dualopend doesn't receive the error before the socket closes, dualopen_errmsg is called with disconnect=false, which calls channel_fail_transient instead of deleting the channel, and the cycle repeats.

By not disconnecting, the error reliably reaches the peer's dualopend, which processes it via peer_failed_received_errmsg(disconnect=true) and properly deletes the stale channel.

Test plan

  • Verify make check-units passes (done locally)
  • CI integration tests, particularly test_disconnect_opener

Fixes#8822

@vincenzopalazzo

Copy link
Copy Markdown
CollaboratorAuthor

Hi @daywalker90 👋 — this replaces #9404 (auto-closed when my fork went private; identical commits). Fixes the disconnect-on-unknown-channel_reestablish reconnect loop hitting dual-fund peers. Targeting v26.09 — would appreciate a review before the RC cut, happy to address feedback.

vincenzopalazzo added a commit to vincenzopalazzo/lightning that referenced this pull request Aug 17, 2026
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
…eestablish
When a peer sends WIRE_CHANNEL_REESTABLISH for a channel we don't know
about (e.g. dual-funding, where we deleted the unsaved channel on
disconnect but the peer saved it in DUALOPEND_OPEN_COMMIT_READY), we
sent an error and hung up.
Our error does make it onto the wire: disconnect_peer() -> drain_peer()
in connectd/multiplex.c gives peer_outq 5 seconds to flush first. The
race is on the receiving node: its connectd hands the error to dualopend
and tears the subds down on EOF at the same time, and when dualopend
loses that race lightningd only sees "Owning subdaemon dualopend died"
(subd.c passes peer_fd=NULL, disconnect=false), so dualopen_errmsg()
keeps the DUALOPEND_OPEN_COMMIT_READY channel for a later reconnect.
It then reestablishes on every reconnect, and we error and hang up
again.
BOLT ElementsProject#1 only requires that a node sending `error` fails the channel(s)
the error refers to; it never says to drop the connection, and here we
don't know the channel, so there is nothing for us to fail. So send the
error and stay connected: the peer's dualopend then reliably reads it
and forgets the channel.
Since we no longer hang up, bound how many unknown-channel
reestablishes we answer on a single connection, so a peer can't use
this to make us log and write errors indefinitely.
Changelog-Fixed: dual-funding reconnect loop when peer doesn't know about a saved channel
Fixes: ElementsProject#8822
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Sets up ElementsProject#8822: l1 drops the last tx_complete after dualopend has decided
the commitment is ready, so l1 saves a DUALOPEND_OPEN_COMMIT_READY
channel that l2 never saved. On reconnect l1 reestablishes a channel l2
doesn't know, and l2 has to answer with an error and stay connected.
Note this pins the new behaviour rather than the loop itself: the loop
is a race on l1's side (see the previous commit), and locally l1 wins it
and forgets the channel even without the fix, so a strict xfail
reproduction would just be flaky. The test does fail without the fix,
on l2 hanging up.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the fix/dual-funding-reconnect-loop branch from 623c770 to 92767d6CompareAugust 17, 2026 11:35
/* How many channel_reestablish for channels we don't know we answer without
* hanging up. An honest peer needs one per stale channel; past that it's
* cheaper for us to make them reconnect (which connectd rate-limits). */
#define MAX_UNKNOWN_CHANNEL_REESTABLISHES 10

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 10?

@daywalker90

daywalker90 commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator
____________________________ test_disconnect_opener ____________________________
[gw4] linux -- Python 3.10.20 /home/runner/work/lightning/lightning/.venv/bin/python
node_factory = <pyln.testing.utils.NodeFactory object at 0x7f4d3abdca90>
@pytest.mark.openchannel('v1')
@pytest.mark.openchannel('v2')
# FIXME: https://github.com/ElementsProject/lightning/issues/8822
@pytest.mark.flaky(reruns=1)
def test_disconnect_opener(node_factory):
# Now error on opener side during channel open.
disconnects = ['-WIRE_OPEN_CHANNEL',
'+WIRE_OPEN_CHANNEL',
'-WIRE_FUNDING_CREATED']
if EXPERIMENTAL_DUAL_FUND:
disconnects = ['-WIRE_OPEN_CHANNEL2',
'+WIRE_OPEN_CHANNEL2',
'-WIRE_TX_ADD_INPUT',
'+WIRE_TX_ADD_INPUT',
'-WIRE_TX_ADD_OUTPUT',
'+WIRE_TX_ADD_OUTPUT',
'-WIRE_TX_COMPLETE',
'=WIRE_TX_COMPLETE']
l1 = node_factory.get_node(disconnect=disconnects,
may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l2 = node_factory.get_node(may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l1.fundwallet(2000000)
for d in disconnects:
l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
> with pytest.raises(RpcError):
E Failed: DID NOT RAISE <class 'pyln.client.lightning.RpcError'>
tests/test_connection.py:507: Failed

This is a test related to this PR if i'm not mistaken and it failed in CI: https://github.com/ElementsProject/lightning/actions/runs/32025646089/job/96039521307?pr=9427

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dual-funding can leave peers unable to reconnect

3 participants

@vincenzopalazzo@daywalker90@Andezion
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

lightningd: don't disconnect when sending error for unknown channel_reestablish - #9427

Open
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop
Open

lightningd: don't disconnect when sending error for unknown channel_reestablish#9427
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop

Conversation

@vincenzopalazzo

Copy link
Copy Markdown
Collaborator

Recreated from #9404 (original head fork went private; identical commits, no content changes). Originally opened 2026-08-12.

♻️ Re-creation of #8988, which was auto-closed on 2026-08-11 when my fork was detached from the repository network (GitHub cannot reopen PRs closed by a detachment). Branch content is unchanged (head 592381a58); the previous review discussion remains on #8988.

Note: the outstanding review feedback from @nGoline on #8988 (cite BOLT #1error semantics in the PR) still applies and is being addressed.

Summary

  • When receiving WIRE_CHANNEL_REESTABLISH for an unknown channel, send the error without disconnecting
  • Prevents a race where the disconnect arrives before the error, leaving the peer with a stale saved channel in DUALOPEND_OPEN_COMMIT_READY that retries indefinitely

The bug: during dual-funding, if one side saves the channel (reaches DUALOPEND_OPEN_COMMIT_READY) but the other deletes its unsaved copy on disconnect, reconnects create an infinite loop. The saved side sends CHANNEL_REESTABLISH, the other side sends error + disconnect. The disconnect races with the error delivery -- if the peer's dualopend doesn't receive the error before the socket closes, dualopen_errmsg is called with disconnect=false, which calls channel_fail_transient instead of deleting the channel, and the cycle repeats.

By not disconnecting, the error reliably reaches the peer's dualopend, which processes it via peer_failed_received_errmsg(disconnect=true) and properly deletes the stale channel.

Test plan

  • Verify make check-units passes (done locally)
  • CI integration tests, particularly test_disconnect_opener

Fixes#8822

@vincenzopalazzo

Copy link
Copy Markdown
CollaboratorAuthor

Hi @daywalker90 👋 — this replaces #9404 (auto-closed when my fork went private; identical commits). Fixes the disconnect-on-unknown-channel_reestablish reconnect loop hitting dual-fund peers. Targeting v26.09 — would appreciate a review before the RC cut, happy to address feedback.

vincenzopalazzo added a commit to vincenzopalazzo/lightning that referenced this pull request Aug 17, 2026
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
…eestablish
When a peer sends WIRE_CHANNEL_REESTABLISH for a channel we don't know
about (e.g. dual-funding, where we deleted the unsaved channel on
disconnect but the peer saved it in DUALOPEND_OPEN_COMMIT_READY), we
sent an error and hung up.
Our error does make it onto the wire: disconnect_peer() -> drain_peer()
in connectd/multiplex.c gives peer_outq 5 seconds to flush first. The
race is on the receiving node: its connectd hands the error to dualopend
and tears the subds down on EOF at the same time, and when dualopend
loses that race lightningd only sees "Owning subdaemon dualopend died"
(subd.c passes peer_fd=NULL, disconnect=false), so dualopen_errmsg()
keeps the DUALOPEND_OPEN_COMMIT_READY channel for a later reconnect.
It then reestablishes on every reconnect, and we error and hang up
again.
BOLT ElementsProject#1 only requires that a node sending `error` fails the channel(s)
the error refers to; it never says to drop the connection, and here we
don't know the channel, so there is nothing for us to fail. So send the
error and stay connected: the peer's dualopend then reliably reads it
and forgets the channel.
Since we no longer hang up, bound how many unknown-channel
reestablishes we answer on a single connection, so a peer can't use
this to make us log and write errors indefinitely.
Changelog-Fixed: dual-funding reconnect loop when peer doesn't know about a saved channel
Fixes: ElementsProject#8822
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Sets up ElementsProject#8822: l1 drops the last tx_complete after dualopend has decided
the commitment is ready, so l1 saves a DUALOPEND_OPEN_COMMIT_READY
channel that l2 never saved. On reconnect l1 reestablishes a channel l2
doesn't know, and l2 has to answer with an error and stay connected.
Note this pins the new behaviour rather than the loop itself: the loop
is a race on l1's side (see the previous commit), and locally l1 wins it
and forgets the channel even without the fix, so a strict xfail
reproduction would just be flaky. The test does fail without the fix,
on l2 hanging up.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the fix/dual-funding-reconnect-loop branch from 623c770 to 92767d6CompareAugust 17, 2026 11:35
/* How many channel_reestablish for channels we don't know we answer without
* hanging up. An honest peer needs one per stale channel; past that it's
* cheaper for us to make them reconnect (which connectd rate-limits). */
#define MAX_UNKNOWN_CHANNEL_REESTABLISHES 10

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 10?

@daywalker90

daywalker90 commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator
____________________________ test_disconnect_opener ____________________________
[gw4] linux -- Python 3.10.20 /home/runner/work/lightning/lightning/.venv/bin/python
node_factory = <pyln.testing.utils.NodeFactory object at 0x7f4d3abdca90>
@pytest.mark.openchannel('v1')
@pytest.mark.openchannel('v2')
# FIXME: https://github.com/ElementsProject/lightning/issues/8822
@pytest.mark.flaky(reruns=1)
def test_disconnect_opener(node_factory):
# Now error on opener side during channel open.
disconnects = ['-WIRE_OPEN_CHANNEL',
'+WIRE_OPEN_CHANNEL',
'-WIRE_FUNDING_CREATED']
if EXPERIMENTAL_DUAL_FUND:
disconnects = ['-WIRE_OPEN_CHANNEL2',
'+WIRE_OPEN_CHANNEL2',
'-WIRE_TX_ADD_INPUT',
'+WIRE_TX_ADD_INPUT',
'-WIRE_TX_ADD_OUTPUT',
'+WIRE_TX_ADD_OUTPUT',
'-WIRE_TX_COMPLETE',
'=WIRE_TX_COMPLETE']
l1 = node_factory.get_node(disconnect=disconnects,
may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l2 = node_factory.get_node(may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l1.fundwallet(2000000)
for d in disconnects:
l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
> with pytest.raises(RpcError):
E Failed: DID NOT RAISE <class 'pyln.client.lightning.RpcError'>
tests/test_connection.py:507: Failed

This is a test related to this PR if i'm not mistaken and it failed in CI: https://github.com/ElementsProject/lightning/actions/runs/32025646089/job/96039521307?pr=9427

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dual-funding can leave peers unable to reconnect

3 participants

@vincenzopalazzo@daywalker90@Andezion
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

lightningd: don't disconnect when sending error for unknown channel_reestablish - #9427

Open
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop
Open

lightningd: don't disconnect when sending error for unknown channel_reestablish#9427
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop

Conversation

@vincenzopalazzo

Copy link
Copy Markdown
Collaborator

Recreated from #9404 (original head fork went private; identical commits, no content changes). Originally opened 2026-08-12.

♻️ Re-creation of #8988, which was auto-closed on 2026-08-11 when my fork was detached from the repository network (GitHub cannot reopen PRs closed by a detachment). Branch content is unchanged (head 592381a58); the previous review discussion remains on #8988.

Note: the outstanding review feedback from @nGoline on #8988 (cite BOLT #1error semantics in the PR) still applies and is being addressed.

Summary

  • When receiving WIRE_CHANNEL_REESTABLISH for an unknown channel, send the error without disconnecting
  • Prevents a race where the disconnect arrives before the error, leaving the peer with a stale saved channel in DUALOPEND_OPEN_COMMIT_READY that retries indefinitely

The bug: during dual-funding, if one side saves the channel (reaches DUALOPEND_OPEN_COMMIT_READY) but the other deletes its unsaved copy on disconnect, reconnects create an infinite loop. The saved side sends CHANNEL_REESTABLISH, the other side sends error + disconnect. The disconnect races with the error delivery -- if the peer's dualopend doesn't receive the error before the socket closes, dualopen_errmsg is called with disconnect=false, which calls channel_fail_transient instead of deleting the channel, and the cycle repeats.

By not disconnecting, the error reliably reaches the peer's dualopend, which processes it via peer_failed_received_errmsg(disconnect=true) and properly deletes the stale channel.

Test plan

  • Verify make check-units passes (done locally)
  • CI integration tests, particularly test_disconnect_opener

Fixes#8822

@vincenzopalazzo

Copy link
Copy Markdown
CollaboratorAuthor

Hi @daywalker90 👋 — this replaces #9404 (auto-closed when my fork went private; identical commits). Fixes the disconnect-on-unknown-channel_reestablish reconnect loop hitting dual-fund peers. Targeting v26.09 — would appreciate a review before the RC cut, happy to address feedback.

vincenzopalazzo added a commit to vincenzopalazzo/lightning that referenced this pull request Aug 17, 2026
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
…eestablish
When a peer sends WIRE_CHANNEL_REESTABLISH for a channel we don't know
about (e.g. dual-funding, where we deleted the unsaved channel on
disconnect but the peer saved it in DUALOPEND_OPEN_COMMIT_READY), we
sent an error and hung up.
Our error does make it onto the wire: disconnect_peer() -> drain_peer()
in connectd/multiplex.c gives peer_outq 5 seconds to flush first. The
race is on the receiving node: its connectd hands the error to dualopend
and tears the subds down on EOF at the same time, and when dualopend
loses that race lightningd only sees "Owning subdaemon dualopend died"
(subd.c passes peer_fd=NULL, disconnect=false), so dualopen_errmsg()
keeps the DUALOPEND_OPEN_COMMIT_READY channel for a later reconnect.
It then reestablishes on every reconnect, and we error and hang up
again.
BOLT ElementsProject#1 only requires that a node sending `error` fails the channel(s)
the error refers to; it never says to drop the connection, and here we
don't know the channel, so there is nothing for us to fail. So send the
error and stay connected: the peer's dualopend then reliably reads it
and forgets the channel.
Since we no longer hang up, bound how many unknown-channel
reestablishes we answer on a single connection, so a peer can't use
this to make us log and write errors indefinitely.
Changelog-Fixed: dual-funding reconnect loop when peer doesn't know about a saved channel
Fixes: ElementsProject#8822
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Sets up ElementsProject#8822: l1 drops the last tx_complete after dualopend has decided
the commitment is ready, so l1 saves a DUALOPEND_OPEN_COMMIT_READY
channel that l2 never saved. On reconnect l1 reestablishes a channel l2
doesn't know, and l2 has to answer with an error and stay connected.
Note this pins the new behaviour rather than the loop itself: the loop
is a race on l1's side (see the previous commit), and locally l1 wins it
and forgets the channel even without the fix, so a strict xfail
reproduction would just be flaky. The test does fail without the fix,
on l2 hanging up.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the fix/dual-funding-reconnect-loop branch from 623c770 to 92767d6CompareAugust 17, 2026 11:35
/* How many channel_reestablish for channels we don't know we answer without
* hanging up. An honest peer needs one per stale channel; past that it's
* cheaper for us to make them reconnect (which connectd rate-limits). */
#define MAX_UNKNOWN_CHANNEL_REESTABLISHES 10

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 10?

@daywalker90

daywalker90 commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator
____________________________ test_disconnect_opener ____________________________
[gw4] linux -- Python 3.10.20 /home/runner/work/lightning/lightning/.venv/bin/python
node_factory = <pyln.testing.utils.NodeFactory object at 0x7f4d3abdca90>
@pytest.mark.openchannel('v1')
@pytest.mark.openchannel('v2')
# FIXME: https://github.com/ElementsProject/lightning/issues/8822
@pytest.mark.flaky(reruns=1)
def test_disconnect_opener(node_factory):
# Now error on opener side during channel open.
disconnects = ['-WIRE_OPEN_CHANNEL',
'+WIRE_OPEN_CHANNEL',
'-WIRE_FUNDING_CREATED']
if EXPERIMENTAL_DUAL_FUND:
disconnects = ['-WIRE_OPEN_CHANNEL2',
'+WIRE_OPEN_CHANNEL2',
'-WIRE_TX_ADD_INPUT',
'+WIRE_TX_ADD_INPUT',
'-WIRE_TX_ADD_OUTPUT',
'+WIRE_TX_ADD_OUTPUT',
'-WIRE_TX_COMPLETE',
'=WIRE_TX_COMPLETE']
l1 = node_factory.get_node(disconnect=disconnects,
may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l2 = node_factory.get_node(may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l1.fundwallet(2000000)
for d in disconnects:
l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
> with pytest.raises(RpcError):
E Failed: DID NOT RAISE <class 'pyln.client.lightning.RpcError'>
tests/test_connection.py:507: Failed

This is a test related to this PR if i'm not mistaken and it failed in CI: https://github.com/ElementsProject/lightning/actions/runs/32025646089/job/96039521307?pr=9427

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dual-funding can leave peers unable to reconnect

3 participants

@vincenzopalazzo@daywalker90@Andezion
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

lightningd: don't disconnect when sending error for unknown channel_reestablish - #9427

Open
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop
Open

lightningd: don't disconnect when sending error for unknown channel_reestablish#9427
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop

Conversation

@vincenzopalazzo

Copy link
Copy Markdown
Collaborator

Recreated from #9404 (original head fork went private; identical commits, no content changes). Originally opened 2026-08-12.

♻️ Re-creation of #8988, which was auto-closed on 2026-08-11 when my fork was detached from the repository network (GitHub cannot reopen PRs closed by a detachment). Branch content is unchanged (head 592381a58); the previous review discussion remains on #8988.

Note: the outstanding review feedback from @nGoline on #8988 (cite BOLT #1error semantics in the PR) still applies and is being addressed.

Summary

  • When receiving WIRE_CHANNEL_REESTABLISH for an unknown channel, send the error without disconnecting
  • Prevents a race where the disconnect arrives before the error, leaving the peer with a stale saved channel in DUALOPEND_OPEN_COMMIT_READY that retries indefinitely

The bug: during dual-funding, if one side saves the channel (reaches DUALOPEND_OPEN_COMMIT_READY) but the other deletes its unsaved copy on disconnect, reconnects create an infinite loop. The saved side sends CHANNEL_REESTABLISH, the other side sends error + disconnect. The disconnect races with the error delivery -- if the peer's dualopend doesn't receive the error before the socket closes, dualopen_errmsg is called with disconnect=false, which calls channel_fail_transient instead of deleting the channel, and the cycle repeats.

By not disconnecting, the error reliably reaches the peer's dualopend, which processes it via peer_failed_received_errmsg(disconnect=true) and properly deletes the stale channel.

Test plan

  • Verify make check-units passes (done locally)
  • CI integration tests, particularly test_disconnect_opener

Fixes#8822

@vincenzopalazzo

Copy link
Copy Markdown
CollaboratorAuthor

Hi @daywalker90 👋 — this replaces #9404 (auto-closed when my fork went private; identical commits). Fixes the disconnect-on-unknown-channel_reestablish reconnect loop hitting dual-fund peers. Targeting v26.09 — would appreciate a review before the RC cut, happy to address feedback.

vincenzopalazzo added a commit to vincenzopalazzo/lightning that referenced this pull request Aug 17, 2026
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
…eestablish
When a peer sends WIRE_CHANNEL_REESTABLISH for a channel we don't know
about (e.g. dual-funding, where we deleted the unsaved channel on
disconnect but the peer saved it in DUALOPEND_OPEN_COMMIT_READY), we
sent an error and hung up.
Our error does make it onto the wire: disconnect_peer() -> drain_peer()
in connectd/multiplex.c gives peer_outq 5 seconds to flush first. The
race is on the receiving node: its connectd hands the error to dualopend
and tears the subds down on EOF at the same time, and when dualopend
loses that race lightningd only sees "Owning subdaemon dualopend died"
(subd.c passes peer_fd=NULL, disconnect=false), so dualopen_errmsg()
keeps the DUALOPEND_OPEN_COMMIT_READY channel for a later reconnect.
It then reestablishes on every reconnect, and we error and hang up
again.
BOLT ElementsProject#1 only requires that a node sending `error` fails the channel(s)
the error refers to; it never says to drop the connection, and here we
don't know the channel, so there is nothing for us to fail. So send the
error and stay connected: the peer's dualopend then reliably reads it
and forgets the channel.
Since we no longer hang up, bound how many unknown-channel
reestablishes we answer on a single connection, so a peer can't use
this to make us log and write errors indefinitely.
Changelog-Fixed: dual-funding reconnect loop when peer doesn't know about a saved channel
Fixes: ElementsProject#8822
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Sets up ElementsProject#8822: l1 drops the last tx_complete after dualopend has decided
the commitment is ready, so l1 saves a DUALOPEND_OPEN_COMMIT_READY
channel that l2 never saved. On reconnect l1 reestablishes a channel l2
doesn't know, and l2 has to answer with an error and stay connected.
Note this pins the new behaviour rather than the loop itself: the loop
is a race on l1's side (see the previous commit), and locally l1 wins it
and forgets the channel even without the fix, so a strict xfail
reproduction would just be flaky. The test does fail without the fix,
on l2 hanging up.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the fix/dual-funding-reconnect-loop branch from 623c770 to 92767d6CompareAugust 17, 2026 11:35
/* How many channel_reestablish for channels we don't know we answer without
* hanging up. An honest peer needs one per stale channel; past that it's
* cheaper for us to make them reconnect (which connectd rate-limits). */
#define MAX_UNKNOWN_CHANNEL_REESTABLISHES 10

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 10?

@daywalker90

daywalker90 commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator
____________________________ test_disconnect_opener ____________________________
[gw4] linux -- Python 3.10.20 /home/runner/work/lightning/lightning/.venv/bin/python
node_factory = <pyln.testing.utils.NodeFactory object at 0x7f4d3abdca90>
@pytest.mark.openchannel('v1')
@pytest.mark.openchannel('v2')
# FIXME: https://github.com/ElementsProject/lightning/issues/8822
@pytest.mark.flaky(reruns=1)
def test_disconnect_opener(node_factory):
# Now error on opener side during channel open.
disconnects = ['-WIRE_OPEN_CHANNEL',
'+WIRE_OPEN_CHANNEL',
'-WIRE_FUNDING_CREATED']
if EXPERIMENTAL_DUAL_FUND:
disconnects = ['-WIRE_OPEN_CHANNEL2',
'+WIRE_OPEN_CHANNEL2',
'-WIRE_TX_ADD_INPUT',
'+WIRE_TX_ADD_INPUT',
'-WIRE_TX_ADD_OUTPUT',
'+WIRE_TX_ADD_OUTPUT',
'-WIRE_TX_COMPLETE',
'=WIRE_TX_COMPLETE']
l1 = node_factory.get_node(disconnect=disconnects,
may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l2 = node_factory.get_node(may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l1.fundwallet(2000000)
for d in disconnects:
l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
> with pytest.raises(RpcError):
E Failed: DID NOT RAISE <class 'pyln.client.lightning.RpcError'>
tests/test_connection.py:507: Failed

This is a test related to this PR if i'm not mistaken and it failed in CI: https://github.com/ElementsProject/lightning/actions/runs/32025646089/job/96039521307?pr=9427

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dual-funding can leave peers unable to reconnect

3 participants

@vincenzopalazzo@daywalker90@Andezion
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

lightningd: don't disconnect when sending error for unknown channel_reestablish - #9427

Open
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop
Open

lightningd: don't disconnect when sending error for unknown channel_reestablish#9427
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop

Conversation

@vincenzopalazzo

Copy link
Copy Markdown
Collaborator

Recreated from #9404 (original head fork went private; identical commits, no content changes). Originally opened 2026-08-12.

♻️ Re-creation of #8988, which was auto-closed on 2026-08-11 when my fork was detached from the repository network (GitHub cannot reopen PRs closed by a detachment). Branch content is unchanged (head 592381a58); the previous review discussion remains on #8988.

Note: the outstanding review feedback from @nGoline on #8988 (cite BOLT #1error semantics in the PR) still applies and is being addressed.

Summary

  • When receiving WIRE_CHANNEL_REESTABLISH for an unknown channel, send the error without disconnecting
  • Prevents a race where the disconnect arrives before the error, leaving the peer with a stale saved channel in DUALOPEND_OPEN_COMMIT_READY that retries indefinitely

The bug: during dual-funding, if one side saves the channel (reaches DUALOPEND_OPEN_COMMIT_READY) but the other deletes its unsaved copy on disconnect, reconnects create an infinite loop. The saved side sends CHANNEL_REESTABLISH, the other side sends error + disconnect. The disconnect races with the error delivery -- if the peer's dualopend doesn't receive the error before the socket closes, dualopen_errmsg is called with disconnect=false, which calls channel_fail_transient instead of deleting the channel, and the cycle repeats.

By not disconnecting, the error reliably reaches the peer's dualopend, which processes it via peer_failed_received_errmsg(disconnect=true) and properly deletes the stale channel.

Test plan

  • Verify make check-units passes (done locally)
  • CI integration tests, particularly test_disconnect_opener

Fixes#8822

@vincenzopalazzo

Copy link
Copy Markdown
CollaboratorAuthor

Hi @daywalker90 👋 — this replaces #9404 (auto-closed when my fork went private; identical commits). Fixes the disconnect-on-unknown-channel_reestablish reconnect loop hitting dual-fund peers. Targeting v26.09 — would appreciate a review before the RC cut, happy to address feedback.

vincenzopalazzo added a commit to vincenzopalazzo/lightning that referenced this pull request Aug 17, 2026
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
…eestablish
When a peer sends WIRE_CHANNEL_REESTABLISH for a channel we don't know
about (e.g. dual-funding, where we deleted the unsaved channel on
disconnect but the peer saved it in DUALOPEND_OPEN_COMMIT_READY), we
sent an error and hung up.
Our error does make it onto the wire: disconnect_peer() -> drain_peer()
in connectd/multiplex.c gives peer_outq 5 seconds to flush first. The
race is on the receiving node: its connectd hands the error to dualopend
and tears the subds down on EOF at the same time, and when dualopend
loses that race lightningd only sees "Owning subdaemon dualopend died"
(subd.c passes peer_fd=NULL, disconnect=false), so dualopen_errmsg()
keeps the DUALOPEND_OPEN_COMMIT_READY channel for a later reconnect.
It then reestablishes on every reconnect, and we error and hang up
again.
BOLT ElementsProject#1 only requires that a node sending `error` fails the channel(s)
the error refers to; it never says to drop the connection, and here we
don't know the channel, so there is nothing for us to fail. So send the
error and stay connected: the peer's dualopend then reliably reads it
and forgets the channel.
Since we no longer hang up, bound how many unknown-channel
reestablishes we answer on a single connection, so a peer can't use
this to make us log and write errors indefinitely.
Changelog-Fixed: dual-funding reconnect loop when peer doesn't know about a saved channel
Fixes: ElementsProject#8822
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Sets up ElementsProject#8822: l1 drops the last tx_complete after dualopend has decided
the commitment is ready, so l1 saves a DUALOPEND_OPEN_COMMIT_READY
channel that l2 never saved. On reconnect l1 reestablishes a channel l2
doesn't know, and l2 has to answer with an error and stay connected.
Note this pins the new behaviour rather than the loop itself: the loop
is a race on l1's side (see the previous commit), and locally l1 wins it
and forgets the channel even without the fix, so a strict xfail
reproduction would just be flaky. The test does fail without the fix,
on l2 hanging up.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the fix/dual-funding-reconnect-loop branch from 623c770 to 92767d6CompareAugust 17, 2026 11:35
/* How many channel_reestablish for channels we don't know we answer without
* hanging up. An honest peer needs one per stale channel; past that it's
* cheaper for us to make them reconnect (which connectd rate-limits). */
#define MAX_UNKNOWN_CHANNEL_REESTABLISHES 10

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 10?

@daywalker90

daywalker90 commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator
____________________________ test_disconnect_opener ____________________________
[gw4] linux -- Python 3.10.20 /home/runner/work/lightning/lightning/.venv/bin/python
node_factory = <pyln.testing.utils.NodeFactory object at 0x7f4d3abdca90>
@pytest.mark.openchannel('v1')
@pytest.mark.openchannel('v2')
# FIXME: https://github.com/ElementsProject/lightning/issues/8822
@pytest.mark.flaky(reruns=1)
def test_disconnect_opener(node_factory):
# Now error on opener side during channel open.
disconnects = ['-WIRE_OPEN_CHANNEL',
'+WIRE_OPEN_CHANNEL',
'-WIRE_FUNDING_CREATED']
if EXPERIMENTAL_DUAL_FUND:
disconnects = ['-WIRE_OPEN_CHANNEL2',
'+WIRE_OPEN_CHANNEL2',
'-WIRE_TX_ADD_INPUT',
'+WIRE_TX_ADD_INPUT',
'-WIRE_TX_ADD_OUTPUT',
'+WIRE_TX_ADD_OUTPUT',
'-WIRE_TX_COMPLETE',
'=WIRE_TX_COMPLETE']
l1 = node_factory.get_node(disconnect=disconnects,
may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l2 = node_factory.get_node(may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l1.fundwallet(2000000)
for d in disconnects:
l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
> with pytest.raises(RpcError):
E Failed: DID NOT RAISE <class 'pyln.client.lightning.RpcError'>
tests/test_connection.py:507: Failed

This is a test related to this PR if i'm not mistaken and it failed in CI: https://github.com/ElementsProject/lightning/actions/runs/32025646089/job/96039521307?pr=9427

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dual-funding can leave peers unable to reconnect

3 participants

@vincenzopalazzo@daywalker90@Andezion
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

lightningd: don't disconnect when sending error for unknown channel_reestablish - #9427

Open
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop
Open

lightningd: don't disconnect when sending error for unknown channel_reestablish#9427
vincenzopalazzo wants to merge 3 commits into
ElementsProject:masterfrom
vincenzopalazzo:fix/dual-funding-reconnect-loop

Conversation

@vincenzopalazzo

Copy link
Copy Markdown
Collaborator

Recreated from #9404 (original head fork went private; identical commits, no content changes). Originally opened 2026-08-12.

♻️ Re-creation of #8988, which was auto-closed on 2026-08-11 when my fork was detached from the repository network (GitHub cannot reopen PRs closed by a detachment). Branch content is unchanged (head 592381a58); the previous review discussion remains on #8988.

Note: the outstanding review feedback from @nGoline on #8988 (cite BOLT #1error semantics in the PR) still applies and is being addressed.

Summary

  • When receiving WIRE_CHANNEL_REESTABLISH for an unknown channel, send the error without disconnecting
  • Prevents a race where the disconnect arrives before the error, leaving the peer with a stale saved channel in DUALOPEND_OPEN_COMMIT_READY that retries indefinitely

The bug: during dual-funding, if one side saves the channel (reaches DUALOPEND_OPEN_COMMIT_READY) but the other deletes its unsaved copy on disconnect, reconnects create an infinite loop. The saved side sends CHANNEL_REESTABLISH, the other side sends error + disconnect. The disconnect races with the error delivery -- if the peer's dualopend doesn't receive the error before the socket closes, dualopen_errmsg is called with disconnect=false, which calls channel_fail_transient instead of deleting the channel, and the cycle repeats.

By not disconnecting, the error reliably reaches the peer's dualopend, which processes it via peer_failed_received_errmsg(disconnect=true) and properly deletes the stale channel.

Test plan

  • Verify make check-units passes (done locally)
  • CI integration tests, particularly test_disconnect_opener

Fixes#8822

@vincenzopalazzo

Copy link
Copy Markdown
CollaboratorAuthor

Hi @daywalker90 👋 — this replaces #9404 (auto-closed when my fork went private; identical commits). Fixes the disconnect-on-unknown-channel_reestablish reconnect loop hitting dual-fund peers. Targeting v26.09 — would appreciate a review before the RC cut, happy to address feedback.

vincenzopalazzo added a commit to vincenzopalazzo/lightning that referenced this pull request Aug 17, 2026
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
…eestablish
When a peer sends WIRE_CHANNEL_REESTABLISH for a channel we don't know
about (e.g. dual-funding, where we deleted the unsaved channel on
disconnect but the peer saved it in DUALOPEND_OPEN_COMMIT_READY), we
sent an error and hung up.
Our error does make it onto the wire: disconnect_peer() -> drain_peer()
in connectd/multiplex.c gives peer_outq 5 seconds to flush first. The
race is on the receiving node: its connectd hands the error to dualopend
and tears the subds down on EOF at the same time, and when dualopend
loses that race lightningd only sees "Owning subdaemon dualopend died"
(subd.c passes peer_fd=NULL, disconnect=false), so dualopen_errmsg()
keeps the DUALOPEND_OPEN_COMMIT_READY channel for a later reconnect.
It then reestablishes on every reconnect, and we error and hang up
again.
BOLT ElementsProject#1 only requires that a node sending `error` fails the channel(s)
the error refers to; it never says to drop the connection, and here we
don't know the channel, so there is nothing for us to fail. So send the
error and stay connected: the peer's dualopend then reliably reads it
and forgets the channel.
Since we no longer hang up, bound how many unknown-channel
reestablishes we answer on a single connection, so a peer can't use
this to make us log and write errors indefinitely.
Changelog-Fixed: dual-funding reconnect loop when peer doesn't know about a saved channel
Fixes: ElementsProject#8822
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Sets up ElementsProject#8822: l1 drops the last tx_complete after dualopend has decided
the commitment is ready, so l1 saves a DUALOPEND_OPEN_COMMIT_READY
channel that l2 never saved. On reconnect l1 reestablishes a channel l2
doesn't know, and l2 has to answer with an error and stay connected.
Note this pins the new behaviour rather than the loop itself: the loop
is a race on l1's side (see the previous commit), and locally l1 wins it
and forgets the channel even without the fix, so a strict xfail
reproduction would just be flaky. The test does fail without the fix,
on l2 hanging up.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the fix/dual-funding-reconnect-loop branch from 623c770 to 92767d6CompareAugust 17, 2026 11:35
/* How many channel_reestablish for channels we don't know we answer without
* hanging up. An honest peer needs one per stale channel; past that it's
* cheaper for us to make them reconnect (which connectd rate-limits). */
#define MAX_UNKNOWN_CHANNEL_REESTABLISHES 10

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 10?

@daywalker90

daywalker90 commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator
____________________________ test_disconnect_opener ____________________________
[gw4] linux -- Python 3.10.20 /home/runner/work/lightning/lightning/.venv/bin/python
node_factory = <pyln.testing.utils.NodeFactory object at 0x7f4d3abdca90>
@pytest.mark.openchannel('v1')
@pytest.mark.openchannel('v2')
# FIXME: https://github.com/ElementsProject/lightning/issues/8822
@pytest.mark.flaky(reruns=1)
def test_disconnect_opener(node_factory):
# Now error on opener side during channel open.
disconnects = ['-WIRE_OPEN_CHANNEL',
'+WIRE_OPEN_CHANNEL',
'-WIRE_FUNDING_CREATED']
if EXPERIMENTAL_DUAL_FUND:
disconnects = ['-WIRE_OPEN_CHANNEL2',
'+WIRE_OPEN_CHANNEL2',
'-WIRE_TX_ADD_INPUT',
'+WIRE_TX_ADD_INPUT',
'-WIRE_TX_ADD_OUTPUT',
'+WIRE_TX_ADD_OUTPUT',
'-WIRE_TX_COMPLETE',
'=WIRE_TX_COMPLETE']
l1 = node_factory.get_node(disconnect=disconnects,
may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l2 = node_factory.get_node(may_reconnect=EXPERIMENTAL_DUAL_FUND,
options={'dev-no-reconnect': None})
l1.fundwallet(2000000)
for d in disconnects:
l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
> with pytest.raises(RpcError):
E Failed: DID NOT RAISE <class 'pyln.client.lightning.RpcError'>
tests/test_connection.py:507: Failed

This is a test related to this PR if i'm not mistaken and it failed in CI: https://github.com/ElementsProject/lightning/actions/runs/32025646089/job/96039521307?pr=9427

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dual-funding can leave peers unable to reconnect

3 participants

@vincenzopalazzo@daywalker90@Andezion