Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution - #2082

Merged
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime
Mar 29, 2023
Merged

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution #2082
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime

Conversation

@wpaulino

@wpaulinowpaulino commented Mar 7, 2023

Copy link
Copy Markdown
Contributor

While users could easily figure it out based on the set of HTLC descriptors included within, we already track it within the OnchainTxHandler, so we might as well expose it to users as a nice-to-have. It's also yet another thing they must get right to ensure their HTLC transaction broadcasts are valid.

@codecov-commenter

codecov-commenter commented Mar 22, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 86.66% and project coverage change: -0.01⚠️

Comparison is base (31e78ff) 91.40% compared to head (99fff74) 91.39%.

❗ Current head 99fff74 differs from pull request most recent head 23e233b. Consider uploading reports for the commit 23e233b to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2082 +/- ##
==========================================
- Coverage 91.40% 91.39% -0.01% 
==========================================
Files 102 101 -1 Lines 49563 49564 +1 Branches 49563 49564 +1 ==========================================
- Hits 45303 45299 -4 - Misses 4260 4265 +5 
Impacted FilesCoverage Δ
lightning/src/util/events.rs35.27% <0.00%> (ø)
lightning/src/chain/package.rs92.81% <88.88%> (-0.10%)⬇️
lightning/src/chain/channelmonitor.rs94.46% <100.00%> (-0.06%)⬇️
lightning/src/chain/onchaintx.rs92.46% <100.00%> (-1.42%)⬇️
lightning/src/ln/monitor_tests.rs97.85% <100.00%> (-0.35%)⬇️

... and 11 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Comment threadlightning/src/chain/package.rs Outdated
Comment threadlightning/src/chain/package.rs Outdated
@wpaulino
wpaulinoforce-pushed the bump-htlc-resolution-tx-locktime branch from 22c31c0 to 095bf6cCompareMarch 23, 2023 17:24
arik-so
arik-so previously approved these changes Mar 24, 2023
arik-so
arik-so previously approved these changes Mar 27, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Wait, aren't the anchor outputs 1-CSV? Doesn't that mean the locktime is implicitly the max(cltv, output_height + 1)?

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

The 1 CSV doesn't affect the transaction locktime though, only the height at which a spend is valid, but that's not an issue here since with anchors we only offer the HTLCs to claim once a confirmed commitment is presented. We can use a later locktime on HTLC transactions from a counterparty's commitment, which we can spend with only our signature. For our commitments, we need to maintain the same locktime the counterparty signed on.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Right, this is changing the semantics of this function pretty substantially, and now really confusing - whereas it used to always be "the soonest time this can be confirmed" (which was correct because IIRC we had some code that looked at it in that light), its now that for all the transaction types exceptHolderHTLCOutput, which can be 0 or something else. That's pretty confusing, and IMO we should have consistent semantics across the function, or use something else for this particular use-case.

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

It seems like we can just reword the comment in absolute_tx_timelock then? The way it was previously intended to be used is no longer needed (this seems to have happened prior to me working on the codebase so I'm missing context). Its only use outside of anchors is to determine whether we should delay a new request for a future block, and using the to-be-crafted transaction's locktime there still seems correct – we should delay it until we're ready to broadcast it a block before its timelock. For the remaining output types, output_conf_height + 1 is a good default to discourage fee sniping, though we could do even better by using the current height instead.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Previously, this would return the earliest height the output could be
confirmed, which seems to no longer be useful. The only use of the
method was to determine whether we should delay a package to a future
block. Instead, we choose to return the absolute locktime the
transaction spending the output should have, which better corresponds to
the method name and still supports the delay functionality mentioned.
Doing so also allows us to expose the locktime required for HTLC
transactions we need to broadcast based on our own commitments for
anchor channels.
This only applies to all malleable packages on channels pre-dating
anchors and malleables packages for counterparty commitments
post-anchors. Malleables packages for holder commitments post-anchors
should have their transaction locktime applied manually by the consumer
of `BumpTransactionEvent::HTLCResolution` events.
While users could easily figure it out based on the set of HTLC
descriptors included within, we already track it within the
`OnchainTxHandler`, so we might as well expose it to users as a
nice-to-have. It's also yet another thing they must get right to ensure
their HTLC transaction broadcasts are valid.
@wpaulino

Copy link
Copy Markdown
ContributorAuthor

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Done, also had to rebase to address a conflict.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Thanks, nice to have anti-fee-sniping.

@arik-so
arik-so merged commit 9fd6127 into lightningdevkit:mainMar 29, 2023
@wpaulino
wpaulino deleted the bump-htlc-resolution-tx-locktime branch March 29, 2023 00:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@codecov-commenter@TheBlueMatt@arik-so
, '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

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution - #2082

Merged
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime
Mar 29, 2023
Merged

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution #2082
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime

Conversation

@wpaulino

@wpaulinowpaulino commented Mar 7, 2023

Copy link
Copy Markdown
Contributor

While users could easily figure it out based on the set of HTLC descriptors included within, we already track it within the OnchainTxHandler, so we might as well expose it to users as a nice-to-have. It's also yet another thing they must get right to ensure their HTLC transaction broadcasts are valid.

@codecov-commenter

codecov-commenter commented Mar 22, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 86.66% and project coverage change: -0.01⚠️

Comparison is base (31e78ff) 91.40% compared to head (99fff74) 91.39%.

❗ Current head 99fff74 differs from pull request most recent head 23e233b. Consider uploading reports for the commit 23e233b to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2082 +/- ##
==========================================
- Coverage 91.40% 91.39% -0.01% 
==========================================
Files 102 101 -1 Lines 49563 49564 +1 Branches 49563 49564 +1 ==========================================
- Hits 45303 45299 -4 - Misses 4260 4265 +5 
Impacted FilesCoverage Δ
lightning/src/util/events.rs35.27% <0.00%> (ø)
lightning/src/chain/package.rs92.81% <88.88%> (-0.10%)⬇️
lightning/src/chain/channelmonitor.rs94.46% <100.00%> (-0.06%)⬇️
lightning/src/chain/onchaintx.rs92.46% <100.00%> (-1.42%)⬇️
lightning/src/ln/monitor_tests.rs97.85% <100.00%> (-0.35%)⬇️

... and 11 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Comment threadlightning/src/chain/package.rs Outdated
Comment threadlightning/src/chain/package.rs Outdated
@wpaulino
wpaulinoforce-pushed the bump-htlc-resolution-tx-locktime branch from 22c31c0 to 095bf6cCompareMarch 23, 2023 17:24
arik-so
arik-so previously approved these changes Mar 24, 2023
arik-so
arik-so previously approved these changes Mar 27, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Wait, aren't the anchor outputs 1-CSV? Doesn't that mean the locktime is implicitly the max(cltv, output_height + 1)?

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

The 1 CSV doesn't affect the transaction locktime though, only the height at which a spend is valid, but that's not an issue here since with anchors we only offer the HTLCs to claim once a confirmed commitment is presented. We can use a later locktime on HTLC transactions from a counterparty's commitment, which we can spend with only our signature. For our commitments, we need to maintain the same locktime the counterparty signed on.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Right, this is changing the semantics of this function pretty substantially, and now really confusing - whereas it used to always be "the soonest time this can be confirmed" (which was correct because IIRC we had some code that looked at it in that light), its now that for all the transaction types exceptHolderHTLCOutput, which can be 0 or something else. That's pretty confusing, and IMO we should have consistent semantics across the function, or use something else for this particular use-case.

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

It seems like we can just reword the comment in absolute_tx_timelock then? The way it was previously intended to be used is no longer needed (this seems to have happened prior to me working on the codebase so I'm missing context). Its only use outside of anchors is to determine whether we should delay a new request for a future block, and using the to-be-crafted transaction's locktime there still seems correct – we should delay it until we're ready to broadcast it a block before its timelock. For the remaining output types, output_conf_height + 1 is a good default to discourage fee sniping, though we could do even better by using the current height instead.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Previously, this would return the earliest height the output could be
confirmed, which seems to no longer be useful. The only use of the
method was to determine whether we should delay a package to a future
block. Instead, we choose to return the absolute locktime the
transaction spending the output should have, which better corresponds to
the method name and still supports the delay functionality mentioned.
Doing so also allows us to expose the locktime required for HTLC
transactions we need to broadcast based on our own commitments for
anchor channels.
This only applies to all malleable packages on channels pre-dating
anchors and malleables packages for counterparty commitments
post-anchors. Malleables packages for holder commitments post-anchors
should have their transaction locktime applied manually by the consumer
of `BumpTransactionEvent::HTLCResolution` events.
While users could easily figure it out based on the set of HTLC
descriptors included within, we already track it within the
`OnchainTxHandler`, so we might as well expose it to users as a
nice-to-have. It's also yet another thing they must get right to ensure
their HTLC transaction broadcasts are valid.
@wpaulino

Copy link
Copy Markdown
ContributorAuthor

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Done, also had to rebase to address a conflict.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Thanks, nice to have anti-fee-sniping.

@arik-so
arik-so merged commit 9fd6127 into lightningdevkit:mainMar 29, 2023
@wpaulino
wpaulino deleted the bump-htlc-resolution-tx-locktime branch March 29, 2023 00:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@codecov-commenter@TheBlueMatt@arik-so
, '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

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution - #2082

Merged
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime
Mar 29, 2023
Merged

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution #2082
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime

Conversation

@wpaulino

@wpaulinowpaulino commented Mar 7, 2023

Copy link
Copy Markdown
Contributor

While users could easily figure it out based on the set of HTLC descriptors included within, we already track it within the OnchainTxHandler, so we might as well expose it to users as a nice-to-have. It's also yet another thing they must get right to ensure their HTLC transaction broadcasts are valid.

@codecov-commenter

codecov-commenter commented Mar 22, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 86.66% and project coverage change: -0.01⚠️

Comparison is base (31e78ff) 91.40% compared to head (99fff74) 91.39%.

❗ Current head 99fff74 differs from pull request most recent head 23e233b. Consider uploading reports for the commit 23e233b to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2082 +/- ##
==========================================
- Coverage 91.40% 91.39% -0.01% 
==========================================
Files 102 101 -1 Lines 49563 49564 +1 Branches 49563 49564 +1 ==========================================
- Hits 45303 45299 -4 - Misses 4260 4265 +5 
Impacted FilesCoverage Δ
lightning/src/util/events.rs35.27% <0.00%> (ø)
lightning/src/chain/package.rs92.81% <88.88%> (-0.10%)⬇️
lightning/src/chain/channelmonitor.rs94.46% <100.00%> (-0.06%)⬇️
lightning/src/chain/onchaintx.rs92.46% <100.00%> (-1.42%)⬇️
lightning/src/ln/monitor_tests.rs97.85% <100.00%> (-0.35%)⬇️

... and 11 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Comment threadlightning/src/chain/package.rs Outdated
Comment threadlightning/src/chain/package.rs Outdated
@wpaulino
wpaulinoforce-pushed the bump-htlc-resolution-tx-locktime branch from 22c31c0 to 095bf6cCompareMarch 23, 2023 17:24
arik-so
arik-so previously approved these changes Mar 24, 2023
arik-so
arik-so previously approved these changes Mar 27, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Wait, aren't the anchor outputs 1-CSV? Doesn't that mean the locktime is implicitly the max(cltv, output_height + 1)?

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

The 1 CSV doesn't affect the transaction locktime though, only the height at which a spend is valid, but that's not an issue here since with anchors we only offer the HTLCs to claim once a confirmed commitment is presented. We can use a later locktime on HTLC transactions from a counterparty's commitment, which we can spend with only our signature. For our commitments, we need to maintain the same locktime the counterparty signed on.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Right, this is changing the semantics of this function pretty substantially, and now really confusing - whereas it used to always be "the soonest time this can be confirmed" (which was correct because IIRC we had some code that looked at it in that light), its now that for all the transaction types exceptHolderHTLCOutput, which can be 0 or something else. That's pretty confusing, and IMO we should have consistent semantics across the function, or use something else for this particular use-case.

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

It seems like we can just reword the comment in absolute_tx_timelock then? The way it was previously intended to be used is no longer needed (this seems to have happened prior to me working on the codebase so I'm missing context). Its only use outside of anchors is to determine whether we should delay a new request for a future block, and using the to-be-crafted transaction's locktime there still seems correct – we should delay it until we're ready to broadcast it a block before its timelock. For the remaining output types, output_conf_height + 1 is a good default to discourage fee sniping, though we could do even better by using the current height instead.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Previously, this would return the earliest height the output could be
confirmed, which seems to no longer be useful. The only use of the
method was to determine whether we should delay a package to a future
block. Instead, we choose to return the absolute locktime the
transaction spending the output should have, which better corresponds to
the method name and still supports the delay functionality mentioned.
Doing so also allows us to expose the locktime required for HTLC
transactions we need to broadcast based on our own commitments for
anchor channels.
This only applies to all malleable packages on channels pre-dating
anchors and malleables packages for counterparty commitments
post-anchors. Malleables packages for holder commitments post-anchors
should have their transaction locktime applied manually by the consumer
of `BumpTransactionEvent::HTLCResolution` events.
While users could easily figure it out based on the set of HTLC
descriptors included within, we already track it within the
`OnchainTxHandler`, so we might as well expose it to users as a
nice-to-have. It's also yet another thing they must get right to ensure
their HTLC transaction broadcasts are valid.
@wpaulino

Copy link
Copy Markdown
ContributorAuthor

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Done, also had to rebase to address a conflict.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Thanks, nice to have anti-fee-sniping.

@arik-so
arik-so merged commit 9fd6127 into lightningdevkit:mainMar 29, 2023
@wpaulino
wpaulino deleted the bump-htlc-resolution-tx-locktime branch March 29, 2023 00:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@codecov-commenter@TheBlueMatt@arik-so
, '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

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution - #2082

Merged
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime
Mar 29, 2023
Merged

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution #2082
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime

Conversation

@wpaulino

@wpaulinowpaulino commented Mar 7, 2023

Copy link
Copy Markdown
Contributor

While users could easily figure it out based on the set of HTLC descriptors included within, we already track it within the OnchainTxHandler, so we might as well expose it to users as a nice-to-have. It's also yet another thing they must get right to ensure their HTLC transaction broadcasts are valid.

@codecov-commenter

codecov-commenter commented Mar 22, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 86.66% and project coverage change: -0.01⚠️

Comparison is base (31e78ff) 91.40% compared to head (99fff74) 91.39%.

❗ Current head 99fff74 differs from pull request most recent head 23e233b. Consider uploading reports for the commit 23e233b to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2082 +/- ##
==========================================
- Coverage 91.40% 91.39% -0.01% 
==========================================
Files 102 101 -1 Lines 49563 49564 +1 Branches 49563 49564 +1 ==========================================
- Hits 45303 45299 -4 - Misses 4260 4265 +5 
Impacted FilesCoverage Δ
lightning/src/util/events.rs35.27% <0.00%> (ø)
lightning/src/chain/package.rs92.81% <88.88%> (-0.10%)⬇️
lightning/src/chain/channelmonitor.rs94.46% <100.00%> (-0.06%)⬇️
lightning/src/chain/onchaintx.rs92.46% <100.00%> (-1.42%)⬇️
lightning/src/ln/monitor_tests.rs97.85% <100.00%> (-0.35%)⬇️

... and 11 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Comment threadlightning/src/chain/package.rs Outdated
Comment threadlightning/src/chain/package.rs Outdated
@wpaulino
wpaulinoforce-pushed the bump-htlc-resolution-tx-locktime branch from 22c31c0 to 095bf6cCompareMarch 23, 2023 17:24
arik-so
arik-so previously approved these changes Mar 24, 2023
arik-so
arik-so previously approved these changes Mar 27, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Wait, aren't the anchor outputs 1-CSV? Doesn't that mean the locktime is implicitly the max(cltv, output_height + 1)?

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

The 1 CSV doesn't affect the transaction locktime though, only the height at which a spend is valid, but that's not an issue here since with anchors we only offer the HTLCs to claim once a confirmed commitment is presented. We can use a later locktime on HTLC transactions from a counterparty's commitment, which we can spend with only our signature. For our commitments, we need to maintain the same locktime the counterparty signed on.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Right, this is changing the semantics of this function pretty substantially, and now really confusing - whereas it used to always be "the soonest time this can be confirmed" (which was correct because IIRC we had some code that looked at it in that light), its now that for all the transaction types exceptHolderHTLCOutput, which can be 0 or something else. That's pretty confusing, and IMO we should have consistent semantics across the function, or use something else for this particular use-case.

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

It seems like we can just reword the comment in absolute_tx_timelock then? The way it was previously intended to be used is no longer needed (this seems to have happened prior to me working on the codebase so I'm missing context). Its only use outside of anchors is to determine whether we should delay a new request for a future block, and using the to-be-crafted transaction's locktime there still seems correct – we should delay it until we're ready to broadcast it a block before its timelock. For the remaining output types, output_conf_height + 1 is a good default to discourage fee sniping, though we could do even better by using the current height instead.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Previously, this would return the earliest height the output could be
confirmed, which seems to no longer be useful. The only use of the
method was to determine whether we should delay a package to a future
block. Instead, we choose to return the absolute locktime the
transaction spending the output should have, which better corresponds to
the method name and still supports the delay functionality mentioned.
Doing so also allows us to expose the locktime required for HTLC
transactions we need to broadcast based on our own commitments for
anchor channels.
This only applies to all malleable packages on channels pre-dating
anchors and malleables packages for counterparty commitments
post-anchors. Malleables packages for holder commitments post-anchors
should have their transaction locktime applied manually by the consumer
of `BumpTransactionEvent::HTLCResolution` events.
While users could easily figure it out based on the set of HTLC
descriptors included within, we already track it within the
`OnchainTxHandler`, so we might as well expose it to users as a
nice-to-have. It's also yet another thing they must get right to ensure
their HTLC transaction broadcasts are valid.
@wpaulino

Copy link
Copy Markdown
ContributorAuthor

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Done, also had to rebase to address a conflict.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Thanks, nice to have anti-fee-sniping.

@arik-so
arik-so merged commit 9fd6127 into lightningdevkit:mainMar 29, 2023
@wpaulino
wpaulino deleted the bump-htlc-resolution-tx-locktime branch March 29, 2023 00:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@codecov-commenter@TheBlueMatt@arik-so
, '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

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution - #2082

Merged
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime
Mar 29, 2023
Merged

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution #2082
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime

Conversation

@wpaulino

@wpaulinowpaulino commented Mar 7, 2023

Copy link
Copy Markdown
Contributor

While users could easily figure it out based on the set of HTLC descriptors included within, we already track it within the OnchainTxHandler, so we might as well expose it to users as a nice-to-have. It's also yet another thing they must get right to ensure their HTLC transaction broadcasts are valid.

@codecov-commenter

codecov-commenter commented Mar 22, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 86.66% and project coverage change: -0.01⚠️

Comparison is base (31e78ff) 91.40% compared to head (99fff74) 91.39%.

❗ Current head 99fff74 differs from pull request most recent head 23e233b. Consider uploading reports for the commit 23e233b to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2082 +/- ##
==========================================
- Coverage 91.40% 91.39% -0.01% 
==========================================
Files 102 101 -1 Lines 49563 49564 +1 Branches 49563 49564 +1 ==========================================
- Hits 45303 45299 -4 - Misses 4260 4265 +5 
Impacted FilesCoverage Δ
lightning/src/util/events.rs35.27% <0.00%> (ø)
lightning/src/chain/package.rs92.81% <88.88%> (-0.10%)⬇️
lightning/src/chain/channelmonitor.rs94.46% <100.00%> (-0.06%)⬇️
lightning/src/chain/onchaintx.rs92.46% <100.00%> (-1.42%)⬇️
lightning/src/ln/monitor_tests.rs97.85% <100.00%> (-0.35%)⬇️

... and 11 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Comment threadlightning/src/chain/package.rs Outdated
Comment threadlightning/src/chain/package.rs Outdated
@wpaulino
wpaulinoforce-pushed the bump-htlc-resolution-tx-locktime branch from 22c31c0 to 095bf6cCompareMarch 23, 2023 17:24
arik-so
arik-so previously approved these changes Mar 24, 2023
arik-so
arik-so previously approved these changes Mar 27, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Wait, aren't the anchor outputs 1-CSV? Doesn't that mean the locktime is implicitly the max(cltv, output_height + 1)?

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

The 1 CSV doesn't affect the transaction locktime though, only the height at which a spend is valid, but that's not an issue here since with anchors we only offer the HTLCs to claim once a confirmed commitment is presented. We can use a later locktime on HTLC transactions from a counterparty's commitment, which we can spend with only our signature. For our commitments, we need to maintain the same locktime the counterparty signed on.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Right, this is changing the semantics of this function pretty substantially, and now really confusing - whereas it used to always be "the soonest time this can be confirmed" (which was correct because IIRC we had some code that looked at it in that light), its now that for all the transaction types exceptHolderHTLCOutput, which can be 0 or something else. That's pretty confusing, and IMO we should have consistent semantics across the function, or use something else for this particular use-case.

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

It seems like we can just reword the comment in absolute_tx_timelock then? The way it was previously intended to be used is no longer needed (this seems to have happened prior to me working on the codebase so I'm missing context). Its only use outside of anchors is to determine whether we should delay a new request for a future block, and using the to-be-crafted transaction's locktime there still seems correct – we should delay it until we're ready to broadcast it a block before its timelock. For the remaining output types, output_conf_height + 1 is a good default to discourage fee sniping, though we could do even better by using the current height instead.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Previously, this would return the earliest height the output could be
confirmed, which seems to no longer be useful. The only use of the
method was to determine whether we should delay a package to a future
block. Instead, we choose to return the absolute locktime the
transaction spending the output should have, which better corresponds to
the method name and still supports the delay functionality mentioned.
Doing so also allows us to expose the locktime required for HTLC
transactions we need to broadcast based on our own commitments for
anchor channels.
This only applies to all malleable packages on channels pre-dating
anchors and malleables packages for counterparty commitments
post-anchors. Malleables packages for holder commitments post-anchors
should have their transaction locktime applied manually by the consumer
of `BumpTransactionEvent::HTLCResolution` events.
While users could easily figure it out based on the set of HTLC
descriptors included within, we already track it within the
`OnchainTxHandler`, so we might as well expose it to users as a
nice-to-have. It's also yet another thing they must get right to ensure
their HTLC transaction broadcasts are valid.
@wpaulino

Copy link
Copy Markdown
ContributorAuthor

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Done, also had to rebase to address a conflict.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Thanks, nice to have anti-fee-sniping.

@arik-so
arik-so merged commit 9fd6127 into lightningdevkit:mainMar 29, 2023
@wpaulino
wpaulino deleted the bump-htlc-resolution-tx-locktime branch March 29, 2023 00:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@codecov-commenter@TheBlueMatt@arik-so
, '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

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution - #2082

Merged
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime
Mar 29, 2023
Merged

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution #2082
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime

Conversation

@wpaulino

@wpaulinowpaulino commented Mar 7, 2023

Copy link
Copy Markdown
Contributor

While users could easily figure it out based on the set of HTLC descriptors included within, we already track it within the OnchainTxHandler, so we might as well expose it to users as a nice-to-have. It's also yet another thing they must get right to ensure their HTLC transaction broadcasts are valid.

@codecov-commenter

codecov-commenter commented Mar 22, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 86.66% and project coverage change: -0.01⚠️

Comparison is base (31e78ff) 91.40% compared to head (99fff74) 91.39%.

❗ Current head 99fff74 differs from pull request most recent head 23e233b. Consider uploading reports for the commit 23e233b to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2082 +/- ##
==========================================
- Coverage 91.40% 91.39% -0.01% 
==========================================
Files 102 101 -1 Lines 49563 49564 +1 Branches 49563 49564 +1 ==========================================
- Hits 45303 45299 -4 - Misses 4260 4265 +5 
Impacted FilesCoverage Δ
lightning/src/util/events.rs35.27% <0.00%> (ø)
lightning/src/chain/package.rs92.81% <88.88%> (-0.10%)⬇️
lightning/src/chain/channelmonitor.rs94.46% <100.00%> (-0.06%)⬇️
lightning/src/chain/onchaintx.rs92.46% <100.00%> (-1.42%)⬇️
lightning/src/ln/monitor_tests.rs97.85% <100.00%> (-0.35%)⬇️

... and 11 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Comment threadlightning/src/chain/package.rs Outdated
Comment threadlightning/src/chain/package.rs Outdated
@wpaulino
wpaulinoforce-pushed the bump-htlc-resolution-tx-locktime branch from 22c31c0 to 095bf6cCompareMarch 23, 2023 17:24
arik-so
arik-so previously approved these changes Mar 24, 2023
arik-so
arik-so previously approved these changes Mar 27, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Wait, aren't the anchor outputs 1-CSV? Doesn't that mean the locktime is implicitly the max(cltv, output_height + 1)?

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

The 1 CSV doesn't affect the transaction locktime though, only the height at which a spend is valid, but that's not an issue here since with anchors we only offer the HTLCs to claim once a confirmed commitment is presented. We can use a later locktime on HTLC transactions from a counterparty's commitment, which we can spend with only our signature. For our commitments, we need to maintain the same locktime the counterparty signed on.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Right, this is changing the semantics of this function pretty substantially, and now really confusing - whereas it used to always be "the soonest time this can be confirmed" (which was correct because IIRC we had some code that looked at it in that light), its now that for all the transaction types exceptHolderHTLCOutput, which can be 0 or something else. That's pretty confusing, and IMO we should have consistent semantics across the function, or use something else for this particular use-case.

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

It seems like we can just reword the comment in absolute_tx_timelock then? The way it was previously intended to be used is no longer needed (this seems to have happened prior to me working on the codebase so I'm missing context). Its only use outside of anchors is to determine whether we should delay a new request for a future block, and using the to-be-crafted transaction's locktime there still seems correct – we should delay it until we're ready to broadcast it a block before its timelock. For the remaining output types, output_conf_height + 1 is a good default to discourage fee sniping, though we could do even better by using the current height instead.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Previously, this would return the earliest height the output could be
confirmed, which seems to no longer be useful. The only use of the
method was to determine whether we should delay a package to a future
block. Instead, we choose to return the absolute locktime the
transaction spending the output should have, which better corresponds to
the method name and still supports the delay functionality mentioned.
Doing so also allows us to expose the locktime required for HTLC
transactions we need to broadcast based on our own commitments for
anchor channels.
This only applies to all malleable packages on channels pre-dating
anchors and malleables packages for counterparty commitments
post-anchors. Malleables packages for holder commitments post-anchors
should have their transaction locktime applied manually by the consumer
of `BumpTransactionEvent::HTLCResolution` events.
While users could easily figure it out based on the set of HTLC
descriptors included within, we already track it within the
`OnchainTxHandler`, so we might as well expose it to users as a
nice-to-have. It's also yet another thing they must get right to ensure
their HTLC transaction broadcasts are valid.
@wpaulino

Copy link
Copy Markdown
ContributorAuthor

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Done, also had to rebase to address a conflict.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Thanks, nice to have anti-fee-sniping.

@arik-so
arik-so merged commit 9fd6127 into lightningdevkit:mainMar 29, 2023
@wpaulino
wpaulino deleted the bump-htlc-resolution-tx-locktime branch March 29, 2023 00:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@codecov-commenter@TheBlueMatt@arik-so
, '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

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution - #2082

Merged
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime
Mar 29, 2023
Merged

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution #2082
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime

Conversation

@wpaulino

@wpaulinowpaulino commented Mar 7, 2023

Copy link
Copy Markdown
Contributor

While users could easily figure it out based on the set of HTLC descriptors included within, we already track it within the OnchainTxHandler, so we might as well expose it to users as a nice-to-have. It's also yet another thing they must get right to ensure their HTLC transaction broadcasts are valid.

@codecov-commenter

codecov-commenter commented Mar 22, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 86.66% and project coverage change: -0.01⚠️

Comparison is base (31e78ff) 91.40% compared to head (99fff74) 91.39%.

❗ Current head 99fff74 differs from pull request most recent head 23e233b. Consider uploading reports for the commit 23e233b to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2082 +/- ##
==========================================
- Coverage 91.40% 91.39% -0.01% 
==========================================
Files 102 101 -1 Lines 49563 49564 +1 Branches 49563 49564 +1 ==========================================
- Hits 45303 45299 -4 - Misses 4260 4265 +5 
Impacted FilesCoverage Δ
lightning/src/util/events.rs35.27% <0.00%> (ø)
lightning/src/chain/package.rs92.81% <88.88%> (-0.10%)⬇️
lightning/src/chain/channelmonitor.rs94.46% <100.00%> (-0.06%)⬇️
lightning/src/chain/onchaintx.rs92.46% <100.00%> (-1.42%)⬇️
lightning/src/ln/monitor_tests.rs97.85% <100.00%> (-0.35%)⬇️

... and 11 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Comment threadlightning/src/chain/package.rs Outdated
Comment threadlightning/src/chain/package.rs Outdated
@wpaulino
wpaulinoforce-pushed the bump-htlc-resolution-tx-locktime branch from 22c31c0 to 095bf6cCompareMarch 23, 2023 17:24
arik-so
arik-so previously approved these changes Mar 24, 2023
arik-so
arik-so previously approved these changes Mar 27, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Wait, aren't the anchor outputs 1-CSV? Doesn't that mean the locktime is implicitly the max(cltv, output_height + 1)?

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

The 1 CSV doesn't affect the transaction locktime though, only the height at which a spend is valid, but that's not an issue here since with anchors we only offer the HTLCs to claim once a confirmed commitment is presented. We can use a later locktime on HTLC transactions from a counterparty's commitment, which we can spend with only our signature. For our commitments, we need to maintain the same locktime the counterparty signed on.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Right, this is changing the semantics of this function pretty substantially, and now really confusing - whereas it used to always be "the soonest time this can be confirmed" (which was correct because IIRC we had some code that looked at it in that light), its now that for all the transaction types exceptHolderHTLCOutput, which can be 0 or something else. That's pretty confusing, and IMO we should have consistent semantics across the function, or use something else for this particular use-case.

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

It seems like we can just reword the comment in absolute_tx_timelock then? The way it was previously intended to be used is no longer needed (this seems to have happened prior to me working on the codebase so I'm missing context). Its only use outside of anchors is to determine whether we should delay a new request for a future block, and using the to-be-crafted transaction's locktime there still seems correct – we should delay it until we're ready to broadcast it a block before its timelock. For the remaining output types, output_conf_height + 1 is a good default to discourage fee sniping, though we could do even better by using the current height instead.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Previously, this would return the earliest height the output could be
confirmed, which seems to no longer be useful. The only use of the
method was to determine whether we should delay a package to a future
block. Instead, we choose to return the absolute locktime the
transaction spending the output should have, which better corresponds to
the method name and still supports the delay functionality mentioned.
Doing so also allows us to expose the locktime required for HTLC
transactions we need to broadcast based on our own commitments for
anchor channels.
This only applies to all malleable packages on channels pre-dating
anchors and malleables packages for counterparty commitments
post-anchors. Malleables packages for holder commitments post-anchors
should have their transaction locktime applied manually by the consumer
of `BumpTransactionEvent::HTLCResolution` events.
While users could easily figure it out based on the set of HTLC
descriptors included within, we already track it within the
`OnchainTxHandler`, so we might as well expose it to users as a
nice-to-have. It's also yet another thing they must get right to ensure
their HTLC transaction broadcasts are valid.
@wpaulino

Copy link
Copy Markdown
ContributorAuthor

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Done, also had to rebase to address a conflict.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Thanks, nice to have anti-fee-sniping.

@arik-so
arik-so merged commit 9fd6127 into lightningdevkit:mainMar 29, 2023
@wpaulino
wpaulino deleted the bump-htlc-resolution-tx-locktime branch March 29, 2023 00:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@codecov-commenter@TheBlueMatt@arik-so
, '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

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution - #2082

Merged
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime
Mar 29, 2023
Merged

Expose HTLC transaction locktime in BumpTransactionEvent::HTLCResolution #2082
arik-so merged 3 commits into
lightningdevkit:mainfrom
wpaulino:bump-htlc-resolution-tx-locktime

Conversation

@wpaulino

@wpaulinowpaulino commented Mar 7, 2023

Copy link
Copy Markdown
Contributor

While users could easily figure it out based on the set of HTLC descriptors included within, we already track it within the OnchainTxHandler, so we might as well expose it to users as a nice-to-have. It's also yet another thing they must get right to ensure their HTLC transaction broadcasts are valid.

@codecov-commenter

codecov-commenter commented Mar 22, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 86.66% and project coverage change: -0.01⚠️

Comparison is base (31e78ff) 91.40% compared to head (99fff74) 91.39%.

❗ Current head 99fff74 differs from pull request most recent head 23e233b. Consider uploading reports for the commit 23e233b to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2082 +/- ##
==========================================
- Coverage 91.40% 91.39% -0.01% 
==========================================
Files 102 101 -1 Lines 49563 49564 +1 Branches 49563 49564 +1 ==========================================
- Hits 45303 45299 -4 - Misses 4260 4265 +5 
Impacted FilesCoverage Δ
lightning/src/util/events.rs35.27% <0.00%> (ø)
lightning/src/chain/package.rs92.81% <88.88%> (-0.10%)⬇️
lightning/src/chain/channelmonitor.rs94.46% <100.00%> (-0.06%)⬇️
lightning/src/chain/onchaintx.rs92.46% <100.00%> (-1.42%)⬇️
lightning/src/ln/monitor_tests.rs97.85% <100.00%> (-0.35%)⬇️

... and 11 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Comment threadlightning/src/chain/package.rs Outdated
Comment threadlightning/src/chain/package.rs Outdated
@wpaulino
wpaulinoforce-pushed the bump-htlc-resolution-tx-locktime branch from 22c31c0 to 095bf6cCompareMarch 23, 2023 17:24
arik-so
arik-so previously approved these changes Mar 24, 2023
arik-so
arik-so previously approved these changes Mar 27, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Wait, aren't the anchor outputs 1-CSV? Doesn't that mean the locktime is implicitly the max(cltv, output_height + 1)?

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

The 1 CSV doesn't affect the transaction locktime though, only the height at which a spend is valid, but that's not an issue here since with anchors we only offer the HTLCs to claim once a confirmed commitment is presented. We can use a later locktime on HTLC transactions from a counterparty's commitment, which we can spend with only our signature. For our commitments, we need to maintain the same locktime the counterparty signed on.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Right, this is changing the semantics of this function pretty substantially, and now really confusing - whereas it used to always be "the soonest time this can be confirmed" (which was correct because IIRC we had some code that looked at it in that light), its now that for all the transaction types exceptHolderHTLCOutput, which can be 0 or something else. That's pretty confusing, and IMO we should have consistent semantics across the function, or use something else for this particular use-case.

@wpaulino

Copy link
Copy Markdown
ContributorAuthor

It seems like we can just reword the comment in absolute_tx_timelock then? The way it was previously intended to be used is no longer needed (this seems to have happened prior to me working on the codebase so I'm missing context). Its only use outside of anchors is to determine whether we should delay a new request for a future block, and using the to-be-crafted transaction's locktime there still seems correct – we should delay it until we're ready to broadcast it a block before its timelock. For the remaining output types, output_conf_height + 1 is a good default to discourage fee sniping, though we could do even better by using the current height instead.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Previously, this would return the earliest height the output could be
confirmed, which seems to no longer be useful. The only use of the
method was to determine whether we should delay a package to a future
block. Instead, we choose to return the absolute locktime the
transaction spending the output should have, which better corresponds to
the method name and still supports the delay functionality mentioned.
Doing so also allows us to expose the locktime required for HTLC
transactions we need to broadcast based on our own commitments for
anchor channels.
This only applies to all malleable packages on channels pre-dating
anchors and malleables packages for counterparty commitments
post-anchors. Malleables packages for holder commitments post-anchors
should have their transaction locktime applied manually by the consumer
of `BumpTransactionEvent::HTLCResolution` events.
While users could easily figure it out based on the set of HTLC
descriptors included within, we already track it within the
`OnchainTxHandler`, so we might as well expose it to users as a
nice-to-have. It's also yet another thing they must get right to ensure
their HTLC transaction broadcasts are valid.
@wpaulino

Copy link
Copy Markdown
ContributorAuthor

Yea, I think so. let's just add more clarity. Happy to fix the fee sniping and use that too.

Done, also had to rebase to address a conflict.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Thanks, nice to have anti-fee-sniping.

@arik-so
arik-so merged commit 9fd6127 into lightningdevkit:mainMar 29, 2023
@wpaulino
wpaulino deleted the bump-htlc-resolution-tx-locktime branch March 29, 2023 00:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@codecov-commenter@TheBlueMatt@arik-so