Invoice chanman utility - #895

Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom
valentinewallace:invoice-chanman-utility
Apr 29, 2021
Merged

Invoice chanman utility#895
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom
valentinewallace:invoice-chanman-utility

Conversation

@valentinewallace

@valentinewallacevalentinewallace commented Apr 23, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

TODO: tests

Based on #893

@codecov

codecovBot commented Apr 23, 2021•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #895 (7794708) into main (3be185a) will decrease coverage by 0.01%.
The diff coverage is 64.28%.

❗ Current head 7794708 differs from pull request most recent head 4c7be7e. Consider uploading reports for the commit 4c7be7e to get more accurate results
Impacted file tree graph

@@ Coverage Diff @@## main #895 +/- ##
==========================================
- Coverage 90.38% 90.36% -0.02% 
==========================================
Files 57 58 +1 Lines 29500 29505 +5 ==========================================
- Hits 26663 26662 -1 - Misses 2837 2843 +6
Impacted FilesCoverage Δ
lightning-invoice/src/de.rs80.99% <ø> (-0.15%)⬇️
lightning-invoice/src/lib.rs83.28% <ø> (-0.06%)⬇️
lightning-invoice/src/ser.rs91.76% <ø> (-0.19%)⬇️
lightning/src/chain/channelmonitor.rs95.45% <ø> (ø)
lightning/src/chain/keysinterface.rs93.01% <0.00%> (-0.62%)⬇️
lightning/src/ln/chan_utils.rs97.34% <ø> (ø)
lightning/src/ln/chanmon_update_fail_tests.rs97.64% <ø> (ø)
lightning/src/ln/channel.rs87.41% <0.00%> (-0.04%)⬇️
lightning/src/ln/channelmanager.rs83.38% <ø> (-0.05%)⬇️
lightning/src/ln/functional_test_utils.rs95.06% <ø> (ø)
... and 12 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3be185a...4c7be7e. Read the comment docs.

TheBlueMatt
TheBlueMatt reviewed Apr 24, 2021
View reviewed changes

@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.

Looks good.

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
@TheBlueMattTheBlueMatt mentioned this pull request Apr 26, 2021
Merged
@valentinewallace
valentinewallaceforce-pushed the invoice-chanman-utility branch 3 times, most recently from fec5fa5 to 7d5ebb2CompareApril 28, 2021 16:50
@valentinewallace
valentinewallace marked this pull request as ready for review April 28, 2021 16:50
@valentinewallace
valentinewallaceforce-pushed the invoice-chanman-utility branch 4 times, most recently from 78b8298 to 4d5f112CompareApril 28, 2021 18:47
jkczyz
jkczyz reviewed Apr 28, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
TheBlueMatt
TheBlueMatt reviewed Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/Cargo.toml Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
@TheBlueMatt

TheBlueMatt commented Apr 28, 2021

Copy link
Copy Markdown
Collaborator

Can now be rebased after the merge of #893.

@valentinewallace
valentinewallaceforce-pushed the invoice-chanman-utility branch 2 times, most recently from b3d0434 to 5dfb86aCompareApril 28, 2021 21:43
TheBlueMatt
TheBlueMatt reviewed Apr 28, 2021
View reviewed changes
Comment threadlightning/Cargo.toml
@valentinewallace
valentinewallaceforce-pushed the invoice-chanman-utility branch 2 times, most recently from 8cd714c to 5a478c7CompareApril 28, 2021 22:16
ariard
ariard reviewed Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs Outdated
L::Target: Logger,
{
// Marshall route hints.
let our_channels = channelmanager.list_usable_channels();

@ariardariardApr 28, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

IIUC this utility returns as routing hints the complete set of our channels, including the non-announced subset one ?

Sounds pretty harmful for privacy, maybe the utility should have a boolean all or otherwise a Vec<short_channel_id> to precise which ones to disclose ?

@TheBlueMattTheBlueMattApr 29, 2021

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.

I think this is the right default to this - in most cases if we're a "client" node we only have one or two channels anyway (and in non-"client" cases we have several channels that are public), and the "real" fix is to generate random short channel ids.

@ariardariardApr 29, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Agree for the "client" node but for a big hub you will disclose all your private channels with spoke if you're also a merchant which is quite the case of a bunch of such nodes. Though opening an issue for now, we'll adjust in function of users feedback.

@TheBlueMattTheBlueMattApr 29, 2021

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.

Right, we ultimately need some heuristic of "we have > 5 public channels, we shouldn't include any route hints at all", probably.

Comment threadlightning-invoice/src/lib.rs Outdated
ariard
ariard reviewed Apr 28, 2021
View reviewed changes

@ariardariard left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Otherwise sounds good to me :)

jkczyz
jkczyz reviewed Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadfuzz/src/full_stack.rs Outdated
@valentinewallace
valentinewallaceforce-pushed the invoice-chanman-utility branch 3 times, most recently from 5dd106d to 9ab3a9cCompareApril 29, 2021 16:29
@valentinewallace

valentinewallace commented Apr 29, 2021

Copy link
Copy Markdown
ContributorAuthor

Oops, need to switch sign_invoice to return a Result. Otherwise I think this is roughly what it's gonna look like.

@valentinewallace
valentinewallaceforce-pushed the invoice-chanman-utility branch 2 times, most recently from 1e34c16 to e2f81e3CompareApril 29, 2021 17:01
jkczyz
jkczyz reviewed Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
TheBlueMatt
TheBlueMatt reviewed Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
Comment threadlightning-invoice/src/lib.rs Outdated
@valentinewallace

valentinewallace commented Apr 29, 2021

Copy link
Copy Markdown
ContributorAuthor

Gonna have lunch then come back to this

TheBlueMatt
TheBlueMatt reviewed Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs Outdated
@TheBlueMattTheBlueMatt added this to the 0.0.14 milestone Apr 29, 2021
TheBlueMatt
TheBlueMatt reviewed Apr 29, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs Outdated
@valentinewallace
valentinewallaceforce-pushed the invoice-chanman-utility branch 3 times, most recently from c1f9f87 to 50c0a99CompareApril 29, 2021 20:36
TheBlueMatt
TheBlueMatt reviewed Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs Outdated
jkczyz
jkczyz reviewed Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs Outdated
Comment threadlightning-invoice/src/utils.rs Outdated
Comment threadlightning-invoice/src/utils.rs Outdated
Comment threadlightning-invoice/src/utils.rs Outdated
TheBlueMatt
TheBlueMatt reviewed Apr 29, 2021
View reviewed changes

@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.

Aside from Jeff's comments and #895 (comment) this LGTM.

@TheBlueMattTheBlueMatt mentioned this pull request Apr 29, 2021
Merged
jkczyz
jkczyz approved these changes Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs Outdated
TheBlueMatt
TheBlueMatt requested changes Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs Outdated
@valentinewallace

valentinewallace commented Apr 29, 2021

Copy link
Copy Markdown
ContributorAuthor

Gah my bad, fixed

TheBlueMatt
TheBlueMatt reviewed Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs Outdated
Comment threadlightning-invoice/src/utils.rs Outdated
@valentinewallace
Add utility to create an invoice using the ChannelManager
4c7be7e
This also allows the ChannelManager to track information for inbound payments
to check the PaymentSecret on receive.
@TheBlueMatt
TheBlueMatt merged commit 3b67be2 into lightningdevkit:mainApr 29, 2021
TheBlueMatt added a commit to TheBlueMatt/rust-lightning that referenced this pull request Apr 30, 2021
@TheBlueMatt
Fix merge conflicts betweenlightningdevkit#898andlightningdevkit#895.
8cde7e8
TheBlueMatt added a commit that referenced this pull request Apr 30, 2021
@TheBlueMatt
Merge pull request#907from TheBlueMatt/2021-04-merge-conflicts
e26c3df
Fix merge conflicts between #898 and #895.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@devrandomdevrandomdevrandom left review comments
@TheBlueMattTheBlueMattTheBlueMatt requested changes
@jkczyzjkczyzjkczyz approved these changes
+1 more reviewer
@ariardariardariard left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

0.0.14

Development

Successfully merging this pull request may close these issues.

5 participants

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

Skip to content
Invoice chanman utility - #895
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Apr 29, 2021
Merged
Invoice chanman utility#895
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
TODO: tests
Based on #893
@codecov
codecovBot
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #895 (7794708) into main (3be185a) will decrease coverage by 0.01%.

The diff coverage is 64.28%.
❗ Current head 7794708 differs from pull request most recent head 4c7be7e. Consider uploading reports for the commit 4c7be7e to get more accurate results
Impacted file tree graph
@@ Coverage Diff @@## main #895 +/- ##
==========================================
- Coverage 90.38% 90.36% -0.02% 
==========================================
Files 57 58 +1 Lines 29500 29505 +5 ==========================================
- Hits 26663 26662 -1 - Misses 2837 2843 +6 
Impacted FilesCoverage Δ
lightning-invoice/src/de.rs80.99% <ø> (-0.15%)⬇️
lightning-invoice/src/lib.rs83.28% <ø> (-0.06%)⬇️
lightning-invoice/src/ser.rs91.76% <ø> (-0.19%)⬇️
lightning/src/chain/channelmonitor.rs95.45% <ø> (ø)
lightning/src/chain/keysinterface.rs93.01% <0.00%> (-0.62%)⬇️
lightning/src/ln/chan_utils.rs97.34% <ø> (ø)
lightning/src/ln/chanmon_update_fail_tests.rs97.64% <ø> (ø)
lightning/src/ln/channel.rs87.41% <0.00%> (-0.04%)⬇️
lightning/src/ln/channelmanager.rs83.38% <ø> (-0.05%)⬇️
lightning/src/ln/functional_test_utils.rs95.06% <ø> (ø)
... and 12 more
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 3be185a...4c7be7e. Read the comment docs.
TheBlueMatt
TheBlueMatt
reviewed
Apr 24, 2021
View reviewed changes
@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.

Looks good.
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 26, 2021
 Merged

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
fec5fa5 to
7d5ebb2CompareApril 28, 2021 16:50
@valentinewallace
valentinewallace
marked this pull request as ready for review
April 28, 2021 16:50
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
4 times, most recently
from
78b8298 to
4d5f112CompareApril 28, 2021 18:47
jkczyz
jkczyz
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/Cargo.toml
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMatt
TheBlueMatt
commented
Apr 28, 2021

Copy link


Copy Markdown

Collaborator
Can now be rebased after the merge of #893.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
b3d0434 to
5dfb86aCompareApril 28, 2021 21:43
TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/Cargo.toml
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
8cd714c to
5a478c7CompareApril 28, 2021 22:16
ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

 L::Target: Logger,
	{
 // Marshall route hints.
 let our_channels = channelmanager.list_usable_channels();
@ariardariardApr 28, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

IIUC this utility returns as routing hints the complete set of our channels, including the non-announced subset one ?
Sounds pretty harmful for privacy, maybe the utility should have a boolean all or otherwise a Vec<short_channel_id> to precise which ones to disclose ?
@TheBlueMattTheBlueMattApr 29, 2021

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.

I think this is the right default to this - in most cases if we're a "client" node we only have one or two channels anyway (and in non-"client" cases we have several channels that are public), and the "real" fix is to generate random short channel ids.
@ariardariardApr 29, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Agree for the "client" node but for a big hub you will disclose all your private channels with spoke if you're also a merchant which is quite the case of a bunch of such nodes. Though opening an issue for now, we'll adjust in function of users feedback.
@TheBlueMattTheBlueMattApr 29, 2021

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.

Right, we ultimately need some heuristic of "we have > 5 public channels, we shouldn't include any route hints at all", probably.
Comment threadlightning-invoice/src/lib.rs
Outdated

ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
@ariardariard
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Otherwise sounds good to me :)
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadfuzz/src/full_stack.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
5dd106d to
9ab3a9cCompareApril 29, 2021 16:29
@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Oops, need to switch sign_invoice to return a Result. Otherwise I think this is roughly what it's gonna look like.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
1e34c16 to
e2f81e3CompareApril 29, 2021 17:01
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gonna have lunch then come back to this
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

@TheBlueMattTheBlueMatt
added this to the 0.0.14 milestone
Apr 29, 2021
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
c1f9f87 to
50c0a99CompareApril 29, 2021 20:36
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
@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.

Aside from Jeff's comments and #895 (comment) this LGTM.
@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 29, 2021
 Merged

jkczyz
jkczyz
approved these changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
requested changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gah my bad, fixed
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
Add utility to create an invoice using the ChannelManager
4c7be7e
This also allows the ChannelManager to track information for inbound payments
to check the PaymentSecret on receive.
@TheBlueMatt
TheBlueMatt
merged commit 3b67be2
into
lightningdevkit:mainApr 29, 2021
TheBlueMatt added a commit
to TheBlueMatt/rust-lightning
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Fix merge conflicts betweenlightningdevkit#898andlightningdevkit#895.
8cde7e8
TheBlueMatt added a commit
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Merge pull request#907from TheBlueMatt/2021-04-merge-conflicts
e26c3df
Fix merge conflicts between #898 and #895.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@devrandomdevrandomdevrandom left review comments
@TheBlueMattTheBlueMattTheBlueMatt requested changes
@jkczyzjkczyzjkczyz approved these changes

+1 more reviewer

@ariardariardariard left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.14

Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@devrandom@jkczyz@ariard

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

Skip to content
Invoice chanman utility - #895
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Apr 29, 2021
Merged
Invoice chanman utility#895
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
TODO: tests
Based on #893
@codecov
codecovBot
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #895 (7794708) into main (3be185a) will decrease coverage by 0.01%.

The diff coverage is 64.28%.
❗ Current head 7794708 differs from pull request most recent head 4c7be7e. Consider uploading reports for the commit 4c7be7e to get more accurate results
Impacted file tree graph
@@ Coverage Diff @@## main #895 +/- ##
==========================================
- Coverage 90.38% 90.36% -0.02% 
==========================================
Files 57 58 +1 Lines 29500 29505 +5 ==========================================
- Hits 26663 26662 -1 - Misses 2837 2843 +6 
Impacted FilesCoverage Δ
lightning-invoice/src/de.rs80.99% <ø> (-0.15%)⬇️
lightning-invoice/src/lib.rs83.28% <ø> (-0.06%)⬇️
lightning-invoice/src/ser.rs91.76% <ø> (-0.19%)⬇️
lightning/src/chain/channelmonitor.rs95.45% <ø> (ø)
lightning/src/chain/keysinterface.rs93.01% <0.00%> (-0.62%)⬇️
lightning/src/ln/chan_utils.rs97.34% <ø> (ø)
lightning/src/ln/chanmon_update_fail_tests.rs97.64% <ø> (ø)
lightning/src/ln/channel.rs87.41% <0.00%> (-0.04%)⬇️
lightning/src/ln/channelmanager.rs83.38% <ø> (-0.05%)⬇️
lightning/src/ln/functional_test_utils.rs95.06% <ø> (ø)
... and 12 more
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 3be185a...4c7be7e. Read the comment docs.
TheBlueMatt
TheBlueMatt
reviewed
Apr 24, 2021
View reviewed changes
@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.

Looks good.
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 26, 2021
 Merged

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
fec5fa5 to
7d5ebb2CompareApril 28, 2021 16:50
@valentinewallace
valentinewallace
marked this pull request as ready for review
April 28, 2021 16:50
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
4 times, most recently
from
78b8298 to
4d5f112CompareApril 28, 2021 18:47
jkczyz
jkczyz
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/Cargo.toml
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMatt
TheBlueMatt
commented
Apr 28, 2021

Copy link


Copy Markdown

Collaborator
Can now be rebased after the merge of #893.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
b3d0434 to
5dfb86aCompareApril 28, 2021 21:43
TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/Cargo.toml
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
8cd714c to
5a478c7CompareApril 28, 2021 22:16
ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

 L::Target: Logger,
	{
 // Marshall route hints.
 let our_channels = channelmanager.list_usable_channels();
@ariardariardApr 28, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

IIUC this utility returns as routing hints the complete set of our channels, including the non-announced subset one ?
Sounds pretty harmful for privacy, maybe the utility should have a boolean all or otherwise a Vec<short_channel_id> to precise which ones to disclose ?
@TheBlueMattTheBlueMattApr 29, 2021

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.

I think this is the right default to this - in most cases if we're a "client" node we only have one or two channels anyway (and in non-"client" cases we have several channels that are public), and the "real" fix is to generate random short channel ids.
@ariardariardApr 29, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Agree for the "client" node but for a big hub you will disclose all your private channels with spoke if you're also a merchant which is quite the case of a bunch of such nodes. Though opening an issue for now, we'll adjust in function of users feedback.
@TheBlueMattTheBlueMattApr 29, 2021

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.

Right, we ultimately need some heuristic of "we have > 5 public channels, we shouldn't include any route hints at all", probably.
Comment threadlightning-invoice/src/lib.rs
Outdated

ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
@ariardariard
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Otherwise sounds good to me :)
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadfuzz/src/full_stack.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
5dd106d to
9ab3a9cCompareApril 29, 2021 16:29
@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Oops, need to switch sign_invoice to return a Result. Otherwise I think this is roughly what it's gonna look like.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
1e34c16 to
e2f81e3CompareApril 29, 2021 17:01
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gonna have lunch then come back to this
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

@TheBlueMattTheBlueMatt
added this to the 0.0.14 milestone
Apr 29, 2021
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
c1f9f87 to
50c0a99CompareApril 29, 2021 20:36
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
@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.

Aside from Jeff's comments and #895 (comment) this LGTM.
@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 29, 2021
 Merged

jkczyz
jkczyz
approved these changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
requested changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gah my bad, fixed
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
Add utility to create an invoice using the ChannelManager
4c7be7e
This also allows the ChannelManager to track information for inbound payments
to check the PaymentSecret on receive.
@TheBlueMatt
TheBlueMatt
merged commit 3b67be2
into
lightningdevkit:mainApr 29, 2021
TheBlueMatt added a commit
to TheBlueMatt/rust-lightning
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Fix merge conflicts betweenlightningdevkit#898andlightningdevkit#895.
8cde7e8
TheBlueMatt added a commit
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Merge pull request#907from TheBlueMatt/2021-04-merge-conflicts
e26c3df
Fix merge conflicts between #898 and #895.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@devrandomdevrandomdevrandom left review comments
@TheBlueMattTheBlueMattTheBlueMatt requested changes
@jkczyzjkczyzjkczyz approved these changes

+1 more reviewer

@ariardariardariard left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.14

Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@devrandom@jkczyz@ariard

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

Skip to content
Invoice chanman utility - #895
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Apr 29, 2021
Merged
Invoice chanman utility#895
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
TODO: tests
Based on #893
@codecov
codecovBot
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #895 (7794708) into main (3be185a) will decrease coverage by 0.01%.

The diff coverage is 64.28%.
❗ Current head 7794708 differs from pull request most recent head 4c7be7e. Consider uploading reports for the commit 4c7be7e to get more accurate results
Impacted file tree graph
@@ Coverage Diff @@## main #895 +/- ##
==========================================
- Coverage 90.38% 90.36% -0.02% 
==========================================
Files 57 58 +1 Lines 29500 29505 +5 ==========================================
- Hits 26663 26662 -1 - Misses 2837 2843 +6 
Impacted FilesCoverage Δ
lightning-invoice/src/de.rs80.99% <ø> (-0.15%)⬇️
lightning-invoice/src/lib.rs83.28% <ø> (-0.06%)⬇️
lightning-invoice/src/ser.rs91.76% <ø> (-0.19%)⬇️
lightning/src/chain/channelmonitor.rs95.45% <ø> (ø)
lightning/src/chain/keysinterface.rs93.01% <0.00%> (-0.62%)⬇️
lightning/src/ln/chan_utils.rs97.34% <ø> (ø)
lightning/src/ln/chanmon_update_fail_tests.rs97.64% <ø> (ø)
lightning/src/ln/channel.rs87.41% <0.00%> (-0.04%)⬇️
lightning/src/ln/channelmanager.rs83.38% <ø> (-0.05%)⬇️
lightning/src/ln/functional_test_utils.rs95.06% <ø> (ø)
... and 12 more
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 3be185a...4c7be7e. Read the comment docs.
TheBlueMatt
TheBlueMatt
reviewed
Apr 24, 2021
View reviewed changes
@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.

Looks good.
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 26, 2021
 Merged

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
fec5fa5 to
7d5ebb2CompareApril 28, 2021 16:50
@valentinewallace
valentinewallace
marked this pull request as ready for review
April 28, 2021 16:50
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
4 times, most recently
from
78b8298 to
4d5f112CompareApril 28, 2021 18:47
jkczyz
jkczyz
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/Cargo.toml
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMatt
TheBlueMatt
commented
Apr 28, 2021

Copy link


Copy Markdown

Collaborator
Can now be rebased after the merge of #893.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
b3d0434 to
5dfb86aCompareApril 28, 2021 21:43
TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/Cargo.toml
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
8cd714c to
5a478c7CompareApril 28, 2021 22:16
ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

 L::Target: Logger,
	{
 // Marshall route hints.
 let our_channels = channelmanager.list_usable_channels();
@ariardariardApr 28, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

IIUC this utility returns as routing hints the complete set of our channels, including the non-announced subset one ?
Sounds pretty harmful for privacy, maybe the utility should have a boolean all or otherwise a Vec<short_channel_id> to precise which ones to disclose ?
@TheBlueMattTheBlueMattApr 29, 2021

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.

I think this is the right default to this - in most cases if we're a "client" node we only have one or two channels anyway (and in non-"client" cases we have several channels that are public), and the "real" fix is to generate random short channel ids.
@ariardariardApr 29, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Agree for the "client" node but for a big hub you will disclose all your private channels with spoke if you're also a merchant which is quite the case of a bunch of such nodes. Though opening an issue for now, we'll adjust in function of users feedback.
@TheBlueMattTheBlueMattApr 29, 2021

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.

Right, we ultimately need some heuristic of "we have > 5 public channels, we shouldn't include any route hints at all", probably.
Comment threadlightning-invoice/src/lib.rs
Outdated

ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
@ariardariard
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Otherwise sounds good to me :)
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadfuzz/src/full_stack.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
5dd106d to
9ab3a9cCompareApril 29, 2021 16:29
@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Oops, need to switch sign_invoice to return a Result. Otherwise I think this is roughly what it's gonna look like.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
1e34c16 to
e2f81e3CompareApril 29, 2021 17:01
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gonna have lunch then come back to this
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

@TheBlueMattTheBlueMatt
added this to the 0.0.14 milestone
Apr 29, 2021
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
c1f9f87 to
50c0a99CompareApril 29, 2021 20:36
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
@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.

Aside from Jeff's comments and #895 (comment) this LGTM.
@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 29, 2021
 Merged

jkczyz
jkczyz
approved these changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
requested changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gah my bad, fixed
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
Add utility to create an invoice using the ChannelManager
4c7be7e
This also allows the ChannelManager to track information for inbound payments
to check the PaymentSecret on receive.
@TheBlueMatt
TheBlueMatt
merged commit 3b67be2
into
lightningdevkit:mainApr 29, 2021
TheBlueMatt added a commit
to TheBlueMatt/rust-lightning
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Fix merge conflicts betweenlightningdevkit#898andlightningdevkit#895.
8cde7e8
TheBlueMatt added a commit
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Merge pull request#907from TheBlueMatt/2021-04-merge-conflicts
e26c3df
Fix merge conflicts between #898 and #895.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@devrandomdevrandomdevrandom left review comments
@TheBlueMattTheBlueMattTheBlueMatt requested changes
@jkczyzjkczyzjkczyz approved these changes

+1 more reviewer

@ariardariardariard left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.14

Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@devrandom@jkczyz@ariard

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

Skip to content
Invoice chanman utility - #895
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Apr 29, 2021
Merged
Invoice chanman utility#895
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
TODO: tests
Based on #893
@codecov
codecovBot
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #895 (7794708) into main (3be185a) will decrease coverage by 0.01%.

The diff coverage is 64.28%.
❗ Current head 7794708 differs from pull request most recent head 4c7be7e. Consider uploading reports for the commit 4c7be7e to get more accurate results
Impacted file tree graph
@@ Coverage Diff @@## main #895 +/- ##
==========================================
- Coverage 90.38% 90.36% -0.02% 
==========================================
Files 57 58 +1 Lines 29500 29505 +5 ==========================================
- Hits 26663 26662 -1 - Misses 2837 2843 +6 
Impacted FilesCoverage Δ
lightning-invoice/src/de.rs80.99% <ø> (-0.15%)⬇️
lightning-invoice/src/lib.rs83.28% <ø> (-0.06%)⬇️
lightning-invoice/src/ser.rs91.76% <ø> (-0.19%)⬇️
lightning/src/chain/channelmonitor.rs95.45% <ø> (ø)
lightning/src/chain/keysinterface.rs93.01% <0.00%> (-0.62%)⬇️
lightning/src/ln/chan_utils.rs97.34% <ø> (ø)
lightning/src/ln/chanmon_update_fail_tests.rs97.64% <ø> (ø)
lightning/src/ln/channel.rs87.41% <0.00%> (-0.04%)⬇️
lightning/src/ln/channelmanager.rs83.38% <ø> (-0.05%)⬇️
lightning/src/ln/functional_test_utils.rs95.06% <ø> (ø)
... and 12 more
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 3be185a...4c7be7e. Read the comment docs.
TheBlueMatt
TheBlueMatt
reviewed
Apr 24, 2021
View reviewed changes
@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.

Looks good.
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 26, 2021
 Merged

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
fec5fa5 to
7d5ebb2CompareApril 28, 2021 16:50
@valentinewallace
valentinewallace
marked this pull request as ready for review
April 28, 2021 16:50
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
4 times, most recently
from
78b8298 to
4d5f112CompareApril 28, 2021 18:47
jkczyz
jkczyz
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/Cargo.toml
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMatt
TheBlueMatt
commented
Apr 28, 2021

Copy link


Copy Markdown

Collaborator
Can now be rebased after the merge of #893.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
b3d0434 to
5dfb86aCompareApril 28, 2021 21:43
TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/Cargo.toml
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
8cd714c to
5a478c7CompareApril 28, 2021 22:16
ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

 L::Target: Logger,
	{
 // Marshall route hints.
 let our_channels = channelmanager.list_usable_channels();
@ariardariardApr 28, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

IIUC this utility returns as routing hints the complete set of our channels, including the non-announced subset one ?
Sounds pretty harmful for privacy, maybe the utility should have a boolean all or otherwise a Vec<short_channel_id> to precise which ones to disclose ?
@TheBlueMattTheBlueMattApr 29, 2021

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.

I think this is the right default to this - in most cases if we're a "client" node we only have one or two channels anyway (and in non-"client" cases we have several channels that are public), and the "real" fix is to generate random short channel ids.
@ariardariardApr 29, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Agree for the "client" node but for a big hub you will disclose all your private channels with spoke if you're also a merchant which is quite the case of a bunch of such nodes. Though opening an issue for now, we'll adjust in function of users feedback.
@TheBlueMattTheBlueMattApr 29, 2021

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.

Right, we ultimately need some heuristic of "we have > 5 public channels, we shouldn't include any route hints at all", probably.
Comment threadlightning-invoice/src/lib.rs
Outdated

ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
@ariardariard
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Otherwise sounds good to me :)
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadfuzz/src/full_stack.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
5dd106d to
9ab3a9cCompareApril 29, 2021 16:29
@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Oops, need to switch sign_invoice to return a Result. Otherwise I think this is roughly what it's gonna look like.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
1e34c16 to
e2f81e3CompareApril 29, 2021 17:01
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gonna have lunch then come back to this
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

@TheBlueMattTheBlueMatt
added this to the 0.0.14 milestone
Apr 29, 2021
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
c1f9f87 to
50c0a99CompareApril 29, 2021 20:36
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
@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.

Aside from Jeff's comments and #895 (comment) this LGTM.
@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 29, 2021
 Merged

jkczyz
jkczyz
approved these changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
requested changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gah my bad, fixed
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
Add utility to create an invoice using the ChannelManager
4c7be7e
This also allows the ChannelManager to track information for inbound payments
to check the PaymentSecret on receive.
@TheBlueMatt
TheBlueMatt
merged commit 3b67be2
into
lightningdevkit:mainApr 29, 2021
TheBlueMatt added a commit
to TheBlueMatt/rust-lightning
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Fix merge conflicts betweenlightningdevkit#898andlightningdevkit#895.
8cde7e8
TheBlueMatt added a commit
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Merge pull request#907from TheBlueMatt/2021-04-merge-conflicts
e26c3df
Fix merge conflicts between #898 and #895.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@devrandomdevrandomdevrandom left review comments
@TheBlueMattTheBlueMattTheBlueMatt requested changes
@jkczyzjkczyzjkczyz approved these changes

+1 more reviewer

@ariardariardariard left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.14

Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@devrandom@jkczyz@ariard

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

Skip to content
Invoice chanman utility - #895
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Apr 29, 2021
Merged
Invoice chanman utility#895
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
TODO: tests
Based on #893
@codecov
codecovBot
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #895 (7794708) into main (3be185a) will decrease coverage by 0.01%.

The diff coverage is 64.28%.
❗ Current head 7794708 differs from pull request most recent head 4c7be7e. Consider uploading reports for the commit 4c7be7e to get more accurate results
Impacted file tree graph
@@ Coverage Diff @@## main #895 +/- ##
==========================================
- Coverage 90.38% 90.36% -0.02% 
==========================================
Files 57 58 +1 Lines 29500 29505 +5 ==========================================
- Hits 26663 26662 -1 - Misses 2837 2843 +6 
Impacted FilesCoverage Δ
lightning-invoice/src/de.rs80.99% <ø> (-0.15%)⬇️
lightning-invoice/src/lib.rs83.28% <ø> (-0.06%)⬇️
lightning-invoice/src/ser.rs91.76% <ø> (-0.19%)⬇️
lightning/src/chain/channelmonitor.rs95.45% <ø> (ø)
lightning/src/chain/keysinterface.rs93.01% <0.00%> (-0.62%)⬇️
lightning/src/ln/chan_utils.rs97.34% <ø> (ø)
lightning/src/ln/chanmon_update_fail_tests.rs97.64% <ø> (ø)
lightning/src/ln/channel.rs87.41% <0.00%> (-0.04%)⬇️
lightning/src/ln/channelmanager.rs83.38% <ø> (-0.05%)⬇️
lightning/src/ln/functional_test_utils.rs95.06% <ø> (ø)
... and 12 more
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 3be185a...4c7be7e. Read the comment docs.
TheBlueMatt
TheBlueMatt
reviewed
Apr 24, 2021
View reviewed changes
@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.

Looks good.
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 26, 2021
 Merged

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
fec5fa5 to
7d5ebb2CompareApril 28, 2021 16:50
@valentinewallace
valentinewallace
marked this pull request as ready for review
April 28, 2021 16:50
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
4 times, most recently
from
78b8298 to
4d5f112CompareApril 28, 2021 18:47
jkczyz
jkczyz
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/Cargo.toml
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMatt
TheBlueMatt
commented
Apr 28, 2021

Copy link


Copy Markdown

Collaborator
Can now be rebased after the merge of #893.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
b3d0434 to
5dfb86aCompareApril 28, 2021 21:43
TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/Cargo.toml
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
8cd714c to
5a478c7CompareApril 28, 2021 22:16
ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

 L::Target: Logger,
	{
 // Marshall route hints.
 let our_channels = channelmanager.list_usable_channels();
@ariardariardApr 28, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

IIUC this utility returns as routing hints the complete set of our channels, including the non-announced subset one ?
Sounds pretty harmful for privacy, maybe the utility should have a boolean all or otherwise a Vec<short_channel_id> to precise which ones to disclose ?
@TheBlueMattTheBlueMattApr 29, 2021

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.

I think this is the right default to this - in most cases if we're a "client" node we only have one or two channels anyway (and in non-"client" cases we have several channels that are public), and the "real" fix is to generate random short channel ids.
@ariardariardApr 29, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Agree for the "client" node but for a big hub you will disclose all your private channels with spoke if you're also a merchant which is quite the case of a bunch of such nodes. Though opening an issue for now, we'll adjust in function of users feedback.
@TheBlueMattTheBlueMattApr 29, 2021

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.

Right, we ultimately need some heuristic of "we have > 5 public channels, we shouldn't include any route hints at all", probably.
Comment threadlightning-invoice/src/lib.rs
Outdated

ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
@ariardariard
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Otherwise sounds good to me :)
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadfuzz/src/full_stack.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
5dd106d to
9ab3a9cCompareApril 29, 2021 16:29
@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Oops, need to switch sign_invoice to return a Result. Otherwise I think this is roughly what it's gonna look like.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
1e34c16 to
e2f81e3CompareApril 29, 2021 17:01
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gonna have lunch then come back to this
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

@TheBlueMattTheBlueMatt
added this to the 0.0.14 milestone
Apr 29, 2021
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
c1f9f87 to
50c0a99CompareApril 29, 2021 20:36
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
@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.

Aside from Jeff's comments and #895 (comment) this LGTM.
@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 29, 2021
 Merged

jkczyz
jkczyz
approved these changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
requested changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gah my bad, fixed
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
Add utility to create an invoice using the ChannelManager
4c7be7e
This also allows the ChannelManager to track information for inbound payments
to check the PaymentSecret on receive.
@TheBlueMatt
TheBlueMatt
merged commit 3b67be2
into
lightningdevkit:mainApr 29, 2021
TheBlueMatt added a commit
to TheBlueMatt/rust-lightning
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Fix merge conflicts betweenlightningdevkit#898andlightningdevkit#895.
8cde7e8
TheBlueMatt added a commit
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Merge pull request#907from TheBlueMatt/2021-04-merge-conflicts
e26c3df
Fix merge conflicts between #898 and #895.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@devrandomdevrandomdevrandom left review comments
@TheBlueMattTheBlueMattTheBlueMatt requested changes
@jkczyzjkczyzjkczyz approved these changes

+1 more reviewer

@ariardariardariard left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.14

Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@devrandom@jkczyz@ariard

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

Skip to content
Invoice chanman utility - #895
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Apr 29, 2021
Merged
Invoice chanman utility#895
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
TODO: tests
Based on #893
@codecov
codecovBot
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #895 (7794708) into main (3be185a) will decrease coverage by 0.01%.

The diff coverage is 64.28%.
❗ Current head 7794708 differs from pull request most recent head 4c7be7e. Consider uploading reports for the commit 4c7be7e to get more accurate results
Impacted file tree graph
@@ Coverage Diff @@## main #895 +/- ##
==========================================
- Coverage 90.38% 90.36% -0.02% 
==========================================
Files 57 58 +1 Lines 29500 29505 +5 ==========================================
- Hits 26663 26662 -1 - Misses 2837 2843 +6 
Impacted FilesCoverage Δ
lightning-invoice/src/de.rs80.99% <ø> (-0.15%)⬇️
lightning-invoice/src/lib.rs83.28% <ø> (-0.06%)⬇️
lightning-invoice/src/ser.rs91.76% <ø> (-0.19%)⬇️
lightning/src/chain/channelmonitor.rs95.45% <ø> (ø)
lightning/src/chain/keysinterface.rs93.01% <0.00%> (-0.62%)⬇️
lightning/src/ln/chan_utils.rs97.34% <ø> (ø)
lightning/src/ln/chanmon_update_fail_tests.rs97.64% <ø> (ø)
lightning/src/ln/channel.rs87.41% <0.00%> (-0.04%)⬇️
lightning/src/ln/channelmanager.rs83.38% <ø> (-0.05%)⬇️
lightning/src/ln/functional_test_utils.rs95.06% <ø> (ø)
... and 12 more
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 3be185a...4c7be7e. Read the comment docs.
TheBlueMatt
TheBlueMatt
reviewed
Apr 24, 2021
View reviewed changes
@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.

Looks good.
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 26, 2021
 Merged

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
fec5fa5 to
7d5ebb2CompareApril 28, 2021 16:50
@valentinewallace
valentinewallace
marked this pull request as ready for review
April 28, 2021 16:50
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
4 times, most recently
from
78b8298 to
4d5f112CompareApril 28, 2021 18:47
jkczyz
jkczyz
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/Cargo.toml
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMatt
TheBlueMatt
commented
Apr 28, 2021

Copy link


Copy Markdown

Collaborator
Can now be rebased after the merge of #893.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
b3d0434 to
5dfb86aCompareApril 28, 2021 21:43
TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/Cargo.toml
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
8cd714c to
5a478c7CompareApril 28, 2021 22:16
ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

 L::Target: Logger,
	{
 // Marshall route hints.
 let our_channels = channelmanager.list_usable_channels();
@ariardariardApr 28, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

IIUC this utility returns as routing hints the complete set of our channels, including the non-announced subset one ?
Sounds pretty harmful for privacy, maybe the utility should have a boolean all or otherwise a Vec<short_channel_id> to precise which ones to disclose ?
@TheBlueMattTheBlueMattApr 29, 2021

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.

I think this is the right default to this - in most cases if we're a "client" node we only have one or two channels anyway (and in non-"client" cases we have several channels that are public), and the "real" fix is to generate random short channel ids.
@ariardariardApr 29, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Agree for the "client" node but for a big hub you will disclose all your private channels with spoke if you're also a merchant which is quite the case of a bunch of such nodes. Though opening an issue for now, we'll adjust in function of users feedback.
@TheBlueMattTheBlueMattApr 29, 2021

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.

Right, we ultimately need some heuristic of "we have > 5 public channels, we shouldn't include any route hints at all", probably.
Comment threadlightning-invoice/src/lib.rs
Outdated

ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
@ariardariard
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Otherwise sounds good to me :)
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadfuzz/src/full_stack.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
5dd106d to
9ab3a9cCompareApril 29, 2021 16:29
@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Oops, need to switch sign_invoice to return a Result. Otherwise I think this is roughly what it's gonna look like.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
1e34c16 to
e2f81e3CompareApril 29, 2021 17:01
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gonna have lunch then come back to this
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

@TheBlueMattTheBlueMatt
added this to the 0.0.14 milestone
Apr 29, 2021
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
c1f9f87 to
50c0a99CompareApril 29, 2021 20:36
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
@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.

Aside from Jeff's comments and #895 (comment) this LGTM.
@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 29, 2021
 Merged

jkczyz
jkczyz
approved these changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
requested changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gah my bad, fixed
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
Add utility to create an invoice using the ChannelManager
4c7be7e
This also allows the ChannelManager to track information for inbound payments
to check the PaymentSecret on receive.
@TheBlueMatt
TheBlueMatt
merged commit 3b67be2
into
lightningdevkit:mainApr 29, 2021
TheBlueMatt added a commit
to TheBlueMatt/rust-lightning
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Fix merge conflicts betweenlightningdevkit#898andlightningdevkit#895.
8cde7e8
TheBlueMatt added a commit
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Merge pull request#907from TheBlueMatt/2021-04-merge-conflicts
e26c3df
Fix merge conflicts between #898 and #895.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@devrandomdevrandomdevrandom left review comments
@TheBlueMattTheBlueMattTheBlueMatt requested changes
@jkczyzjkczyzjkczyz approved these changes

+1 more reviewer

@ariardariardariard left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.14

Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@devrandom@jkczyz@ariard

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

Skip to content
Invoice chanman utility - #895
Merged
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Apr 29, 2021
Merged
Invoice chanman utility#895
TheBlueMatt merged 5 commits into
lightningdevkit:mainfrom 
valentinewallace:invoice-chanman-utility
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
TODO: tests
Based on #893
@codecov
codecovBot
commented
Apr 23, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #895 (7794708) into main (3be185a) will decrease coverage by 0.01%.

The diff coverage is 64.28%.
❗ Current head 7794708 differs from pull request most recent head 4c7be7e. Consider uploading reports for the commit 4c7be7e to get more accurate results
Impacted file tree graph
@@ Coverage Diff @@## main #895 +/- ##
==========================================
- Coverage 90.38% 90.36% -0.02% 
==========================================
Files 57 58 +1 Lines 29500 29505 +5 ==========================================
- Hits 26663 26662 -1 - Misses 2837 2843 +6 
Impacted FilesCoverage Δ
lightning-invoice/src/de.rs80.99% <ø> (-0.15%)⬇️
lightning-invoice/src/lib.rs83.28% <ø> (-0.06%)⬇️
lightning-invoice/src/ser.rs91.76% <ø> (-0.19%)⬇️
lightning/src/chain/channelmonitor.rs95.45% <ø> (ø)
lightning/src/chain/keysinterface.rs93.01% <0.00%> (-0.62%)⬇️
lightning/src/ln/chan_utils.rs97.34% <ø> (ø)
lightning/src/ln/chanmon_update_fail_tests.rs97.64% <ø> (ø)
lightning/src/ln/channel.rs87.41% <0.00%> (-0.04%)⬇️
lightning/src/ln/channelmanager.rs83.38% <ø> (-0.05%)⬇️
lightning/src/ln/functional_test_utils.rs95.06% <ø> (ø)
... and 12 more
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 3be185a...4c7be7e. Read the comment docs.
TheBlueMatt
TheBlueMatt
reviewed
Apr 24, 2021
View reviewed changes
@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.

Looks good.
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 26, 2021
 Merged

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
fec5fa5 to
7d5ebb2CompareApril 28, 2021 16:50
@valentinewallace
valentinewallace
marked this pull request as ready for review
April 28, 2021 16:50
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
4 times, most recently
from
78b8298 to
4d5f112CompareApril 28, 2021 18:47
jkczyz
jkczyz
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/Cargo.toml
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@TheBlueMatt
TheBlueMatt
commented
Apr 28, 2021

Copy link


Copy Markdown

Collaborator
Can now be rebased after the merge of #893.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
b3d0434 to
5dfb86aCompareApril 28, 2021 21:43
TheBlueMatt
TheBlueMatt
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning/Cargo.toml
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
8cd714c to
5a478c7CompareApril 28, 2021 22:16
ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

 L::Target: Logger,
	{
 // Marshall route hints.
 let our_channels = channelmanager.list_usable_channels();
@ariardariardApr 28, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

IIUC this utility returns as routing hints the complete set of our channels, including the non-announced subset one ?
Sounds pretty harmful for privacy, maybe the utility should have a boolean all or otherwise a Vec<short_channel_id> to precise which ones to disclose ?
@TheBlueMattTheBlueMattApr 29, 2021

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.

I think this is the right default to this - in most cases if we're a "client" node we only have one or two channels anyway (and in non-"client" cases we have several channels that are public), and the "real" fix is to generate random short channel ids.
@ariardariardApr 29, 2021

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Agree for the "client" node but for a big hub you will disclose all your private channels with spoke if you're also a merchant which is quite the case of a bunch of such nodes. Though opening an issue for now, we'll adjust in function of users feedback.
@TheBlueMattTheBlueMattApr 29, 2021

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.

Right, we ultimately need some heuristic of "we have > 5 public channels, we shouldn't include any route hints at all", probably.
Comment threadlightning-invoice/src/lib.rs
Outdated

ariard
ariard
reviewed
Apr 28, 2021
View reviewed changes
@ariardariard
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Otherwise sounds good to me :)
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadfuzz/src/full_stack.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
5dd106d to
9ab3a9cCompareApril 29, 2021 16:29
@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Oops, need to switch sign_invoice to return a Result. Otherwise I think this is roughly what it's gonna look like.
@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
2 times, most recently
from
1e34c16 to
e2f81e3CompareApril 29, 2021 17:01
jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

Comment threadlightning-invoice/src/lib.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gonna have lunch then come back to this
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

@TheBlueMattTheBlueMatt
added this to the 0.0.14 milestone
Apr 29, 2021
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@valentinewallace
valentinewallaceforce-pushed
the
invoice-chanman-utility
branch
3 times, most recently
from
c1f9f87 to
50c0a99CompareApril 29, 2021 20:36
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning/src/chain/keysinterface.rs
Outdated

jkczyz
jkczyz
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
@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.

Aside from Jeff's comments and #895 (comment) this LGTM.
@TheBlueMattTheBlueMatt
mentioned this pull request
Apr 29, 2021
 Merged

jkczyz
jkczyz
approved these changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/lib.rs
Outdated

TheBlueMatt
TheBlueMatt
requested changes
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
valentinewallace
commented
Apr 29, 2021

Copy link


Copy Markdown

ContributorAuthor
Gah my bad, fixed
TheBlueMatt
TheBlueMatt
reviewed
Apr 29, 2021
View reviewed changes
Comment threadlightning-invoice/src/utils.rs
Outdated

Comment threadlightning-invoice/src/utils.rs
Outdated

@valentinewallace
Add utility to create an invoice using the ChannelManager
4c7be7e
This also allows the ChannelManager to track information for inbound payments
to check the PaymentSecret on receive.
@TheBlueMatt
TheBlueMatt
merged commit 3b67be2
into
lightningdevkit:mainApr 29, 2021
TheBlueMatt added a commit
to TheBlueMatt/rust-lightning
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Fix merge conflicts betweenlightningdevkit#898andlightningdevkit#895.
8cde7e8
TheBlueMatt added a commit
that referenced
this pull request
Apr 30, 2021
@TheBlueMatt
Merge pull request#907from TheBlueMatt/2021-04-merge-conflicts
e26c3df
Fix merge conflicts between #898 and #895.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@devrandomdevrandomdevrandom left review comments
@TheBlueMattTheBlueMattTheBlueMatt requested changes
@jkczyzjkczyzjkczyz approved these changes

+1 more reviewer

@ariardariardariard left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.0.14

Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@devrandom@jkczyz@ariard