Skip to content

Small API cleanups pre-0.0.119 - #2798

Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-12-119-bindings-upstream
Dec 15, 2023
Merged

Small API cleanups pre-0.0.119#2798
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-12-119-bindings-upstream

Conversation

@TheBlueMatt

@TheBlueMattTheBlueMatt commented Dec 15, 2023

Copy link
Copy Markdown
Collaborator

A few small API cleanups that came up when generating bindings.

@TheBlueMattTheBlueMatt added this to the 0.0.119 milestone Dec 15, 2023
@wpaulino

wpaulino commented Dec 15, 2023

Copy link
Copy Markdown
Contributor

CI is sad

@TheBlueMatt
TheBlueMattforce-pushed the 2023-12-119-bindings-upstream branch from 1350daa to 759a213CompareDecember 15, 2023 18:56
@TheBlueMatt

TheBlueMatt commented Dec 15, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Oops, fixed.

@codecov-commenter

codecov-commenter commented Dec 15, 2023•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (b9797eb) 88.43% compared to head (2aecfa4) 88.43%.

FilesPatch %Lines
lightning/src/routing/router.rs0.00%2 Missing ⚠️
lightning/src/ln/msgs.rs50.00%1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@ Coverage Diff @@## main #2798 +/- ##
=======================================
Coverage 88.43% 88.43% =======================================
Files 114 114 Lines 91718 91718 Branches 91718 91718 =======================================
+ Hits 81109 81112 +3 - Misses 8126 8127 +1 + Partials 2483 2479 -4

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

wpaulino
wpaulino previously approved these changes Dec 15, 2023
View reviewed changes
@TheBlueMattTheBlueMatt mentioned this pull request Dec 15, 2023
Merged
@TheBlueMatt
Un-export the PrivateRoute inner field as there are invariants
90cc993
When we make the `PrivateRoute` inner `RouteHint` `pub`, we failed
to note that the `PrivateRoute::new` constructor actually verifies
a length invariant. Thus, we un-export the inner field and force
users to go back through the `new` fn.
@TheBlueMatt
Drop explicit bitcoin_hashes dependency in lightning-invoice
83e76d7
Since `lightning-invoice` now depends on the `bitcoin` crate
directly, also depending on the `bitcoin_hashes` crate is redundant
and just means we confuse users by setting the `std` flag only on
`bitcoin`. Thus, we drop the explicit dependency here and replace
it with `bitcoin::hashes`.
@TheBlueMatt
Make FinalOnionHopData public
bb0ddad
In 4b5db8c, `channelmanager::PendingHTLCRouting` was made
public, exposing a `FinalOnionHopData` field to the world. However,
`FinalOnionHopData` was left crate-private, making the enum
impossible to construct.
There isn't a strong reason for this (even though the
`FinalOnionHopData` API is somewhat confusing, being separated from
the rest of the onion structs), so we expose it here.
@TheBlueMatt
Use correct default value when comparing to htlc_maximum_msat
642240e
62f8669 added two
`htlc_maximum_msat.unwrap_or`s, but used a default value of 0,
spuriously causing all HTLCs to fail if we don't have an htlc
maximum value. This should be mostly harmless, but we should fix it
anyway.
@TheBlueMatt
TheBlueMattforce-pushed the 2023-12-119-bindings-upstream branch from 759a213 to 642240eCompareDecember 15, 2023 22:33
@TheBlueMatt

TheBlueMatt commented Dec 15, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Oops, added one more fixup from #2781.

@TheBlueMatt
Fix dev MSRV build of lightning-transaction-sync
2aecfa4
...due to a transitive dependency of the `bitcoind` crate.
@TheBlueMatt

TheBlueMatt commented Dec 15, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Also pushed a last-minute MSRV break in a dev-dep.

jkczyz
jkczyz reviewed Dec 15, 2023
View reviewed changes
Comment threadlightning/src/routing/router.rs
.filter(|details| amount_msats <= details.inbound_capacity_msat)
.filter(|details| amount_msats >= details.inbound_htlc_minimum_msat.unwrap_or(0))
.filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(0))
.filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(u64::MAX))

@jkczyzjkczyzDec 15, 2023

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.

Hmm... I think my reasoning here was that inbound_htlc_maximum_msat should be set for usable channels. So if it is not set, using zero would cause us to not consider this channel.

It will be Some if ChannelContext::counterparty_selected_channel_reserve_satoshis is Some, which seems to be when accept_channel is received:

rust-lightning/lightning/src/ln/channel.rs

Line 6324 in b9797eb

counterparty_selected_channel_reserve_satoshis:None,// Filled in in accept_channel

@TheBlueMattTheBlueMattDec 15, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Hmm, yea, I mean it won't be set except if the channel isn't usable, but I'd kinda rather lean on get_inbound_payment_scid() to detect "is channel available for inbound usage" rather than htlc_max, but it doesn't really matter that much.

@TheBlueMatt
TheBlueMatt merged commit ef2156a into lightningdevkit:mainDec 15, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jkczyzjkczyzjkczyz approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

0.0.119

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@wpaulino@codecov-commenter@jkczyz
, '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" + '
Small API cleanups pre-0.0.119 by TheBlueMatt · Pull Request #2798 · lightningdevkit/rust-lightning · GitHub
Skip to content
Small API cleanups pre-0.0.119 - #2798
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Dec 15, 2023
Merged
Small API cleanups pre-0.0.119#2798
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

Collaborator
A few small API cleanups that came up when generating bindings.
@TheBlueMattTheBlueMatt
added this to the 0.0.119 milestone
Dec 15, 2023
@wpaulino
wpaulino
commented
Dec 15, 2023

Copy link


Copy Markdown

Contributor
CI is sad
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
1350daa to
759a213CompareDecember 15, 2023 18:56
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@codecov-commenter
codecov-commenter
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: 3 lines in your changes are missing coverage. Please review.
Comparison is base (b9797eb) 88.43% compared to head (2aecfa4) 88.43%.
FilesPatch %Lines
lightning/src/routing/router.rs0.00%2 Missing ⚠️
lightning/src/ln/msgs.rs50.00%1 Missing ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files
@@ Coverage Diff @@## main #2798 +/- ##
=======================================
Coverage 88.43% 88.43% =======================================
Files 114 114 Lines 91718 91718 Branches 91718 91718 =======================================
+ Hits 81109 81112 +3 - Misses 8126 8127 +1 + Partials 2483 2479 -4 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
wpaulino
wpaulino
previously approved these changes
Dec 15, 2023
View reviewed changes
@TheBlueMattTheBlueMatt
mentioned this pull request
Dec 15, 2023
 Merged

@TheBlueMatt
Un-export the PrivateRoute inner field as there are invariants
90cc993
When we make the `PrivateRoute` inner `RouteHint` `pub`, we failed
to note that the `PrivateRoute::new` constructor actually verifies
a length invariant. Thus, we un-export the inner field and force
users to go back through the `new` fn.
@TheBlueMatt
Drop explicit bitcoin_hashes dependency in lightning-invoice
83e76d7
Since `lightning-invoice` now depends on the `bitcoin` crate
directly, also depending on the `bitcoin_hashes` crate is redundant
and just means we confuse users by setting the `std` flag only on
`bitcoin`. Thus, we drop the explicit dependency here and replace
it with `bitcoin::hashes`.
@TheBlueMatt
Make FinalOnionHopData public
bb0ddad
In 4b5db8c, `channelmanager::PendingHTLCRouting` was made
public, exposing a `FinalOnionHopData` field to the world. However,
`FinalOnionHopData` was left crate-private, making the enum
impossible to construct.
There isn't a strong reason for this (even though the
`FinalOnionHopData` API is somewhat confusing, being separated from
the rest of the onion structs), so we expose it here.
@TheBlueMatt
Use correct default value when comparing to htlc_maximum_msat
642240e
62f8669 added two
`htlc_maximum_msat.unwrap_or`s, but used a default value of 0,
spuriously causing all HTLCs to fail if we don't have an htlc
maximum value. This should be mostly harmless, but we should fix it
anyway.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
759a213 to
642240eCompareDecember 15, 2023 22:33
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, added one more fixup from #2781.
@TheBlueMatt
Fix dev MSRV build of lightning-transaction-sync
2aecfa4
...due to a transitive dependency of the `bitcoind` crate.
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Also pushed a last-minute MSRV break in a dev-dep.
jkczyz
jkczyz
reviewed
Dec 15, 2023
View reviewed changes
Comment threadlightning/src/routing/router.rs
 .filter(|details| amount_msats <= details.inbound_capacity_msat)
 .filter(|details| amount_msats >= details.inbound_htlc_minimum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(u64::MAX))
@jkczyzjkczyzDec 15, 2023

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.

Hmm... I think my reasoning here was that inbound_htlc_maximum_msat should be set for usable channels. So if it is not set, using zero would cause us to not consider this channel.
It will be Some if ChannelContext::counterparty_selected_channel_reserve_satoshis is Some, which seems to be when accept_channel is received:
rust-lightning/lightning/src/ln/channel.rs

Line 6324
in
b9797eb
counterparty_selected_channel_reserve_satoshis:None,// Filled in in accept_channel
@TheBlueMattTheBlueMattDec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Hmm, yea, I mean it won't be set except if the channel isn't usable, but I'd kinda rather lean on get_inbound_payment_scid() to detect "is channel available for inbound usage" rather than htlc_max, but it doesn't really matter that much.
@TheBlueMatt
TheBlueMatt
merged commit ef2156a
into
lightningdevkit:mainDec 15, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jkczyzjkczyzjkczyz approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.119

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@wpaulino@codecov-commenter@jkczyz

, '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('^' + ".*" + '
Small API cleanups pre-0.0.119 by TheBlueMatt · Pull Request #2798 · lightningdevkit/rust-lightning · GitHub
Skip to content
Small API cleanups pre-0.0.119 - #2798
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Dec 15, 2023
Merged
Small API cleanups pre-0.0.119#2798
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

Collaborator
A few small API cleanups that came up when generating bindings.
@TheBlueMattTheBlueMatt
added this to the 0.0.119 milestone
Dec 15, 2023
@wpaulino
wpaulino
commented
Dec 15, 2023

Copy link


Copy Markdown

Contributor
CI is sad
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
1350daa to
759a213CompareDecember 15, 2023 18:56
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@codecov-commenter
codecov-commenter
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: 3 lines in your changes are missing coverage. Please review.
Comparison is base (b9797eb) 88.43% compared to head (2aecfa4) 88.43%.
FilesPatch %Lines
lightning/src/routing/router.rs0.00%2 Missing ⚠️
lightning/src/ln/msgs.rs50.00%1 Missing ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files
@@ Coverage Diff @@## main #2798 +/- ##
=======================================
Coverage 88.43% 88.43% =======================================
Files 114 114 Lines 91718 91718 Branches 91718 91718 =======================================
+ Hits 81109 81112 +3 - Misses 8126 8127 +1 + Partials 2483 2479 -4 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
wpaulino
wpaulino
previously approved these changes
Dec 15, 2023
View reviewed changes
@TheBlueMattTheBlueMatt
mentioned this pull request
Dec 15, 2023
 Merged

@TheBlueMatt
Un-export the PrivateRoute inner field as there are invariants
90cc993
When we make the `PrivateRoute` inner `RouteHint` `pub`, we failed
to note that the `PrivateRoute::new` constructor actually verifies
a length invariant. Thus, we un-export the inner field and force
users to go back through the `new` fn.
@TheBlueMatt
Drop explicit bitcoin_hashes dependency in lightning-invoice
83e76d7
Since `lightning-invoice` now depends on the `bitcoin` crate
directly, also depending on the `bitcoin_hashes` crate is redundant
and just means we confuse users by setting the `std` flag only on
`bitcoin`. Thus, we drop the explicit dependency here and replace
it with `bitcoin::hashes`.
@TheBlueMatt
Make FinalOnionHopData public
bb0ddad
In 4b5db8c, `channelmanager::PendingHTLCRouting` was made
public, exposing a `FinalOnionHopData` field to the world. However,
`FinalOnionHopData` was left crate-private, making the enum
impossible to construct.
There isn't a strong reason for this (even though the
`FinalOnionHopData` API is somewhat confusing, being separated from
the rest of the onion structs), so we expose it here.
@TheBlueMatt
Use correct default value when comparing to htlc_maximum_msat
642240e
62f8669 added two
`htlc_maximum_msat.unwrap_or`s, but used a default value of 0,
spuriously causing all HTLCs to fail if we don't have an htlc
maximum value. This should be mostly harmless, but we should fix it
anyway.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
759a213 to
642240eCompareDecember 15, 2023 22:33
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, added one more fixup from #2781.
@TheBlueMatt
Fix dev MSRV build of lightning-transaction-sync
2aecfa4
...due to a transitive dependency of the `bitcoind` crate.
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Also pushed a last-minute MSRV break in a dev-dep.
jkczyz
jkczyz
reviewed
Dec 15, 2023
View reviewed changes
Comment threadlightning/src/routing/router.rs
 .filter(|details| amount_msats <= details.inbound_capacity_msat)
 .filter(|details| amount_msats >= details.inbound_htlc_minimum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(u64::MAX))
@jkczyzjkczyzDec 15, 2023

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.

Hmm... I think my reasoning here was that inbound_htlc_maximum_msat should be set for usable channels. So if it is not set, using zero would cause us to not consider this channel.
It will be Some if ChannelContext::counterparty_selected_channel_reserve_satoshis is Some, which seems to be when accept_channel is received:
rust-lightning/lightning/src/ln/channel.rs

Line 6324
in
b9797eb
counterparty_selected_channel_reserve_satoshis:None,// Filled in in accept_channel
@TheBlueMattTheBlueMattDec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Hmm, yea, I mean it won't be set except if the channel isn't usable, but I'd kinda rather lean on get_inbound_payment_scid() to detect "is channel available for inbound usage" rather than htlc_max, but it doesn't really matter that much.
@TheBlueMatt
TheBlueMatt
merged commit ef2156a
into
lightningdevkit:mainDec 15, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jkczyzjkczyzjkczyz approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.119

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@wpaulino@codecov-commenter@jkczyz

, '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('^' + ".*" + '
Small API cleanups pre-0.0.119 by TheBlueMatt · Pull Request #2798 · lightningdevkit/rust-lightning · GitHub
Skip to content
Small API cleanups pre-0.0.119 - #2798
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Dec 15, 2023
Merged
Small API cleanups pre-0.0.119#2798
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

Collaborator
A few small API cleanups that came up when generating bindings.
@TheBlueMattTheBlueMatt
added this to the 0.0.119 milestone
Dec 15, 2023
@wpaulino
wpaulino
commented
Dec 15, 2023

Copy link


Copy Markdown

Contributor
CI is sad
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
1350daa to
759a213CompareDecember 15, 2023 18:56
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@codecov-commenter
codecov-commenter
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: 3 lines in your changes are missing coverage. Please review.
Comparison is base (b9797eb) 88.43% compared to head (2aecfa4) 88.43%.
FilesPatch %Lines
lightning/src/routing/router.rs0.00%2 Missing ⚠️
lightning/src/ln/msgs.rs50.00%1 Missing ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files
@@ Coverage Diff @@## main #2798 +/- ##
=======================================
Coverage 88.43% 88.43% =======================================
Files 114 114 Lines 91718 91718 Branches 91718 91718 =======================================
+ Hits 81109 81112 +3 - Misses 8126 8127 +1 + Partials 2483 2479 -4 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
wpaulino
wpaulino
previously approved these changes
Dec 15, 2023
View reviewed changes
@TheBlueMattTheBlueMatt
mentioned this pull request
Dec 15, 2023
 Merged

@TheBlueMatt
Un-export the PrivateRoute inner field as there are invariants
90cc993
When we make the `PrivateRoute` inner `RouteHint` `pub`, we failed
to note that the `PrivateRoute::new` constructor actually verifies
a length invariant. Thus, we un-export the inner field and force
users to go back through the `new` fn.
@TheBlueMatt
Drop explicit bitcoin_hashes dependency in lightning-invoice
83e76d7
Since `lightning-invoice` now depends on the `bitcoin` crate
directly, also depending on the `bitcoin_hashes` crate is redundant
and just means we confuse users by setting the `std` flag only on
`bitcoin`. Thus, we drop the explicit dependency here and replace
it with `bitcoin::hashes`.
@TheBlueMatt
Make FinalOnionHopData public
bb0ddad
In 4b5db8c, `channelmanager::PendingHTLCRouting` was made
public, exposing a `FinalOnionHopData` field to the world. However,
`FinalOnionHopData` was left crate-private, making the enum
impossible to construct.
There isn't a strong reason for this (even though the
`FinalOnionHopData` API is somewhat confusing, being separated from
the rest of the onion structs), so we expose it here.
@TheBlueMatt
Use correct default value when comparing to htlc_maximum_msat
642240e
62f8669 added two
`htlc_maximum_msat.unwrap_or`s, but used a default value of 0,
spuriously causing all HTLCs to fail if we don't have an htlc
maximum value. This should be mostly harmless, but we should fix it
anyway.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
759a213 to
642240eCompareDecember 15, 2023 22:33
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, added one more fixup from #2781.
@TheBlueMatt
Fix dev MSRV build of lightning-transaction-sync
2aecfa4
...due to a transitive dependency of the `bitcoind` crate.
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Also pushed a last-minute MSRV break in a dev-dep.
jkczyz
jkczyz
reviewed
Dec 15, 2023
View reviewed changes
Comment threadlightning/src/routing/router.rs
 .filter(|details| amount_msats <= details.inbound_capacity_msat)
 .filter(|details| amount_msats >= details.inbound_htlc_minimum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(u64::MAX))
@jkczyzjkczyzDec 15, 2023

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.

Hmm... I think my reasoning here was that inbound_htlc_maximum_msat should be set for usable channels. So if it is not set, using zero would cause us to not consider this channel.
It will be Some if ChannelContext::counterparty_selected_channel_reserve_satoshis is Some, which seems to be when accept_channel is received:
rust-lightning/lightning/src/ln/channel.rs

Line 6324
in
b9797eb
counterparty_selected_channel_reserve_satoshis:None,// Filled in in accept_channel
@TheBlueMattTheBlueMattDec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Hmm, yea, I mean it won't be set except if the channel isn't usable, but I'd kinda rather lean on get_inbound_payment_scid() to detect "is channel available for inbound usage" rather than htlc_max, but it doesn't really matter that much.
@TheBlueMatt
TheBlueMatt
merged commit ef2156a
into
lightningdevkit:mainDec 15, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jkczyzjkczyzjkczyz approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.119

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@wpaulino@codecov-commenter@jkczyz

, '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" + '
Small API cleanups pre-0.0.119 by TheBlueMatt · Pull Request #2798 · lightningdevkit/rust-lightning · GitHub
Skip to content
Small API cleanups pre-0.0.119 - #2798
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Dec 15, 2023
Merged
Small API cleanups pre-0.0.119#2798
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

Collaborator
A few small API cleanups that came up when generating bindings.
@TheBlueMattTheBlueMatt
added this to the 0.0.119 milestone
Dec 15, 2023
@wpaulino
wpaulino
commented
Dec 15, 2023

Copy link


Copy Markdown

Contributor
CI is sad
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
1350daa to
759a213CompareDecember 15, 2023 18:56
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@codecov-commenter
codecov-commenter
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: 3 lines in your changes are missing coverage. Please review.
Comparison is base (b9797eb) 88.43% compared to head (2aecfa4) 88.43%.
FilesPatch %Lines
lightning/src/routing/router.rs0.00%2 Missing ⚠️
lightning/src/ln/msgs.rs50.00%1 Missing ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files
@@ Coverage Diff @@## main #2798 +/- ##
=======================================
Coverage 88.43% 88.43% =======================================
Files 114 114 Lines 91718 91718 Branches 91718 91718 =======================================
+ Hits 81109 81112 +3 - Misses 8126 8127 +1 + Partials 2483 2479 -4 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
wpaulino
wpaulino
previously approved these changes
Dec 15, 2023
View reviewed changes
@TheBlueMattTheBlueMatt
mentioned this pull request
Dec 15, 2023
 Merged

@TheBlueMatt
Un-export the PrivateRoute inner field as there are invariants
90cc993
When we make the `PrivateRoute` inner `RouteHint` `pub`, we failed
to note that the `PrivateRoute::new` constructor actually verifies
a length invariant. Thus, we un-export the inner field and force
users to go back through the `new` fn.
@TheBlueMatt
Drop explicit bitcoin_hashes dependency in lightning-invoice
83e76d7
Since `lightning-invoice` now depends on the `bitcoin` crate
directly, also depending on the `bitcoin_hashes` crate is redundant
and just means we confuse users by setting the `std` flag only on
`bitcoin`. Thus, we drop the explicit dependency here and replace
it with `bitcoin::hashes`.
@TheBlueMatt
Make FinalOnionHopData public
bb0ddad
In 4b5db8c, `channelmanager::PendingHTLCRouting` was made
public, exposing a `FinalOnionHopData` field to the world. However,
`FinalOnionHopData` was left crate-private, making the enum
impossible to construct.
There isn't a strong reason for this (even though the
`FinalOnionHopData` API is somewhat confusing, being separated from
the rest of the onion structs), so we expose it here.
@TheBlueMatt
Use correct default value when comparing to htlc_maximum_msat
642240e
62f8669 added two
`htlc_maximum_msat.unwrap_or`s, but used a default value of 0,
spuriously causing all HTLCs to fail if we don't have an htlc
maximum value. This should be mostly harmless, but we should fix it
anyway.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
759a213 to
642240eCompareDecember 15, 2023 22:33
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, added one more fixup from #2781.
@TheBlueMatt
Fix dev MSRV build of lightning-transaction-sync
2aecfa4
...due to a transitive dependency of the `bitcoind` crate.
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Also pushed a last-minute MSRV break in a dev-dep.
jkczyz
jkczyz
reviewed
Dec 15, 2023
View reviewed changes
Comment threadlightning/src/routing/router.rs
 .filter(|details| amount_msats <= details.inbound_capacity_msat)
 .filter(|details| amount_msats >= details.inbound_htlc_minimum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(u64::MAX))
@jkczyzjkczyzDec 15, 2023

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.

Hmm... I think my reasoning here was that inbound_htlc_maximum_msat should be set for usable channels. So if it is not set, using zero would cause us to not consider this channel.
It will be Some if ChannelContext::counterparty_selected_channel_reserve_satoshis is Some, which seems to be when accept_channel is received:
rust-lightning/lightning/src/ln/channel.rs

Line 6324
in
b9797eb
counterparty_selected_channel_reserve_satoshis:None,// Filled in in accept_channel
@TheBlueMattTheBlueMattDec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Hmm, yea, I mean it won't be set except if the channel isn't usable, but I'd kinda rather lean on get_inbound_payment_scid() to detect "is channel available for inbound usage" rather than htlc_max, but it doesn't really matter that much.
@TheBlueMatt
TheBlueMatt
merged commit ef2156a
into
lightningdevkit:mainDec 15, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jkczyzjkczyzjkczyz approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.119

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@wpaulino@codecov-commenter@jkczyz

, '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('^' + ".*" + '
Small API cleanups pre-0.0.119 by TheBlueMatt · Pull Request #2798 · lightningdevkit/rust-lightning · GitHub
Skip to content
Small API cleanups pre-0.0.119 - #2798
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Dec 15, 2023
Merged
Small API cleanups pre-0.0.119#2798
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

Collaborator
A few small API cleanups that came up when generating bindings.
@TheBlueMattTheBlueMatt
added this to the 0.0.119 milestone
Dec 15, 2023
@wpaulino
wpaulino
commented
Dec 15, 2023

Copy link


Copy Markdown

Contributor
CI is sad
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
1350daa to
759a213CompareDecember 15, 2023 18:56
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@codecov-commenter
codecov-commenter
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: 3 lines in your changes are missing coverage. Please review.
Comparison is base (b9797eb) 88.43% compared to head (2aecfa4) 88.43%.
FilesPatch %Lines
lightning/src/routing/router.rs0.00%2 Missing ⚠️
lightning/src/ln/msgs.rs50.00%1 Missing ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files
@@ Coverage Diff @@## main #2798 +/- ##
=======================================
Coverage 88.43% 88.43% =======================================
Files 114 114 Lines 91718 91718 Branches 91718 91718 =======================================
+ Hits 81109 81112 +3 - Misses 8126 8127 +1 + Partials 2483 2479 -4 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
wpaulino
wpaulino
previously approved these changes
Dec 15, 2023
View reviewed changes
@TheBlueMattTheBlueMatt
mentioned this pull request
Dec 15, 2023
 Merged

@TheBlueMatt
Un-export the PrivateRoute inner field as there are invariants
90cc993
When we make the `PrivateRoute` inner `RouteHint` `pub`, we failed
to note that the `PrivateRoute::new` constructor actually verifies
a length invariant. Thus, we un-export the inner field and force
users to go back through the `new` fn.
@TheBlueMatt
Drop explicit bitcoin_hashes dependency in lightning-invoice
83e76d7
Since `lightning-invoice` now depends on the `bitcoin` crate
directly, also depending on the `bitcoin_hashes` crate is redundant
and just means we confuse users by setting the `std` flag only on
`bitcoin`. Thus, we drop the explicit dependency here and replace
it with `bitcoin::hashes`.
@TheBlueMatt
Make FinalOnionHopData public
bb0ddad
In 4b5db8c, `channelmanager::PendingHTLCRouting` was made
public, exposing a `FinalOnionHopData` field to the world. However,
`FinalOnionHopData` was left crate-private, making the enum
impossible to construct.
There isn't a strong reason for this (even though the
`FinalOnionHopData` API is somewhat confusing, being separated from
the rest of the onion structs), so we expose it here.
@TheBlueMatt
Use correct default value when comparing to htlc_maximum_msat
642240e
62f8669 added two
`htlc_maximum_msat.unwrap_or`s, but used a default value of 0,
spuriously causing all HTLCs to fail if we don't have an htlc
maximum value. This should be mostly harmless, but we should fix it
anyway.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
759a213 to
642240eCompareDecember 15, 2023 22:33
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, added one more fixup from #2781.
@TheBlueMatt
Fix dev MSRV build of lightning-transaction-sync
2aecfa4
...due to a transitive dependency of the `bitcoind` crate.
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Also pushed a last-minute MSRV break in a dev-dep.
jkczyz
jkczyz
reviewed
Dec 15, 2023
View reviewed changes
Comment threadlightning/src/routing/router.rs
 .filter(|details| amount_msats <= details.inbound_capacity_msat)
 .filter(|details| amount_msats >= details.inbound_htlc_minimum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(u64::MAX))
@jkczyzjkczyzDec 15, 2023

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.

Hmm... I think my reasoning here was that inbound_htlc_maximum_msat should be set for usable channels. So if it is not set, using zero would cause us to not consider this channel.
It will be Some if ChannelContext::counterparty_selected_channel_reserve_satoshis is Some, which seems to be when accept_channel is received:
rust-lightning/lightning/src/ln/channel.rs

Line 6324
in
b9797eb
counterparty_selected_channel_reserve_satoshis:None,// Filled in in accept_channel
@TheBlueMattTheBlueMattDec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Hmm, yea, I mean it won't be set except if the channel isn't usable, but I'd kinda rather lean on get_inbound_payment_scid() to detect "is channel available for inbound usage" rather than htlc_max, but it doesn't really matter that much.
@TheBlueMatt
TheBlueMatt
merged commit ef2156a
into
lightningdevkit:mainDec 15, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jkczyzjkczyzjkczyz approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.119

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@wpaulino@codecov-commenter@jkczyz

, '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('^' + ".*" + '
Small API cleanups pre-0.0.119 by TheBlueMatt · Pull Request #2798 · lightningdevkit/rust-lightning · GitHub
Skip to content
Small API cleanups pre-0.0.119 - #2798
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Dec 15, 2023
Merged
Small API cleanups pre-0.0.119#2798
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

Collaborator
A few small API cleanups that came up when generating bindings.
@TheBlueMattTheBlueMatt
added this to the 0.0.119 milestone
Dec 15, 2023
@wpaulino
wpaulino
commented
Dec 15, 2023

Copy link


Copy Markdown

Contributor
CI is sad
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
1350daa to
759a213CompareDecember 15, 2023 18:56
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@codecov-commenter
codecov-commenter
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: 3 lines in your changes are missing coverage. Please review.
Comparison is base (b9797eb) 88.43% compared to head (2aecfa4) 88.43%.
FilesPatch %Lines
lightning/src/routing/router.rs0.00%2 Missing ⚠️
lightning/src/ln/msgs.rs50.00%1 Missing ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files
@@ Coverage Diff @@## main #2798 +/- ##
=======================================
Coverage 88.43% 88.43% =======================================
Files 114 114 Lines 91718 91718 Branches 91718 91718 =======================================
+ Hits 81109 81112 +3 - Misses 8126 8127 +1 + Partials 2483 2479 -4 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
wpaulino
wpaulino
previously approved these changes
Dec 15, 2023
View reviewed changes
@TheBlueMattTheBlueMatt
mentioned this pull request
Dec 15, 2023
 Merged

@TheBlueMatt
Un-export the PrivateRoute inner field as there are invariants
90cc993
When we make the `PrivateRoute` inner `RouteHint` `pub`, we failed
to note that the `PrivateRoute::new` constructor actually verifies
a length invariant. Thus, we un-export the inner field and force
users to go back through the `new` fn.
@TheBlueMatt
Drop explicit bitcoin_hashes dependency in lightning-invoice
83e76d7
Since `lightning-invoice` now depends on the `bitcoin` crate
directly, also depending on the `bitcoin_hashes` crate is redundant
and just means we confuse users by setting the `std` flag only on
`bitcoin`. Thus, we drop the explicit dependency here and replace
it with `bitcoin::hashes`.
@TheBlueMatt
Make FinalOnionHopData public
bb0ddad
In 4b5db8c, `channelmanager::PendingHTLCRouting` was made
public, exposing a `FinalOnionHopData` field to the world. However,
`FinalOnionHopData` was left crate-private, making the enum
impossible to construct.
There isn't a strong reason for this (even though the
`FinalOnionHopData` API is somewhat confusing, being separated from
the rest of the onion structs), so we expose it here.
@TheBlueMatt
Use correct default value when comparing to htlc_maximum_msat
642240e
62f8669 added two
`htlc_maximum_msat.unwrap_or`s, but used a default value of 0,
spuriously causing all HTLCs to fail if we don't have an htlc
maximum value. This should be mostly harmless, but we should fix it
anyway.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
759a213 to
642240eCompareDecember 15, 2023 22:33
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, added one more fixup from #2781.
@TheBlueMatt
Fix dev MSRV build of lightning-transaction-sync
2aecfa4
...due to a transitive dependency of the `bitcoind` crate.
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Also pushed a last-minute MSRV break in a dev-dep.
jkczyz
jkczyz
reviewed
Dec 15, 2023
View reviewed changes
Comment threadlightning/src/routing/router.rs
 .filter(|details| amount_msats <= details.inbound_capacity_msat)
 .filter(|details| amount_msats >= details.inbound_htlc_minimum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(u64::MAX))
@jkczyzjkczyzDec 15, 2023

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.

Hmm... I think my reasoning here was that inbound_htlc_maximum_msat should be set for usable channels. So if it is not set, using zero would cause us to not consider this channel.
It will be Some if ChannelContext::counterparty_selected_channel_reserve_satoshis is Some, which seems to be when accept_channel is received:
rust-lightning/lightning/src/ln/channel.rs

Line 6324
in
b9797eb
counterparty_selected_channel_reserve_satoshis:None,// Filled in in accept_channel
@TheBlueMattTheBlueMattDec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Hmm, yea, I mean it won't be set except if the channel isn't usable, but I'd kinda rather lean on get_inbound_payment_scid() to detect "is channel available for inbound usage" rather than htlc_max, but it doesn't really matter that much.
@TheBlueMatt
TheBlueMatt
merged commit ef2156a
into
lightningdevkit:mainDec 15, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jkczyzjkczyzjkczyz approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.119

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@wpaulino@codecov-commenter@jkczyz

, '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); }
})();
})();
Small API cleanups pre-0.0.119 by TheBlueMatt · Pull Request #2798 · lightningdevkit/rust-lightning · GitHub
Skip to content
Small API cleanups pre-0.0.119 - #2798
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Dec 15, 2023
Merged
Small API cleanups pre-0.0.119#2798
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-12-119-bindings-upstream
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

Collaborator
A few small API cleanups that came up when generating bindings.
@TheBlueMattTheBlueMatt
added this to the 0.0.119 milestone
Dec 15, 2023
@wpaulino
wpaulino
commented
Dec 15, 2023

Copy link


Copy Markdown

Contributor
CI is sad
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
1350daa to
759a213CompareDecember 15, 2023 18:56
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@codecov-commenter
codecov-commenter
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: 3 lines in your changes are missing coverage. Please review.
Comparison is base (b9797eb) 88.43% compared to head (2aecfa4) 88.43%.
FilesPatch %Lines
lightning/src/routing/router.rs0.00%2 Missing ⚠️
lightning/src/ln/msgs.rs50.00%1 Missing ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files
@@ Coverage Diff @@## main #2798 +/- ##
=======================================
Coverage 88.43% 88.43% =======================================
Files 114 114 Lines 91718 91718 Branches 91718 91718 =======================================
+ Hits 81109 81112 +3 - Misses 8126 8127 +1 + Partials 2483 2479 -4 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
wpaulino
wpaulino
previously approved these changes
Dec 15, 2023
View reviewed changes
@TheBlueMattTheBlueMatt
mentioned this pull request
Dec 15, 2023
 Merged

@TheBlueMatt
Un-export the PrivateRoute inner field as there are invariants
90cc993
When we make the `PrivateRoute` inner `RouteHint` `pub`, we failed
to note that the `PrivateRoute::new` constructor actually verifies
a length invariant. Thus, we un-export the inner field and force
users to go back through the `new` fn.
@TheBlueMatt
Drop explicit bitcoin_hashes dependency in lightning-invoice
83e76d7
Since `lightning-invoice` now depends on the `bitcoin` crate
directly, also depending on the `bitcoin_hashes` crate is redundant
and just means we confuse users by setting the `std` flag only on
`bitcoin`. Thus, we drop the explicit dependency here and replace
it with `bitcoin::hashes`.
@TheBlueMatt
Make FinalOnionHopData public
bb0ddad
In 4b5db8c, `channelmanager::PendingHTLCRouting` was made
public, exposing a `FinalOnionHopData` field to the world. However,
`FinalOnionHopData` was left crate-private, making the enum
impossible to construct.
There isn't a strong reason for this (even though the
`FinalOnionHopData` API is somewhat confusing, being separated from
the rest of the onion structs), so we expose it here.
@TheBlueMatt
Use correct default value when comparing to htlc_maximum_msat
642240e
62f8669 added two
`htlc_maximum_msat.unwrap_or`s, but used a default value of 0,
spuriously causing all HTLCs to fail if we don't have an htlc
maximum value. This should be mostly harmless, but we should fix it
anyway.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-12-119-bindings-upstream
branch
from
759a213 to
642240eCompareDecember 15, 2023 22:33
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Oops, added one more fixup from #2781.
@TheBlueMatt
Fix dev MSRV build of lightning-transaction-sync
2aecfa4
...due to a transitive dependency of the `bitcoind` crate.
@TheBlueMatt
TheBlueMatt
commented
Dec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Also pushed a last-minute MSRV break in a dev-dep.
jkczyz
jkczyz
reviewed
Dec 15, 2023
View reviewed changes
Comment threadlightning/src/routing/router.rs
 .filter(|details| amount_msats <= details.inbound_capacity_msat)
 .filter(|details| amount_msats >= details.inbound_htlc_minimum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(0))
 .filter(|details| amount_msats <= details.inbound_htlc_maximum_msat.unwrap_or(u64::MAX))
@jkczyzjkczyzDec 15, 2023

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.

Hmm... I think my reasoning here was that inbound_htlc_maximum_msat should be set for usable channels. So if it is not set, using zero would cause us to not consider this channel.
It will be Some if ChannelContext::counterparty_selected_channel_reserve_satoshis is Some, which seems to be when accept_channel is received:
rust-lightning/lightning/src/ln/channel.rs

Line 6324
in
b9797eb
counterparty_selected_channel_reserve_satoshis:None,// Filled in in accept_channel
@TheBlueMattTheBlueMattDec 15, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Hmm, yea, I mean it won't be set except if the channel isn't usable, but I'd kinda rather lean on get_inbound_payment_scid() to detect "is channel available for inbound usage" rather than htlc_max, but it doesn't really matter that much.
@TheBlueMatt
TheBlueMatt
merged commit ef2156a
into
lightningdevkit:mainDec 15, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jkczyzjkczyzjkczyz approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.119

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@wpaulino@codecov-commenter@jkczyz