Skip to content

Use 72 WU instead of 73 WU for signature weight - #4208

Merged
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight
Nov 11, 2025
Merged

Use 72 WU instead of 73 WU for signature weight#4208
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight

Conversation

@jkczyz

Copy link
Copy Markdown
Contributor

When estimating signature weight, 73 WU was used in some places while 72 WU was used in others. Consistently use 72 WU and replace hardcoded values with constants. 73 WU signatures are non-standard and won't be produced by LDK. Additionally, using 73 WU along with grind_signatures adjustment is nonsensical.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 5, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @TheBlueMatt as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@codecov

codecovBot commented Nov 5, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.92929% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.33%. Comparing base (08c2236) to head (2330ed9).
⚠️ Report is 22 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/funding.rs42.85%4 Missing ⚠️
lightning/src/ln/channel.rs94.11%0 Missing and 2 partials ⚠️
lightning/src/ln/interactivetxs.rs97.72%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4208 +/- ##
==========================================
+ Coverage 89.30% 89.33% +0.03% 
==========================================
Files 180 180 Lines 137913 138176 +263 Branches 137913 138176 +263 ==========================================
+ Hits 123159 123445 +286 + Misses 12142 12118 -24 - Partials 2612 2613 +1 
FlagCoverage Δ
fuzzing33.58% <0.00%> (+0.06%)⬆️
tests88.73% <92.92%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash

Comment threadlightning/src/sign/mod.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 39fc8fb to 54bcda8CompareNovember 6, 2025 15:02

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add a commit to use a 95% fee rate tolerance when checking the remote, like Eclair. Let me know if you prefer to leave that to a separate PR.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 54bcda8 to 63bb5edCompareNovember 6, 2025 15:08
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squahsed

@jkczyzjkczyz self-assigned this Nov 6, 2025
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 63bb5ed to d88395fCompareNovember 7, 2025 16:38
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Dropped the linter fix as it was merged in #4212.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

Basically LGTM but I'd kinda rather not use the very confusing secp256k1 constants.

Comment threadlightning/src/ln/chan_utils.rs Outdated
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey1
1 + // data len
33 + // pubkey2
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey2

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.

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising. Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

It's the maximum that secp256k1 will generate, though, which is what we use.

@TheBlueMattTheBlueMattNov 10, 2025

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.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

I mean, yes, but that doesn't mean we have to use confusing constants :).

It's the maximum that secp256k1 will generate, though, which is what we use.

But its not, at least not with the grind signatures default-feature. The use here in many places is actually the maximum standard signature size, which is the default the secp will generate but that's a different concept.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Added some internal constants. FWIW, we are already using PUBLIC_KEY_SIZE throughout the codebase.

@TheBlueMattTheBlueMatt added this to the 0.2 milestone Nov 9, 2025
When estimating signature weight, 73 WU was used in some places while 72
WU was used in others. Consistently use 72 WU and replace hardcoded
values with constants. 73 WU signatures are non-standard and won't be
produced by LDK. Additionally, using 73 WU along with grind_signatures
adjustment is nonsensical.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from d88395f to 6778f24CompareNovember 10, 2025 16:21
wpaulino
wpaulino previously approved these changes Nov 10, 2025
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

While looking to fix the MAX_STANDARD_TX_WEIGHT check, I noticed that we aren't adjusting FundingTxInput::new_p2wpkh for grind_signatures. Gonna push the fix in this PR rather than a follow-up since it is related.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 6778f24 to 4334722CompareNovember 10, 2025 23:46
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch 2 times, most recently from 2daeaf2 to a2a2cfcCompareNovember 11, 2025 00:29

@TheBlueMattTheBlueMatt left a comment

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.

LGTM, feel free to squash.

When estimating the splice funding transaction fees, adjust for
grind_signatures. Since LDK supplies one of the signatures, only adjust
by 1 WU even though spending the shared input requires two signatures.
The interactive-tx construction protocol uses an agreed upon fee rate.
Since the bitcoind coin selection algorithm may underpay fees when no
change output is needed, providing a tolerance when checking if the
remote's fee contribution could avoid some unexpected failures. This
commit introduces a 95% tolerance similar to Eclair.
The interactive-tx construction protocol needs to make sure the
constructed transaction does not exceed MAX_STANDARD_TX_WEIGHT. A naive
estimate of the transaction weight after signing was used, but was not
accurate. Specifically, it double-counted EMPTY_SCRIPT_SIG_WEIGHT and
didn't include SEGWIT_MARKER_FLAG_WEIGHT.
Useful for re-using code producing a FundingTxInput set to implement
CoinSelectionSource.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from a2a2cfc to 2330ed9CompareNovember 11, 2025 15:10
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squashed

@TheBlueMattTheBlueMatt left a comment

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.

Your turn @wpaulino

@wpaulino
wpaulino merged commit 9150bc8 into lightningdevkit:mainNov 11, 2025
26 checks passed
@TheBlueMattTheBlueMatt mentioned this pull request Nov 12, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4221

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants

@jkczyz@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Use 72 WU instead of 73 WU for signature weight by jkczyz · Pull Request #4208 · lightningdevkit/rust-lightning · GitHub
Skip to content

Use 72 WU instead of 73 WU for signature weight - #4208

Merged
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight
Nov 11, 2025
Merged

Use 72 WU instead of 73 WU for signature weight#4208
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight

Conversation

@jkczyz

Copy link
Copy Markdown
Contributor

When estimating signature weight, 73 WU was used in some places while 72 WU was used in others. Consistently use 72 WU and replace hardcoded values with constants. 73 WU signatures are non-standard and won't be produced by LDK. Additionally, using 73 WU along with grind_signatures adjustment is nonsensical.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 5, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @TheBlueMatt as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@codecov

codecovBot commented Nov 5, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.92929% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.33%. Comparing base (08c2236) to head (2330ed9).
⚠️ Report is 22 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/funding.rs42.85%4 Missing ⚠️
lightning/src/ln/channel.rs94.11%0 Missing and 2 partials ⚠️
lightning/src/ln/interactivetxs.rs97.72%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4208 +/- ##
==========================================
+ Coverage 89.30% 89.33% +0.03% 
==========================================
Files 180 180 Lines 137913 138176 +263 Branches 137913 138176 +263 ==========================================
+ Hits 123159 123445 +286 + Misses 12142 12118 -24 - Partials 2612 2613 +1 
FlagCoverage Δ
fuzzing33.58% <0.00%> (+0.06%)⬆️
tests88.73% <92.92%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash

Comment threadlightning/src/sign/mod.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 39fc8fb to 54bcda8CompareNovember 6, 2025 15:02

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add a commit to use a 95% fee rate tolerance when checking the remote, like Eclair. Let me know if you prefer to leave that to a separate PR.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 54bcda8 to 63bb5edCompareNovember 6, 2025 15:08
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squahsed

@jkczyzjkczyz self-assigned this Nov 6, 2025
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 63bb5ed to d88395fCompareNovember 7, 2025 16:38
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Dropped the linter fix as it was merged in #4212.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

Basically LGTM but I'd kinda rather not use the very confusing secp256k1 constants.

Comment threadlightning/src/ln/chan_utils.rs Outdated
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey1
1 + // data len
33 + // pubkey2
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey2

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.

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising. Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

It's the maximum that secp256k1 will generate, though, which is what we use.

@TheBlueMattTheBlueMattNov 10, 2025

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.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

I mean, yes, but that doesn't mean we have to use confusing constants :).

It's the maximum that secp256k1 will generate, though, which is what we use.

But its not, at least not with the grind signatures default-feature. The use here in many places is actually the maximum standard signature size, which is the default the secp will generate but that's a different concept.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Added some internal constants. FWIW, we are already using PUBLIC_KEY_SIZE throughout the codebase.

@TheBlueMattTheBlueMatt added this to the 0.2 milestone Nov 9, 2025
When estimating signature weight, 73 WU was used in some places while 72
WU was used in others. Consistently use 72 WU and replace hardcoded
values with constants. 73 WU signatures are non-standard and won't be
produced by LDK. Additionally, using 73 WU along with grind_signatures
adjustment is nonsensical.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from d88395f to 6778f24CompareNovember 10, 2025 16:21
wpaulino
wpaulino previously approved these changes Nov 10, 2025
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

While looking to fix the MAX_STANDARD_TX_WEIGHT check, I noticed that we aren't adjusting FundingTxInput::new_p2wpkh for grind_signatures. Gonna push the fix in this PR rather than a follow-up since it is related.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 6778f24 to 4334722CompareNovember 10, 2025 23:46
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch 2 times, most recently from 2daeaf2 to a2a2cfcCompareNovember 11, 2025 00:29

@TheBlueMattTheBlueMatt left a comment

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.

LGTM, feel free to squash.

When estimating the splice funding transaction fees, adjust for
grind_signatures. Since LDK supplies one of the signatures, only adjust
by 1 WU even though spending the shared input requires two signatures.
The interactive-tx construction protocol uses an agreed upon fee rate.
Since the bitcoind coin selection algorithm may underpay fees when no
change output is needed, providing a tolerance when checking if the
remote's fee contribution could avoid some unexpected failures. This
commit introduces a 95% tolerance similar to Eclair.
The interactive-tx construction protocol needs to make sure the
constructed transaction does not exceed MAX_STANDARD_TX_WEIGHT. A naive
estimate of the transaction weight after signing was used, but was not
accurate. Specifically, it double-counted EMPTY_SCRIPT_SIG_WEIGHT and
didn't include SEGWIT_MARKER_FLAG_WEIGHT.
Useful for re-using code producing a FundingTxInput set to implement
CoinSelectionSource.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from a2a2cfc to 2330ed9CompareNovember 11, 2025 15:10
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squashed

@TheBlueMattTheBlueMatt left a comment

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.

Your turn @wpaulino

@wpaulino
wpaulino merged commit 9150bc8 into lightningdevkit:mainNov 11, 2025
26 checks passed
@TheBlueMattTheBlueMatt mentioned this pull request Nov 12, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4221

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants

@jkczyz@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Use 72 WU instead of 73 WU for signature weight by jkczyz · Pull Request #4208 · lightningdevkit/rust-lightning · GitHub
Skip to content

Use 72 WU instead of 73 WU for signature weight - #4208

Merged
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight
Nov 11, 2025
Merged

Use 72 WU instead of 73 WU for signature weight#4208
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight

Conversation

@jkczyz

Copy link
Copy Markdown
Contributor

When estimating signature weight, 73 WU was used in some places while 72 WU was used in others. Consistently use 72 WU and replace hardcoded values with constants. 73 WU signatures are non-standard and won't be produced by LDK. Additionally, using 73 WU along with grind_signatures adjustment is nonsensical.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 5, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @TheBlueMatt as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@codecov

codecovBot commented Nov 5, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.92929% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.33%. Comparing base (08c2236) to head (2330ed9).
⚠️ Report is 22 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/funding.rs42.85%4 Missing ⚠️
lightning/src/ln/channel.rs94.11%0 Missing and 2 partials ⚠️
lightning/src/ln/interactivetxs.rs97.72%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4208 +/- ##
==========================================
+ Coverage 89.30% 89.33% +0.03% 
==========================================
Files 180 180 Lines 137913 138176 +263 Branches 137913 138176 +263 ==========================================
+ Hits 123159 123445 +286 + Misses 12142 12118 -24 - Partials 2612 2613 +1 
FlagCoverage Δ
fuzzing33.58% <0.00%> (+0.06%)⬆️
tests88.73% <92.92%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash

Comment threadlightning/src/sign/mod.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 39fc8fb to 54bcda8CompareNovember 6, 2025 15:02

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add a commit to use a 95% fee rate tolerance when checking the remote, like Eclair. Let me know if you prefer to leave that to a separate PR.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 54bcda8 to 63bb5edCompareNovember 6, 2025 15:08
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squahsed

@jkczyzjkczyz self-assigned this Nov 6, 2025
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 63bb5ed to d88395fCompareNovember 7, 2025 16:38
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Dropped the linter fix as it was merged in #4212.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

Basically LGTM but I'd kinda rather not use the very confusing secp256k1 constants.

Comment threadlightning/src/ln/chan_utils.rs Outdated
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey1
1 + // data len
33 + // pubkey2
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey2

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.

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising. Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

It's the maximum that secp256k1 will generate, though, which is what we use.

@TheBlueMattTheBlueMattNov 10, 2025

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.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

I mean, yes, but that doesn't mean we have to use confusing constants :).

It's the maximum that secp256k1 will generate, though, which is what we use.

But its not, at least not with the grind signatures default-feature. The use here in many places is actually the maximum standard signature size, which is the default the secp will generate but that's a different concept.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Added some internal constants. FWIW, we are already using PUBLIC_KEY_SIZE throughout the codebase.

@TheBlueMattTheBlueMatt added this to the 0.2 milestone Nov 9, 2025
When estimating signature weight, 73 WU was used in some places while 72
WU was used in others. Consistently use 72 WU and replace hardcoded
values with constants. 73 WU signatures are non-standard and won't be
produced by LDK. Additionally, using 73 WU along with grind_signatures
adjustment is nonsensical.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from d88395f to 6778f24CompareNovember 10, 2025 16:21
wpaulino
wpaulino previously approved these changes Nov 10, 2025
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

While looking to fix the MAX_STANDARD_TX_WEIGHT check, I noticed that we aren't adjusting FundingTxInput::new_p2wpkh for grind_signatures. Gonna push the fix in this PR rather than a follow-up since it is related.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 6778f24 to 4334722CompareNovember 10, 2025 23:46
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch 2 times, most recently from 2daeaf2 to a2a2cfcCompareNovember 11, 2025 00:29

@TheBlueMattTheBlueMatt left a comment

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.

LGTM, feel free to squash.

When estimating the splice funding transaction fees, adjust for
grind_signatures. Since LDK supplies one of the signatures, only adjust
by 1 WU even though spending the shared input requires two signatures.
The interactive-tx construction protocol uses an agreed upon fee rate.
Since the bitcoind coin selection algorithm may underpay fees when no
change output is needed, providing a tolerance when checking if the
remote's fee contribution could avoid some unexpected failures. This
commit introduces a 95% tolerance similar to Eclair.
The interactive-tx construction protocol needs to make sure the
constructed transaction does not exceed MAX_STANDARD_TX_WEIGHT. A naive
estimate of the transaction weight after signing was used, but was not
accurate. Specifically, it double-counted EMPTY_SCRIPT_SIG_WEIGHT and
didn't include SEGWIT_MARKER_FLAG_WEIGHT.
Useful for re-using code producing a FundingTxInput set to implement
CoinSelectionSource.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from a2a2cfc to 2330ed9CompareNovember 11, 2025 15:10
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squashed

@TheBlueMattTheBlueMatt left a comment

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.

Your turn @wpaulino

@wpaulino
wpaulino merged commit 9150bc8 into lightningdevkit:mainNov 11, 2025
26 checks passed
@TheBlueMattTheBlueMatt mentioned this pull request Nov 12, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4221

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants

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

Use 72 WU instead of 73 WU for signature weight - #4208

Merged
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight
Nov 11, 2025
Merged

Use 72 WU instead of 73 WU for signature weight#4208
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight

Conversation

@jkczyz

Copy link
Copy Markdown
Contributor

When estimating signature weight, 73 WU was used in some places while 72 WU was used in others. Consistently use 72 WU and replace hardcoded values with constants. 73 WU signatures are non-standard and won't be produced by LDK. Additionally, using 73 WU along with grind_signatures adjustment is nonsensical.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 5, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @TheBlueMatt as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@codecov

codecovBot commented Nov 5, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.92929% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.33%. Comparing base (08c2236) to head (2330ed9).
⚠️ Report is 22 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/funding.rs42.85%4 Missing ⚠️
lightning/src/ln/channel.rs94.11%0 Missing and 2 partials ⚠️
lightning/src/ln/interactivetxs.rs97.72%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4208 +/- ##
==========================================
+ Coverage 89.30% 89.33% +0.03% 
==========================================
Files 180 180 Lines 137913 138176 +263 Branches 137913 138176 +263 ==========================================
+ Hits 123159 123445 +286 + Misses 12142 12118 -24 - Partials 2612 2613 +1 
FlagCoverage Δ
fuzzing33.58% <0.00%> (+0.06%)⬆️
tests88.73% <92.92%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash

Comment threadlightning/src/sign/mod.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 39fc8fb to 54bcda8CompareNovember 6, 2025 15:02

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add a commit to use a 95% fee rate tolerance when checking the remote, like Eclair. Let me know if you prefer to leave that to a separate PR.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 54bcda8 to 63bb5edCompareNovember 6, 2025 15:08
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squahsed

@jkczyzjkczyz self-assigned this Nov 6, 2025
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 63bb5ed to d88395fCompareNovember 7, 2025 16:38
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Dropped the linter fix as it was merged in #4212.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

Basically LGTM but I'd kinda rather not use the very confusing secp256k1 constants.

Comment threadlightning/src/ln/chan_utils.rs Outdated
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey1
1 + // data len
33 + // pubkey2
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey2

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.

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising. Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

It's the maximum that secp256k1 will generate, though, which is what we use.

@TheBlueMattTheBlueMattNov 10, 2025

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.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

I mean, yes, but that doesn't mean we have to use confusing constants :).

It's the maximum that secp256k1 will generate, though, which is what we use.

But its not, at least not with the grind signatures default-feature. The use here in many places is actually the maximum standard signature size, which is the default the secp will generate but that's a different concept.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Added some internal constants. FWIW, we are already using PUBLIC_KEY_SIZE throughout the codebase.

@TheBlueMattTheBlueMatt added this to the 0.2 milestone Nov 9, 2025
When estimating signature weight, 73 WU was used in some places while 72
WU was used in others. Consistently use 72 WU and replace hardcoded
values with constants. 73 WU signatures are non-standard and won't be
produced by LDK. Additionally, using 73 WU along with grind_signatures
adjustment is nonsensical.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from d88395f to 6778f24CompareNovember 10, 2025 16:21
wpaulino
wpaulino previously approved these changes Nov 10, 2025
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

While looking to fix the MAX_STANDARD_TX_WEIGHT check, I noticed that we aren't adjusting FundingTxInput::new_p2wpkh for grind_signatures. Gonna push the fix in this PR rather than a follow-up since it is related.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 6778f24 to 4334722CompareNovember 10, 2025 23:46
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch 2 times, most recently from 2daeaf2 to a2a2cfcCompareNovember 11, 2025 00:29

@TheBlueMattTheBlueMatt left a comment

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.

LGTM, feel free to squash.

When estimating the splice funding transaction fees, adjust for
grind_signatures. Since LDK supplies one of the signatures, only adjust
by 1 WU even though spending the shared input requires two signatures.
The interactive-tx construction protocol uses an agreed upon fee rate.
Since the bitcoind coin selection algorithm may underpay fees when no
change output is needed, providing a tolerance when checking if the
remote's fee contribution could avoid some unexpected failures. This
commit introduces a 95% tolerance similar to Eclair.
The interactive-tx construction protocol needs to make sure the
constructed transaction does not exceed MAX_STANDARD_TX_WEIGHT. A naive
estimate of the transaction weight after signing was used, but was not
accurate. Specifically, it double-counted EMPTY_SCRIPT_SIG_WEIGHT and
didn't include SEGWIT_MARKER_FLAG_WEIGHT.
Useful for re-using code producing a FundingTxInput set to implement
CoinSelectionSource.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from a2a2cfc to 2330ed9CompareNovember 11, 2025 15:10
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squashed

@TheBlueMattTheBlueMatt left a comment

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.

Your turn @wpaulino

@wpaulino
wpaulino merged commit 9150bc8 into lightningdevkit:mainNov 11, 2025
26 checks passed
@TheBlueMattTheBlueMatt mentioned this pull request Nov 12, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4221

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants

@jkczyz@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Use 72 WU instead of 73 WU for signature weight by jkczyz · Pull Request #4208 · lightningdevkit/rust-lightning · GitHub
Skip to content

Use 72 WU instead of 73 WU for signature weight - #4208

Merged
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight
Nov 11, 2025
Merged

Use 72 WU instead of 73 WU for signature weight#4208
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight

Conversation

@jkczyz

Copy link
Copy Markdown
Contributor

When estimating signature weight, 73 WU was used in some places while 72 WU was used in others. Consistently use 72 WU and replace hardcoded values with constants. 73 WU signatures are non-standard and won't be produced by LDK. Additionally, using 73 WU along with grind_signatures adjustment is nonsensical.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 5, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @TheBlueMatt as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@codecov

codecovBot commented Nov 5, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.92929% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.33%. Comparing base (08c2236) to head (2330ed9).
⚠️ Report is 22 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/funding.rs42.85%4 Missing ⚠️
lightning/src/ln/channel.rs94.11%0 Missing and 2 partials ⚠️
lightning/src/ln/interactivetxs.rs97.72%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4208 +/- ##
==========================================
+ Coverage 89.30% 89.33% +0.03% 
==========================================
Files 180 180 Lines 137913 138176 +263 Branches 137913 138176 +263 ==========================================
+ Hits 123159 123445 +286 + Misses 12142 12118 -24 - Partials 2612 2613 +1 
FlagCoverage Δ
fuzzing33.58% <0.00%> (+0.06%)⬆️
tests88.73% <92.92%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash

Comment threadlightning/src/sign/mod.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 39fc8fb to 54bcda8CompareNovember 6, 2025 15:02

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add a commit to use a 95% fee rate tolerance when checking the remote, like Eclair. Let me know if you prefer to leave that to a separate PR.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 54bcda8 to 63bb5edCompareNovember 6, 2025 15:08
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squahsed

@jkczyzjkczyz self-assigned this Nov 6, 2025
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 63bb5ed to d88395fCompareNovember 7, 2025 16:38
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Dropped the linter fix as it was merged in #4212.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

Basically LGTM but I'd kinda rather not use the very confusing secp256k1 constants.

Comment threadlightning/src/ln/chan_utils.rs Outdated
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey1
1 + // data len
33 + // pubkey2
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey2

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.

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising. Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

It's the maximum that secp256k1 will generate, though, which is what we use.

@TheBlueMattTheBlueMattNov 10, 2025

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.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

I mean, yes, but that doesn't mean we have to use confusing constants :).

It's the maximum that secp256k1 will generate, though, which is what we use.

But its not, at least not with the grind signatures default-feature. The use here in many places is actually the maximum standard signature size, which is the default the secp will generate but that's a different concept.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Added some internal constants. FWIW, we are already using PUBLIC_KEY_SIZE throughout the codebase.

@TheBlueMattTheBlueMatt added this to the 0.2 milestone Nov 9, 2025
When estimating signature weight, 73 WU was used in some places while 72
WU was used in others. Consistently use 72 WU and replace hardcoded
values with constants. 73 WU signatures are non-standard and won't be
produced by LDK. Additionally, using 73 WU along with grind_signatures
adjustment is nonsensical.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from d88395f to 6778f24CompareNovember 10, 2025 16:21
wpaulino
wpaulino previously approved these changes Nov 10, 2025
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

While looking to fix the MAX_STANDARD_TX_WEIGHT check, I noticed that we aren't adjusting FundingTxInput::new_p2wpkh for grind_signatures. Gonna push the fix in this PR rather than a follow-up since it is related.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 6778f24 to 4334722CompareNovember 10, 2025 23:46
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch 2 times, most recently from 2daeaf2 to a2a2cfcCompareNovember 11, 2025 00:29

@TheBlueMattTheBlueMatt left a comment

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.

LGTM, feel free to squash.

When estimating the splice funding transaction fees, adjust for
grind_signatures. Since LDK supplies one of the signatures, only adjust
by 1 WU even though spending the shared input requires two signatures.
The interactive-tx construction protocol uses an agreed upon fee rate.
Since the bitcoind coin selection algorithm may underpay fees when no
change output is needed, providing a tolerance when checking if the
remote's fee contribution could avoid some unexpected failures. This
commit introduces a 95% tolerance similar to Eclair.
The interactive-tx construction protocol needs to make sure the
constructed transaction does not exceed MAX_STANDARD_TX_WEIGHT. A naive
estimate of the transaction weight after signing was used, but was not
accurate. Specifically, it double-counted EMPTY_SCRIPT_SIG_WEIGHT and
didn't include SEGWIT_MARKER_FLAG_WEIGHT.
Useful for re-using code producing a FundingTxInput set to implement
CoinSelectionSource.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from a2a2cfc to 2330ed9CompareNovember 11, 2025 15:10
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squashed

@TheBlueMattTheBlueMatt left a comment

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.

Your turn @wpaulino

@wpaulino
wpaulino merged commit 9150bc8 into lightningdevkit:mainNov 11, 2025
26 checks passed
@TheBlueMattTheBlueMatt mentioned this pull request Nov 12, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4221

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants

@jkczyz@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Use 72 WU instead of 73 WU for signature weight by jkczyz · Pull Request #4208 · lightningdevkit/rust-lightning · GitHub
Skip to content

Use 72 WU instead of 73 WU for signature weight - #4208

Merged
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight
Nov 11, 2025
Merged

Use 72 WU instead of 73 WU for signature weight#4208
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight

Conversation

@jkczyz

Copy link
Copy Markdown
Contributor

When estimating signature weight, 73 WU was used in some places while 72 WU was used in others. Consistently use 72 WU and replace hardcoded values with constants. 73 WU signatures are non-standard and won't be produced by LDK. Additionally, using 73 WU along with grind_signatures adjustment is nonsensical.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 5, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @TheBlueMatt as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@codecov

codecovBot commented Nov 5, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.92929% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.33%. Comparing base (08c2236) to head (2330ed9).
⚠️ Report is 22 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/funding.rs42.85%4 Missing ⚠️
lightning/src/ln/channel.rs94.11%0 Missing and 2 partials ⚠️
lightning/src/ln/interactivetxs.rs97.72%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4208 +/- ##
==========================================
+ Coverage 89.30% 89.33% +0.03% 
==========================================
Files 180 180 Lines 137913 138176 +263 Branches 137913 138176 +263 ==========================================
+ Hits 123159 123445 +286 + Misses 12142 12118 -24 - Partials 2612 2613 +1 
FlagCoverage Δ
fuzzing33.58% <0.00%> (+0.06%)⬆️
tests88.73% <92.92%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash

Comment threadlightning/src/sign/mod.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 39fc8fb to 54bcda8CompareNovember 6, 2025 15:02

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add a commit to use a 95% fee rate tolerance when checking the remote, like Eclair. Let me know if you prefer to leave that to a separate PR.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 54bcda8 to 63bb5edCompareNovember 6, 2025 15:08
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squahsed

@jkczyzjkczyz self-assigned this Nov 6, 2025
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 63bb5ed to d88395fCompareNovember 7, 2025 16:38
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Dropped the linter fix as it was merged in #4212.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

Basically LGTM but I'd kinda rather not use the very confusing secp256k1 constants.

Comment threadlightning/src/ln/chan_utils.rs Outdated
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey1
1 + // data len
33 + // pubkey2
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey2

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.

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising. Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

It's the maximum that secp256k1 will generate, though, which is what we use.

@TheBlueMattTheBlueMattNov 10, 2025

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.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

I mean, yes, but that doesn't mean we have to use confusing constants :).

It's the maximum that secp256k1 will generate, though, which is what we use.

But its not, at least not with the grind signatures default-feature. The use here in many places is actually the maximum standard signature size, which is the default the secp will generate but that's a different concept.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Added some internal constants. FWIW, we are already using PUBLIC_KEY_SIZE throughout the codebase.

@TheBlueMattTheBlueMatt added this to the 0.2 milestone Nov 9, 2025
When estimating signature weight, 73 WU was used in some places while 72
WU was used in others. Consistently use 72 WU and replace hardcoded
values with constants. 73 WU signatures are non-standard and won't be
produced by LDK. Additionally, using 73 WU along with grind_signatures
adjustment is nonsensical.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from d88395f to 6778f24CompareNovember 10, 2025 16:21
wpaulino
wpaulino previously approved these changes Nov 10, 2025
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

While looking to fix the MAX_STANDARD_TX_WEIGHT check, I noticed that we aren't adjusting FundingTxInput::new_p2wpkh for grind_signatures. Gonna push the fix in this PR rather than a follow-up since it is related.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 6778f24 to 4334722CompareNovember 10, 2025 23:46
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch 2 times, most recently from 2daeaf2 to a2a2cfcCompareNovember 11, 2025 00:29

@TheBlueMattTheBlueMatt left a comment

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.

LGTM, feel free to squash.

When estimating the splice funding transaction fees, adjust for
grind_signatures. Since LDK supplies one of the signatures, only adjust
by 1 WU even though spending the shared input requires two signatures.
The interactive-tx construction protocol uses an agreed upon fee rate.
Since the bitcoind coin selection algorithm may underpay fees when no
change output is needed, providing a tolerance when checking if the
remote's fee contribution could avoid some unexpected failures. This
commit introduces a 95% tolerance similar to Eclair.
The interactive-tx construction protocol needs to make sure the
constructed transaction does not exceed MAX_STANDARD_TX_WEIGHT. A naive
estimate of the transaction weight after signing was used, but was not
accurate. Specifically, it double-counted EMPTY_SCRIPT_SIG_WEIGHT and
didn't include SEGWIT_MARKER_FLAG_WEIGHT.
Useful for re-using code producing a FundingTxInput set to implement
CoinSelectionSource.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from a2a2cfc to 2330ed9CompareNovember 11, 2025 15:10
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squashed

@TheBlueMattTheBlueMatt left a comment

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.

Your turn @wpaulino

@wpaulino
wpaulino merged commit 9150bc8 into lightningdevkit:mainNov 11, 2025
26 checks passed
@TheBlueMattTheBlueMatt mentioned this pull request Nov 12, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4221

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants

@jkczyz@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Use 72 WU instead of 73 WU for signature weight by jkczyz · Pull Request #4208 · lightningdevkit/rust-lightning · GitHub
Skip to content

Use 72 WU instead of 73 WU for signature weight - #4208

Merged
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight
Nov 11, 2025
Merged

Use 72 WU instead of 73 WU for signature weight#4208
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight

Conversation

@jkczyz

Copy link
Copy Markdown
Contributor

When estimating signature weight, 73 WU was used in some places while 72 WU was used in others. Consistently use 72 WU and replace hardcoded values with constants. 73 WU signatures are non-standard and won't be produced by LDK. Additionally, using 73 WU along with grind_signatures adjustment is nonsensical.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 5, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @TheBlueMatt as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@codecov

codecovBot commented Nov 5, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.92929% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.33%. Comparing base (08c2236) to head (2330ed9).
⚠️ Report is 22 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/funding.rs42.85%4 Missing ⚠️
lightning/src/ln/channel.rs94.11%0 Missing and 2 partials ⚠️
lightning/src/ln/interactivetxs.rs97.72%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4208 +/- ##
==========================================
+ Coverage 89.30% 89.33% +0.03% 
==========================================
Files 180 180 Lines 137913 138176 +263 Branches 137913 138176 +263 ==========================================
+ Hits 123159 123445 +286 + Misses 12142 12118 -24 - Partials 2612 2613 +1 
FlagCoverage Δ
fuzzing33.58% <0.00%> (+0.06%)⬆️
tests88.73% <92.92%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash

Comment threadlightning/src/sign/mod.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 39fc8fb to 54bcda8CompareNovember 6, 2025 15:02

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add a commit to use a 95% fee rate tolerance when checking the remote, like Eclair. Let me know if you prefer to leave that to a separate PR.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 54bcda8 to 63bb5edCompareNovember 6, 2025 15:08
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squahsed

@jkczyzjkczyz self-assigned this Nov 6, 2025
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 63bb5ed to d88395fCompareNovember 7, 2025 16:38
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Dropped the linter fix as it was merged in #4212.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

Basically LGTM but I'd kinda rather not use the very confusing secp256k1 constants.

Comment threadlightning/src/ln/chan_utils.rs Outdated
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey1
1 + // data len
33 + // pubkey2
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey2

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.

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising. Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

It's the maximum that secp256k1 will generate, though, which is what we use.

@TheBlueMattTheBlueMattNov 10, 2025

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.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

I mean, yes, but that doesn't mean we have to use confusing constants :).

It's the maximum that secp256k1 will generate, though, which is what we use.

But its not, at least not with the grind signatures default-feature. The use here in many places is actually the maximum standard signature size, which is the default the secp will generate but that's a different concept.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Added some internal constants. FWIW, we are already using PUBLIC_KEY_SIZE throughout the codebase.

@TheBlueMattTheBlueMatt added this to the 0.2 milestone Nov 9, 2025
When estimating signature weight, 73 WU was used in some places while 72
WU was used in others. Consistently use 72 WU and replace hardcoded
values with constants. 73 WU signatures are non-standard and won't be
produced by LDK. Additionally, using 73 WU along with grind_signatures
adjustment is nonsensical.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from d88395f to 6778f24CompareNovember 10, 2025 16:21
wpaulino
wpaulino previously approved these changes Nov 10, 2025
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

While looking to fix the MAX_STANDARD_TX_WEIGHT check, I noticed that we aren't adjusting FundingTxInput::new_p2wpkh for grind_signatures. Gonna push the fix in this PR rather than a follow-up since it is related.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 6778f24 to 4334722CompareNovember 10, 2025 23:46
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch 2 times, most recently from 2daeaf2 to a2a2cfcCompareNovember 11, 2025 00:29

@TheBlueMattTheBlueMatt left a comment

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.

LGTM, feel free to squash.

When estimating the splice funding transaction fees, adjust for
grind_signatures. Since LDK supplies one of the signatures, only adjust
by 1 WU even though spending the shared input requires two signatures.
The interactive-tx construction protocol uses an agreed upon fee rate.
Since the bitcoind coin selection algorithm may underpay fees when no
change output is needed, providing a tolerance when checking if the
remote's fee contribution could avoid some unexpected failures. This
commit introduces a 95% tolerance similar to Eclair.
The interactive-tx construction protocol needs to make sure the
constructed transaction does not exceed MAX_STANDARD_TX_WEIGHT. A naive
estimate of the transaction weight after signing was used, but was not
accurate. Specifically, it double-counted EMPTY_SCRIPT_SIG_WEIGHT and
didn't include SEGWIT_MARKER_FLAG_WEIGHT.
Useful for re-using code producing a FundingTxInput set to implement
CoinSelectionSource.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from a2a2cfc to 2330ed9CompareNovember 11, 2025 15:10
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squashed

@TheBlueMattTheBlueMatt left a comment

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.

Your turn @wpaulino

@wpaulino
wpaulino merged commit 9150bc8 into lightningdevkit:mainNov 11, 2025
26 checks passed
@TheBlueMattTheBlueMatt mentioned this pull request Nov 12, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4221

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants

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

Use 72 WU instead of 73 WU for signature weight - #4208

Merged
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight
Nov 11, 2025
Merged

Use 72 WU instead of 73 WU for signature weight#4208
wpaulino merged 5 commits into
lightningdevkit:mainfrom
jkczyz:2025-11-signature-weight

Conversation

@jkczyz

Copy link
Copy Markdown
Contributor

When estimating signature weight, 73 WU was used in some places while 72 WU was used in others. Consistently use 72 WU and replace hardcoded values with constants. 73 WU signatures are non-standard and won't be produced by LDK. Additionally, using 73 WU along with grind_signatures adjustment is nonsensical.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 5, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @TheBlueMatt as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@codecov

codecovBot commented Nov 5, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.92929% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.33%. Comparing base (08c2236) to head (2330ed9).
⚠️ Report is 22 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/funding.rs42.85%4 Missing ⚠️
lightning/src/ln/channel.rs94.11%0 Missing and 2 partials ⚠️
lightning/src/ln/interactivetxs.rs97.72%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4208 +/- ##
==========================================
+ Coverage 89.30% 89.33% +0.03% 
==========================================
Files 180 180 Lines 137913 138176 +263 Branches 137913 138176 +263 ==========================================
+ Hits 123159 123445 +286 + Misses 12142 12118 -24 - Partials 2612 2613 +1 
FlagCoverage Δ
fuzzing33.58% <0.00%> (+0.06%)⬆️
tests88.73% <92.92%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash

Comment threadlightning/src/sign/mod.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 39fc8fb to 54bcda8CompareNovember 6, 2025 15:02

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add a commit to use a 95% fee rate tolerance when checking the remote, like Eclair. Let me know if you prefer to leave that to a separate PR.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 54bcda8 to 63bb5edCompareNovember 6, 2025 15:08
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squahsed

@jkczyzjkczyz self-assigned this Nov 6, 2025
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 63bb5ed to d88395fCompareNovember 7, 2025 16:38
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Dropped the linter fix as it was merged in #4212.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@TheBlueMattTheBlueMatt left a comment

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.

Basically LGTM but I'd kinda rather not use the very confusing secp256k1 constants.

Comment threadlightning/src/ln/chan_utils.rs Outdated
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey1
1 + // data len
33 + // pubkey2
bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE as u64 + // pubkey2

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.

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising. Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Honestly I find these constants kinda unreadable - a public key's "size" really should be 64 bytes (ish) cause its two coordinates. The fact that PUBLIC_KEY_SIZE refers to the serialized size when serialized in compressed form is very surprising.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

Same goes for MAX_SIGNATURE_SIZE, which confusingly refers to the maximum size of a signature we generate (depending on settings, often its not even that), not the actual maximum signature size.

It's the maximum that secp256k1 will generate, though, which is what we use.

@TheBlueMattTheBlueMattNov 10, 2025

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.

Hmm... there is also UNCOMPRESSED_PUBLIC_KEY_SIZE, so seems this complaint is more directed at secp256k1 crate not using a similar prefix for PUBLIC_KEY_SIZE?

I mean, yes, but that doesn't mean we have to use confusing constants :).

It's the maximum that secp256k1 will generate, though, which is what we use.

But its not, at least not with the grind signatures default-feature. The use here in many places is actually the maximum standard signature size, which is the default the secp will generate but that's a different concept.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Added some internal constants. FWIW, we are already using PUBLIC_KEY_SIZE throughout the codebase.

@TheBlueMattTheBlueMatt added this to the 0.2 milestone Nov 9, 2025
When estimating signature weight, 73 WU was used in some places while 72
WU was used in others. Consistently use 72 WU and replace hardcoded
values with constants. 73 WU signatures are non-standard and won't be
produced by LDK. Additionally, using 73 WU along with grind_signatures
adjustment is nonsensical.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from d88395f to 6778f24CompareNovember 10, 2025 16:21
wpaulino
wpaulino previously approved these changes Nov 10, 2025
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

While looking to fix the MAX_STANDARD_TX_WEIGHT check, I noticed that we aren't adjusting FundingTxInput::new_p2wpkh for grind_signatures. Gonna push the fix in this PR rather than a follow-up since it is related.

@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from 6778f24 to 4334722CompareNovember 10, 2025 23:46
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch 2 times, most recently from 2daeaf2 to a2a2cfcCompareNovember 11, 2025 00:29

@TheBlueMattTheBlueMatt left a comment

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.

LGTM, feel free to squash.

When estimating the splice funding transaction fees, adjust for
grind_signatures. Since LDK supplies one of the signatures, only adjust
by 1 WU even though spending the shared input requires two signatures.
The interactive-tx construction protocol uses an agreed upon fee rate.
Since the bitcoind coin selection algorithm may underpay fees when no
change output is needed, providing a tolerance when checking if the
remote's fee contribution could avoid some unexpected failures. This
commit introduces a 95% tolerance similar to Eclair.
The interactive-tx construction protocol needs to make sure the
constructed transaction does not exceed MAX_STANDARD_TX_WEIGHT. A naive
estimate of the transaction weight after signing was used, but was not
accurate. Specifically, it double-counted EMPTY_SCRIPT_SIG_WEIGHT and
didn't include SEGWIT_MARKER_FLAG_WEIGHT.
Useful for re-using code producing a FundingTxInput set to implement
CoinSelectionSource.
@jkczyz
jkczyzforce-pushed the 2025-11-signature-weight branch from a2a2cfc to 2330ed9CompareNovember 11, 2025 15:10
@jkczyz

Copy link
Copy Markdown
ContributorAuthor

Squashed

@TheBlueMattTheBlueMatt left a comment

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.

Your turn @wpaulino

@wpaulino
wpaulino merged commit 9150bc8 into lightningdevkit:mainNov 11, 2025
26 checks passed
@TheBlueMattTheBlueMatt mentioned this pull request Nov 12, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4221

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants

@jkczyz@ldk-reviews-bot@TheBlueMatt@wpaulino