Skip to content

send warning when we receive a old commitment transaction - #1430

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2
May 4, 2022
Merged

send warning when we receive a old commitment transaction#1430
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2

Conversation

@vincenzopalazzo

@vincenzopalazzovincenzopalazzo commented Apr 18, 2022

Copy link
Copy Markdown
Member

During a channel_reestablish now we send a warning message when we receive an old commitment transaction.

Fixes#1207 with the following consideration lightning/bolts#934 (comment)

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from f40c9bb to 136171dCompareApril 18, 2022 21:59
Comment threadlightning/src/ln/channel.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 5 times, most recently from 7ae6fdc to fc33225CompareApril 22, 2022 10:15
@vincenzopalazzovincenzopalazzo changed the title send warning when we have a old commitment transactionsend warning when we receive a old commitment transactionApr 22, 2022
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from c70e6d3 to d04ca27CompareApril 22, 2022 11:10
@codecov-commenter

codecov-commenter commented Apr 22, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1430 (e6300da) into main (171dfee) will increase coverage by 0.46%.
The diff coverage is 88.57%.

@@ Coverage Diff @@## main #1430 +/- ##
==========================================
+ Coverage 90.89% 91.36% +0.46% 
==========================================
Files 75 75 Lines 41657 43716 +2059 Branches 41657 43716 +2059 ==========================================
+ Hits 37866 39941 +2075 + Misses 3791 3775 -16 
Impacted FilesCoverage Δ
lightning/src/ln/channel.rs92.57% <75.00%> (+4.18%)⬆️
lightning/src/ln/functional_tests.rs97.40% <92.59%> (+0.22%)⬆️
lightning/src/ln/reorg_tests.rs100.00% <0.00%> (ø)
lightning/src/util/config.rs48.35% <0.00%> (+3.45%)⬆️

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 171dfee...e6300da. Read the comment docs.

@vincenzopalazzo
vincenzopalazzo marked this pull request as ready for review April 22, 2022 11:51
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5ada132 to 3e41b90CompareApril 22, 2022 17:22
Comment threadlightning/src/ln/functional_tests.rs Outdated

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

OK! I tried to make a little bit of refactoring and applied the changes that you suggested.

The only think that is unclear to me right now, is this case

https://github.com/lightningdevkit/rust-lightning/blob/main/lightning/src/ln/channel.rs#L3708-L3712

Why in this case there is a CloseDelayBroadcast why does mean? i was not able to find some comments about the meaning, and I didn't check if the spec has some info about this case!

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

Sorry for the delay in reviewing this!

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from c80ea92 to 5a55542CompareApril 25, 2022 19:45
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5a55542 to 43edafaCompareApril 27, 2022 20:05
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Rebased on master, I reorganized the test in a more clean way where the different cases are executed at the end of the function. In this way, it is cleaner to the reader what we are trying to do!

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

Awesome! One note - we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 53d7cda to 8931516CompareApril 28, 2022 15:49
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Sorry! I rebased and squash the commit in a single one!

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically looks good, one comment on the second branch of the test.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 8931516 to 6dac37bCompareApril 28, 2022 20:55

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM!

Comment threadlightning/src/ln/functional_tests.rs
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from d3651e1 to 833a74eCompareMay 3, 2022 12:58
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Hmm, was there a conflict? In general please avoid rebase'ing unless there's a conflict with the current upstream git.

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, lets get another reviewer.

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

I clean up the code and remove the enum. thanks, @valentinewallace to point me on this, and also for the grammar mistake!

I also rebased on top of the last master!

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

I also rebased on top of the last master!

Generally please avoid this unless there is a conflict. Rebases make it harder to diff-tree and see changes to a PR, range-diff can be a bit more finicky and hard to read.

@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Ops! sorry @TheBlueMatt

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5dd4662 to a399d1fCompareMay 3, 2022 22:14
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 6ecb4d6 to 040b3cdCompareMay 3, 2022 23:01
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs
During a `channel_reestablish` now we send a warning message when we receive a old commitment transaction from the peer.
In addition, this commit include the update of functional test to make sure that the receiver will generate warn messages.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 040b3cd to e6300daCompareMay 4, 2022 07:23
@TheBlueMatt
TheBlueMatt merged commit 9fbafd4 into lightningdevkit:mainMay 4, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don'e force-close if a peer is behind our latest state on reestablish

4 participants

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

send warning when we receive a old commitment transaction - #1430

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2
May 4, 2022
Merged

send warning when we receive a old commitment transaction#1430
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2

Conversation

@vincenzopalazzo

@vincenzopalazzovincenzopalazzo commented Apr 18, 2022

Copy link
Copy Markdown
Member

During a channel_reestablish now we send a warning message when we receive an old commitment transaction.

Fixes#1207 with the following consideration lightning/bolts#934 (comment)

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from f40c9bb to 136171dCompareApril 18, 2022 21:59
Comment threadlightning/src/ln/channel.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 5 times, most recently from 7ae6fdc to fc33225CompareApril 22, 2022 10:15
@vincenzopalazzovincenzopalazzo changed the title send warning when we have a old commitment transactionsend warning when we receive a old commitment transactionApr 22, 2022
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from c70e6d3 to d04ca27CompareApril 22, 2022 11:10
@codecov-commenter

codecov-commenter commented Apr 22, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1430 (e6300da) into main (171dfee) will increase coverage by 0.46%.
The diff coverage is 88.57%.

@@ Coverage Diff @@## main #1430 +/- ##
==========================================
+ Coverage 90.89% 91.36% +0.46% 
==========================================
Files 75 75 Lines 41657 43716 +2059 Branches 41657 43716 +2059 ==========================================
+ Hits 37866 39941 +2075 + Misses 3791 3775 -16 
Impacted FilesCoverage Δ
lightning/src/ln/channel.rs92.57% <75.00%> (+4.18%)⬆️
lightning/src/ln/functional_tests.rs97.40% <92.59%> (+0.22%)⬆️
lightning/src/ln/reorg_tests.rs100.00% <0.00%> (ø)
lightning/src/util/config.rs48.35% <0.00%> (+3.45%)⬆️

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 171dfee...e6300da. Read the comment docs.

@vincenzopalazzo
vincenzopalazzo marked this pull request as ready for review April 22, 2022 11:51
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5ada132 to 3e41b90CompareApril 22, 2022 17:22
Comment threadlightning/src/ln/functional_tests.rs Outdated

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

OK! I tried to make a little bit of refactoring and applied the changes that you suggested.

The only think that is unclear to me right now, is this case

https://github.com/lightningdevkit/rust-lightning/blob/main/lightning/src/ln/channel.rs#L3708-L3712

Why in this case there is a CloseDelayBroadcast why does mean? i was not able to find some comments about the meaning, and I didn't check if the spec has some info about this case!

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

Sorry for the delay in reviewing this!

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from c80ea92 to 5a55542CompareApril 25, 2022 19:45
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5a55542 to 43edafaCompareApril 27, 2022 20:05
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Rebased on master, I reorganized the test in a more clean way where the different cases are executed at the end of the function. In this way, it is cleaner to the reader what we are trying to do!

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

Awesome! One note - we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 53d7cda to 8931516CompareApril 28, 2022 15:49
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Sorry! I rebased and squash the commit in a single one!

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically looks good, one comment on the second branch of the test.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 8931516 to 6dac37bCompareApril 28, 2022 20:55

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM!

Comment threadlightning/src/ln/functional_tests.rs
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from d3651e1 to 833a74eCompareMay 3, 2022 12:58
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Hmm, was there a conflict? In general please avoid rebase'ing unless there's a conflict with the current upstream git.

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, lets get another reviewer.

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

I clean up the code and remove the enum. thanks, @valentinewallace to point me on this, and also for the grammar mistake!

I also rebased on top of the last master!

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

I also rebased on top of the last master!

Generally please avoid this unless there is a conflict. Rebases make it harder to diff-tree and see changes to a PR, range-diff can be a bit more finicky and hard to read.

@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Ops! sorry @TheBlueMatt

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5dd4662 to a399d1fCompareMay 3, 2022 22:14
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 6ecb4d6 to 040b3cdCompareMay 3, 2022 23:01
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs
During a `channel_reestablish` now we send a warning message when we receive a old commitment transaction from the peer.
In addition, this commit include the update of functional test to make sure that the receiver will generate warn messages.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 040b3cd to e6300daCompareMay 4, 2022 07:23
@TheBlueMatt
TheBlueMatt merged commit 9fbafd4 into lightningdevkit:mainMay 4, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don'e force-close if a peer is behind our latest state on reestablish

4 participants

@vincenzopalazzo@codecov-commenter@TheBlueMatt@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' send warning when we receive a old commitment transaction by vincenzopalazzo · Pull Request #1430 · lightningdevkit/rust-lightning · GitHub
Skip to content

send warning when we receive a old commitment transaction - #1430

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2
May 4, 2022
Merged

send warning when we receive a old commitment transaction#1430
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2

Conversation

@vincenzopalazzo

@vincenzopalazzovincenzopalazzo commented Apr 18, 2022

Copy link
Copy Markdown
Member

During a channel_reestablish now we send a warning message when we receive an old commitment transaction.

Fixes#1207 with the following consideration lightning/bolts#934 (comment)

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from f40c9bb to 136171dCompareApril 18, 2022 21:59
Comment threadlightning/src/ln/channel.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 5 times, most recently from 7ae6fdc to fc33225CompareApril 22, 2022 10:15
@vincenzopalazzovincenzopalazzo changed the title send warning when we have a old commitment transactionsend warning when we receive a old commitment transactionApr 22, 2022
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from c70e6d3 to d04ca27CompareApril 22, 2022 11:10
@codecov-commenter

codecov-commenter commented Apr 22, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1430 (e6300da) into main (171dfee) will increase coverage by 0.46%.
The diff coverage is 88.57%.

@@ Coverage Diff @@## main #1430 +/- ##
==========================================
+ Coverage 90.89% 91.36% +0.46% 
==========================================
Files 75 75 Lines 41657 43716 +2059 Branches 41657 43716 +2059 ==========================================
+ Hits 37866 39941 +2075 + Misses 3791 3775 -16 
Impacted FilesCoverage Δ
lightning/src/ln/channel.rs92.57% <75.00%> (+4.18%)⬆️
lightning/src/ln/functional_tests.rs97.40% <92.59%> (+0.22%)⬆️
lightning/src/ln/reorg_tests.rs100.00% <0.00%> (ø)
lightning/src/util/config.rs48.35% <0.00%> (+3.45%)⬆️

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 171dfee...e6300da. Read the comment docs.

@vincenzopalazzo
vincenzopalazzo marked this pull request as ready for review April 22, 2022 11:51
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5ada132 to 3e41b90CompareApril 22, 2022 17:22
Comment threadlightning/src/ln/functional_tests.rs Outdated

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

OK! I tried to make a little bit of refactoring and applied the changes that you suggested.

The only think that is unclear to me right now, is this case

https://github.com/lightningdevkit/rust-lightning/blob/main/lightning/src/ln/channel.rs#L3708-L3712

Why in this case there is a CloseDelayBroadcast why does mean? i was not able to find some comments about the meaning, and I didn't check if the spec has some info about this case!

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

Sorry for the delay in reviewing this!

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from c80ea92 to 5a55542CompareApril 25, 2022 19:45
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5a55542 to 43edafaCompareApril 27, 2022 20:05
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Rebased on master, I reorganized the test in a more clean way where the different cases are executed at the end of the function. In this way, it is cleaner to the reader what we are trying to do!

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

Awesome! One note - we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 53d7cda to 8931516CompareApril 28, 2022 15:49
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Sorry! I rebased and squash the commit in a single one!

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically looks good, one comment on the second branch of the test.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 8931516 to 6dac37bCompareApril 28, 2022 20:55

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM!

Comment threadlightning/src/ln/functional_tests.rs
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from d3651e1 to 833a74eCompareMay 3, 2022 12:58
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Hmm, was there a conflict? In general please avoid rebase'ing unless there's a conflict with the current upstream git.

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, lets get another reviewer.

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

I clean up the code and remove the enum. thanks, @valentinewallace to point me on this, and also for the grammar mistake!

I also rebased on top of the last master!

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

I also rebased on top of the last master!

Generally please avoid this unless there is a conflict. Rebases make it harder to diff-tree and see changes to a PR, range-diff can be a bit more finicky and hard to read.

@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Ops! sorry @TheBlueMatt

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5dd4662 to a399d1fCompareMay 3, 2022 22:14
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 6ecb4d6 to 040b3cdCompareMay 3, 2022 23:01
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs
During a `channel_reestablish` now we send a warning message when we receive a old commitment transaction from the peer.
In addition, this commit include the update of functional test to make sure that the receiver will generate warn messages.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 040b3cd to e6300daCompareMay 4, 2022 07:23
@TheBlueMatt
TheBlueMatt merged commit 9fbafd4 into lightningdevkit:mainMay 4, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don'e force-close if a peer is behind our latest state on reestablish

4 participants

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

send warning when we receive a old commitment transaction - #1430

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2
May 4, 2022
Merged

send warning when we receive a old commitment transaction#1430
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2

Conversation

@vincenzopalazzo

@vincenzopalazzovincenzopalazzo commented Apr 18, 2022

Copy link
Copy Markdown
Member

During a channel_reestablish now we send a warning message when we receive an old commitment transaction.

Fixes#1207 with the following consideration lightning/bolts#934 (comment)

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from f40c9bb to 136171dCompareApril 18, 2022 21:59
Comment threadlightning/src/ln/channel.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 5 times, most recently from 7ae6fdc to fc33225CompareApril 22, 2022 10:15
@vincenzopalazzovincenzopalazzo changed the title send warning when we have a old commitment transactionsend warning when we receive a old commitment transactionApr 22, 2022
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from c70e6d3 to d04ca27CompareApril 22, 2022 11:10
@codecov-commenter

codecov-commenter commented Apr 22, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1430 (e6300da) into main (171dfee) will increase coverage by 0.46%.
The diff coverage is 88.57%.

@@ Coverage Diff @@## main #1430 +/- ##
==========================================
+ Coverage 90.89% 91.36% +0.46% 
==========================================
Files 75 75 Lines 41657 43716 +2059 Branches 41657 43716 +2059 ==========================================
+ Hits 37866 39941 +2075 + Misses 3791 3775 -16 
Impacted FilesCoverage Δ
lightning/src/ln/channel.rs92.57% <75.00%> (+4.18%)⬆️
lightning/src/ln/functional_tests.rs97.40% <92.59%> (+0.22%)⬆️
lightning/src/ln/reorg_tests.rs100.00% <0.00%> (ø)
lightning/src/util/config.rs48.35% <0.00%> (+3.45%)⬆️

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 171dfee...e6300da. Read the comment docs.

@vincenzopalazzo
vincenzopalazzo marked this pull request as ready for review April 22, 2022 11:51
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5ada132 to 3e41b90CompareApril 22, 2022 17:22
Comment threadlightning/src/ln/functional_tests.rs Outdated

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

OK! I tried to make a little bit of refactoring and applied the changes that you suggested.

The only think that is unclear to me right now, is this case

https://github.com/lightningdevkit/rust-lightning/blob/main/lightning/src/ln/channel.rs#L3708-L3712

Why in this case there is a CloseDelayBroadcast why does mean? i was not able to find some comments about the meaning, and I didn't check if the spec has some info about this case!

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

Sorry for the delay in reviewing this!

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from c80ea92 to 5a55542CompareApril 25, 2022 19:45
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5a55542 to 43edafaCompareApril 27, 2022 20:05
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Rebased on master, I reorganized the test in a more clean way where the different cases are executed at the end of the function. In this way, it is cleaner to the reader what we are trying to do!

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

Awesome! One note - we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 53d7cda to 8931516CompareApril 28, 2022 15:49
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Sorry! I rebased and squash the commit in a single one!

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically looks good, one comment on the second branch of the test.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 8931516 to 6dac37bCompareApril 28, 2022 20:55

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM!

Comment threadlightning/src/ln/functional_tests.rs
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from d3651e1 to 833a74eCompareMay 3, 2022 12:58
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Hmm, was there a conflict? In general please avoid rebase'ing unless there's a conflict with the current upstream git.

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, lets get another reviewer.

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

I clean up the code and remove the enum. thanks, @valentinewallace to point me on this, and also for the grammar mistake!

I also rebased on top of the last master!

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

I also rebased on top of the last master!

Generally please avoid this unless there is a conflict. Rebases make it harder to diff-tree and see changes to a PR, range-diff can be a bit more finicky and hard to read.

@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Ops! sorry @TheBlueMatt

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5dd4662 to a399d1fCompareMay 3, 2022 22:14
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 6ecb4d6 to 040b3cdCompareMay 3, 2022 23:01
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs
During a `channel_reestablish` now we send a warning message when we receive a old commitment transaction from the peer.
In addition, this commit include the update of functional test to make sure that the receiver will generate warn messages.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 040b3cd to e6300daCompareMay 4, 2022 07:23
@TheBlueMatt
TheBlueMatt merged commit 9fbafd4 into lightningdevkit:mainMay 4, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don'e force-close if a peer is behind our latest state on reestablish

4 participants

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

send warning when we receive a old commitment transaction - #1430

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2
May 4, 2022
Merged

send warning when we receive a old commitment transaction#1430
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2

Conversation

@vincenzopalazzo

@vincenzopalazzovincenzopalazzo commented Apr 18, 2022

Copy link
Copy Markdown
Member

During a channel_reestablish now we send a warning message when we receive an old commitment transaction.

Fixes#1207 with the following consideration lightning/bolts#934 (comment)

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from f40c9bb to 136171dCompareApril 18, 2022 21:59
Comment threadlightning/src/ln/channel.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 5 times, most recently from 7ae6fdc to fc33225CompareApril 22, 2022 10:15
@vincenzopalazzovincenzopalazzo changed the title send warning when we have a old commitment transactionsend warning when we receive a old commitment transactionApr 22, 2022
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from c70e6d3 to d04ca27CompareApril 22, 2022 11:10
@codecov-commenter

codecov-commenter commented Apr 22, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1430 (e6300da) into main (171dfee) will increase coverage by 0.46%.
The diff coverage is 88.57%.

@@ Coverage Diff @@## main #1430 +/- ##
==========================================
+ Coverage 90.89% 91.36% +0.46% 
==========================================
Files 75 75 Lines 41657 43716 +2059 Branches 41657 43716 +2059 ==========================================
+ Hits 37866 39941 +2075 + Misses 3791 3775 -16 
Impacted FilesCoverage Δ
lightning/src/ln/channel.rs92.57% <75.00%> (+4.18%)⬆️
lightning/src/ln/functional_tests.rs97.40% <92.59%> (+0.22%)⬆️
lightning/src/ln/reorg_tests.rs100.00% <0.00%> (ø)
lightning/src/util/config.rs48.35% <0.00%> (+3.45%)⬆️

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 171dfee...e6300da. Read the comment docs.

@vincenzopalazzo
vincenzopalazzo marked this pull request as ready for review April 22, 2022 11:51
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5ada132 to 3e41b90CompareApril 22, 2022 17:22
Comment threadlightning/src/ln/functional_tests.rs Outdated

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

OK! I tried to make a little bit of refactoring and applied the changes that you suggested.

The only think that is unclear to me right now, is this case

https://github.com/lightningdevkit/rust-lightning/blob/main/lightning/src/ln/channel.rs#L3708-L3712

Why in this case there is a CloseDelayBroadcast why does mean? i was not able to find some comments about the meaning, and I didn't check if the spec has some info about this case!

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

Sorry for the delay in reviewing this!

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from c80ea92 to 5a55542CompareApril 25, 2022 19:45
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5a55542 to 43edafaCompareApril 27, 2022 20:05
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Rebased on master, I reorganized the test in a more clean way where the different cases are executed at the end of the function. In this way, it is cleaner to the reader what we are trying to do!

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

Awesome! One note - we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 53d7cda to 8931516CompareApril 28, 2022 15:49
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Sorry! I rebased and squash the commit in a single one!

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically looks good, one comment on the second branch of the test.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 8931516 to 6dac37bCompareApril 28, 2022 20:55

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM!

Comment threadlightning/src/ln/functional_tests.rs
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from d3651e1 to 833a74eCompareMay 3, 2022 12:58
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Hmm, was there a conflict? In general please avoid rebase'ing unless there's a conflict with the current upstream git.

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, lets get another reviewer.

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

I clean up the code and remove the enum. thanks, @valentinewallace to point me on this, and also for the grammar mistake!

I also rebased on top of the last master!

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

I also rebased on top of the last master!

Generally please avoid this unless there is a conflict. Rebases make it harder to diff-tree and see changes to a PR, range-diff can be a bit more finicky and hard to read.

@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Ops! sorry @TheBlueMatt

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5dd4662 to a399d1fCompareMay 3, 2022 22:14
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 6ecb4d6 to 040b3cdCompareMay 3, 2022 23:01
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs
During a `channel_reestablish` now we send a warning message when we receive a old commitment transaction from the peer.
In addition, this commit include the update of functional test to make sure that the receiver will generate warn messages.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 040b3cd to e6300daCompareMay 4, 2022 07:23
@TheBlueMatt
TheBlueMatt merged commit 9fbafd4 into lightningdevkit:mainMay 4, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don'e force-close if a peer is behind our latest state on reestablish

4 participants

@vincenzopalazzo@codecov-commenter@TheBlueMatt@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' send warning when we receive a old commitment transaction by vincenzopalazzo · Pull Request #1430 · lightningdevkit/rust-lightning · GitHub
Skip to content

send warning when we receive a old commitment transaction - #1430

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2
May 4, 2022
Merged

send warning when we receive a old commitment transaction#1430
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2

Conversation

@vincenzopalazzo

@vincenzopalazzovincenzopalazzo commented Apr 18, 2022

Copy link
Copy Markdown
Member

During a channel_reestablish now we send a warning message when we receive an old commitment transaction.

Fixes#1207 with the following consideration lightning/bolts#934 (comment)

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from f40c9bb to 136171dCompareApril 18, 2022 21:59
Comment threadlightning/src/ln/channel.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 5 times, most recently from 7ae6fdc to fc33225CompareApril 22, 2022 10:15
@vincenzopalazzovincenzopalazzo changed the title send warning when we have a old commitment transactionsend warning when we receive a old commitment transactionApr 22, 2022
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from c70e6d3 to d04ca27CompareApril 22, 2022 11:10
@codecov-commenter

codecov-commenter commented Apr 22, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1430 (e6300da) into main (171dfee) will increase coverage by 0.46%.
The diff coverage is 88.57%.

@@ Coverage Diff @@## main #1430 +/- ##
==========================================
+ Coverage 90.89% 91.36% +0.46% 
==========================================
Files 75 75 Lines 41657 43716 +2059 Branches 41657 43716 +2059 ==========================================
+ Hits 37866 39941 +2075 + Misses 3791 3775 -16 
Impacted FilesCoverage Δ
lightning/src/ln/channel.rs92.57% <75.00%> (+4.18%)⬆️
lightning/src/ln/functional_tests.rs97.40% <92.59%> (+0.22%)⬆️
lightning/src/ln/reorg_tests.rs100.00% <0.00%> (ø)
lightning/src/util/config.rs48.35% <0.00%> (+3.45%)⬆️

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 171dfee...e6300da. Read the comment docs.

@vincenzopalazzo
vincenzopalazzo marked this pull request as ready for review April 22, 2022 11:51
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5ada132 to 3e41b90CompareApril 22, 2022 17:22
Comment threadlightning/src/ln/functional_tests.rs Outdated

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

OK! I tried to make a little bit of refactoring and applied the changes that you suggested.

The only think that is unclear to me right now, is this case

https://github.com/lightningdevkit/rust-lightning/blob/main/lightning/src/ln/channel.rs#L3708-L3712

Why in this case there is a CloseDelayBroadcast why does mean? i was not able to find some comments about the meaning, and I didn't check if the spec has some info about this case!

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

Sorry for the delay in reviewing this!

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from c80ea92 to 5a55542CompareApril 25, 2022 19:45
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5a55542 to 43edafaCompareApril 27, 2022 20:05
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Rebased on master, I reorganized the test in a more clean way where the different cases are executed at the end of the function. In this way, it is cleaner to the reader what we are trying to do!

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

Awesome! One note - we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 53d7cda to 8931516CompareApril 28, 2022 15:49
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Sorry! I rebased and squash the commit in a single one!

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically looks good, one comment on the second branch of the test.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 8931516 to 6dac37bCompareApril 28, 2022 20:55

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM!

Comment threadlightning/src/ln/functional_tests.rs
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from d3651e1 to 833a74eCompareMay 3, 2022 12:58
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Hmm, was there a conflict? In general please avoid rebase'ing unless there's a conflict with the current upstream git.

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, lets get another reviewer.

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

I clean up the code and remove the enum. thanks, @valentinewallace to point me on this, and also for the grammar mistake!

I also rebased on top of the last master!

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

I also rebased on top of the last master!

Generally please avoid this unless there is a conflict. Rebases make it harder to diff-tree and see changes to a PR, range-diff can be a bit more finicky and hard to read.

@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Ops! sorry @TheBlueMatt

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5dd4662 to a399d1fCompareMay 3, 2022 22:14
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 6ecb4d6 to 040b3cdCompareMay 3, 2022 23:01
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs
During a `channel_reestablish` now we send a warning message when we receive a old commitment transaction from the peer.
In addition, this commit include the update of functional test to make sure that the receiver will generate warn messages.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 040b3cd to e6300daCompareMay 4, 2022 07:23
@TheBlueMatt
TheBlueMatt merged commit 9fbafd4 into lightningdevkit:mainMay 4, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don'e force-close if a peer is behind our latest state on reestablish

4 participants

@vincenzopalazzo@codecov-commenter@TheBlueMatt@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' send warning when we receive a old commitment transaction by vincenzopalazzo · Pull Request #1430 · lightningdevkit/rust-lightning · GitHub
Skip to content

send warning when we receive a old commitment transaction - #1430

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2
May 4, 2022
Merged

send warning when we receive a old commitment transaction#1430
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2

Conversation

@vincenzopalazzo

@vincenzopalazzovincenzopalazzo commented Apr 18, 2022

Copy link
Copy Markdown
Member

During a channel_reestablish now we send a warning message when we receive an old commitment transaction.

Fixes#1207 with the following consideration lightning/bolts#934 (comment)

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from f40c9bb to 136171dCompareApril 18, 2022 21:59
Comment threadlightning/src/ln/channel.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 5 times, most recently from 7ae6fdc to fc33225CompareApril 22, 2022 10:15
@vincenzopalazzovincenzopalazzo changed the title send warning when we have a old commitment transactionsend warning when we receive a old commitment transactionApr 22, 2022
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from c70e6d3 to d04ca27CompareApril 22, 2022 11:10
@codecov-commenter

codecov-commenter commented Apr 22, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1430 (e6300da) into main (171dfee) will increase coverage by 0.46%.
The diff coverage is 88.57%.

@@ Coverage Diff @@## main #1430 +/- ##
==========================================
+ Coverage 90.89% 91.36% +0.46% 
==========================================
Files 75 75 Lines 41657 43716 +2059 Branches 41657 43716 +2059 ==========================================
+ Hits 37866 39941 +2075 + Misses 3791 3775 -16 
Impacted FilesCoverage Δ
lightning/src/ln/channel.rs92.57% <75.00%> (+4.18%)⬆️
lightning/src/ln/functional_tests.rs97.40% <92.59%> (+0.22%)⬆️
lightning/src/ln/reorg_tests.rs100.00% <0.00%> (ø)
lightning/src/util/config.rs48.35% <0.00%> (+3.45%)⬆️

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 171dfee...e6300da. Read the comment docs.

@vincenzopalazzo
vincenzopalazzo marked this pull request as ready for review April 22, 2022 11:51
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5ada132 to 3e41b90CompareApril 22, 2022 17:22
Comment threadlightning/src/ln/functional_tests.rs Outdated

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

OK! I tried to make a little bit of refactoring and applied the changes that you suggested.

The only think that is unclear to me right now, is this case

https://github.com/lightningdevkit/rust-lightning/blob/main/lightning/src/ln/channel.rs#L3708-L3712

Why in this case there is a CloseDelayBroadcast why does mean? i was not able to find some comments about the meaning, and I didn't check if the spec has some info about this case!

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

Sorry for the delay in reviewing this!

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from c80ea92 to 5a55542CompareApril 25, 2022 19:45
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5a55542 to 43edafaCompareApril 27, 2022 20:05
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Rebased on master, I reorganized the test in a more clean way where the different cases are executed at the end of the function. In this way, it is cleaner to the reader what we are trying to do!

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

Awesome! One note - we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 53d7cda to 8931516CompareApril 28, 2022 15:49
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Sorry! I rebased and squash the commit in a single one!

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically looks good, one comment on the second branch of the test.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 8931516 to 6dac37bCompareApril 28, 2022 20:55

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM!

Comment threadlightning/src/ln/functional_tests.rs
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from d3651e1 to 833a74eCompareMay 3, 2022 12:58
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Hmm, was there a conflict? In general please avoid rebase'ing unless there's a conflict with the current upstream git.

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, lets get another reviewer.

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

I clean up the code and remove the enum. thanks, @valentinewallace to point me on this, and also for the grammar mistake!

I also rebased on top of the last master!

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

I also rebased on top of the last master!

Generally please avoid this unless there is a conflict. Rebases make it harder to diff-tree and see changes to a PR, range-diff can be a bit more finicky and hard to read.

@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Ops! sorry @TheBlueMatt

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5dd4662 to a399d1fCompareMay 3, 2022 22:14
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 6ecb4d6 to 040b3cdCompareMay 3, 2022 23:01
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs
During a `channel_reestablish` now we send a warning message when we receive a old commitment transaction from the peer.
In addition, this commit include the update of functional test to make sure that the receiver will generate warn messages.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 040b3cd to e6300daCompareMay 4, 2022 07:23
@TheBlueMatt
TheBlueMatt merged commit 9fbafd4 into lightningdevkit:mainMay 4, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don'e force-close if a peer is behind our latest state on reestablish

4 participants

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

send warning when we receive a old commitment transaction - #1430

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2
May 4, 2022
Merged

send warning when we receive a old commitment transaction#1430
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
vincenzopalazzo:macros/channel_reestablish_v2

Conversation

@vincenzopalazzo

@vincenzopalazzovincenzopalazzo commented Apr 18, 2022

Copy link
Copy Markdown
Member

During a channel_reestablish now we send a warning message when we receive an old commitment transaction.

Fixes#1207 with the following consideration lightning/bolts#934 (comment)

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from f40c9bb to 136171dCompareApril 18, 2022 21:59
Comment threadlightning/src/ln/channel.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 5 times, most recently from 7ae6fdc to fc33225CompareApril 22, 2022 10:15
@vincenzopalazzovincenzopalazzo changed the title send warning when we have a old commitment transactionsend warning when we receive a old commitment transactionApr 22, 2022
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from c70e6d3 to d04ca27CompareApril 22, 2022 11:10
@codecov-commenter

codecov-commenter commented Apr 22, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1430 (e6300da) into main (171dfee) will increase coverage by 0.46%.
The diff coverage is 88.57%.

@@ Coverage Diff @@## main #1430 +/- ##
==========================================
+ Coverage 90.89% 91.36% +0.46% 
==========================================
Files 75 75 Lines 41657 43716 +2059 Branches 41657 43716 +2059 ==========================================
+ Hits 37866 39941 +2075 + Misses 3791 3775 -16 
Impacted FilesCoverage Δ
lightning/src/ln/channel.rs92.57% <75.00%> (+4.18%)⬆️
lightning/src/ln/functional_tests.rs97.40% <92.59%> (+0.22%)⬆️
lightning/src/ln/reorg_tests.rs100.00% <0.00%> (ø)
lightning/src/util/config.rs48.35% <0.00%> (+3.45%)⬆️

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 171dfee...e6300da. Read the comment docs.

@vincenzopalazzo
vincenzopalazzo marked this pull request as ready for review April 22, 2022 11:51
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5ada132 to 3e41b90CompareApril 22, 2022 17:22
Comment threadlightning/src/ln/functional_tests.rs Outdated

@vincenzopalazzovincenzopalazzo left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

OK! I tried to make a little bit of refactoring and applied the changes that you suggested.

The only think that is unclear to me right now, is this case

https://github.com/lightningdevkit/rust-lightning/blob/main/lightning/src/ln/channel.rs#L3708-L3712

Why in this case there is a CloseDelayBroadcast why does mean? i was not able to find some comments about the meaning, and I didn't check if the spec has some info about this case!

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

Sorry for the delay in reviewing this!

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from c80ea92 to 5a55542CompareApril 25, 2022 19:45
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5a55542 to 43edafaCompareApril 27, 2022 20:05
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Rebased on master, I reorganized the test in a more clean way where the different cases are executed at the end of the function. In this way, it is cleaner to the reader what we are trying to do!

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

Awesome! One note - we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 53d7cda to 8931516CompareApril 28, 2022 15:49
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

we don't like having intermediate commits that fail tests. We don't test for it in CI (only that it compiles), but if at all possible try to make sure each individual commit passes tests as well, ensuring we can git bisect easily.

Sorry! I rebased and squash the commit in a single one!

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically looks good, one comment on the second branch of the test.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 8931516 to 6dac37bCompareApril 28, 2022 20:55

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM!

Comment threadlightning/src/ln/functional_tests.rs
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from d3651e1 to 833a74eCompareMay 3, 2022 12:58
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Hmm, was there a conflict? In general please avoid rebase'ing unless there's a conflict with the current upstream git.

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, lets get another reviewer.

Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

I clean up the code and remove the enum. thanks, @valentinewallace to point me on this, and also for the grammar mistake!

I also rebased on top of the last master!

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

I also rebased on top of the last master!

Generally please avoid this unless there is a conflict. Rebases make it harder to diff-tree and see changes to a PR, range-diff can be a bit more finicky and hard to read.

@vincenzopalazzo

Copy link
Copy Markdown
MemberAuthor

Ops! sorry @TheBlueMatt

@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 5dd4662 to a399d1fCompareMay 3, 2022 22:14
Comment threadlightning/src/ln/functional_tests.rs Outdated
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch 2 times, most recently from 6ecb4d6 to 040b3cdCompareMay 3, 2022 23:01
Comment threadlightning/src/ln/functional_tests.rs Outdated
Comment threadlightning/src/ln/channel.rs
During a `channel_reestablish` now we send a warning message when we receive a old commitment transaction from the peer.
In addition, this commit include the update of functional test to make sure that the receiver will generate warn messages.
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
@vincenzopalazzo
vincenzopalazzoforce-pushed the macros/channel_reestablish_v2 branch from 040b3cd to e6300daCompareMay 4, 2022 07:23
@TheBlueMatt
TheBlueMatt merged commit 9fbafd4 into lightningdevkit:mainMay 4, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don'e force-close if a peer is behind our latest state on reestablish

4 participants

@vincenzopalazzo@codecov-commenter@TheBlueMatt@valentinewallace