Skip to content

Improve block connection logging and filtered txids - #2637

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348
Dec 11, 2023
Merged

Improve block connection logging and filtered txids#2637
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348

Conversation

@Sharmalm

Copy link
Copy Markdown
Contributor

this pr solves #2348.

@codecov-commenter

codecov-commenter commented Oct 2, 2023

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (fcf47a4) 88.57% compared to head (f89d42c) 89.68%.
Report is 50 commits behind head on main.

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

Additional details and impacted files
@@ Coverage Diff @@## main #2637 +/- ##
==========================================
+ Coverage 88.57% 89.68% +1.10% 
==========================================
Files 115 115 Lines 90687 98529 +7842 Branches 90687 98529 +7842 ==========================================
+ Hits 80327 88364 +8037 + Misses 7962 7842 -120 + Partials 2398 2323 -75 

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

@Sharmalm
Sharmalm marked this pull request as ready for review October 2, 2023 16:11
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Sharmalm commented Oct 15, 2023

Copy link
Copy Markdown
ContributorAuthor

I have updated the changes, please review it :)

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs

@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, somehow missed your previous push. Two more comments and I think this is good.

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
valentinewallace
valentinewallace previously approved these changes Nov 1, 2023

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some nits but nothing blocking!

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

if every looks good in this PR, then i'll rebase this commit also.
Thank you everyone for the guidance and help during this PR :)

valentinewallace
valentinewallace previously approved these changes Nov 2, 2023
Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

I have been busy with my End term examination of my college , so i wasn't able to update this PR. Now i am active.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hi @Sharmalm! Thank you for the PR update, and I hope your End Term Examinations went well!

I have a suggestion to enhance consistency in the PR. Given that we have explicitly defined "Display" for the OutPoint struct, I propose using it instead of (".. {}:{} ..", txid, index) for better clarity.

Here's the proposed diff:

 let lock = self.inner.lock().unwrap();
filter.register_tx(&lock.get_funding_txo().0.txid, &lock.get_funding_txo().1);
log_trace!(logger, - "Registering funding outpoint {}:{}", &lock.get_funding_txo().0.txid, &lock.get_funding_txo().0.index);+ "Registering funding outpoint {}", &lock.get_funding_txo().0);
for (txid, outputs) in lock.get_outputs_to_watch().iter() {
for (index, script_pubkey) in outputs.iter() {
assert!(*index <= u16::max_value() as u32);
+ let outpoint = OutPoint { txid: *txid, index: *index as u16 };
filter.register_output(WatchedOutput {
block_hash: None,
- outpoint: OutPoint { txid: *txid, index: *index as u16 },+ outpoint: outpoint,
script_pubkey: script_pubkey.clone(),
});
- log_trace!(logger, "Adding monitoring for spends of outpoint {}:{} to the filter", txid, index);+ log_trace!(logger, "Adding monitoring for spends of outpoint {} to the filter", outpoint);
}
}
}

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

Okay

@shaavan

Copy link
Copy Markdown
Member

Let's squash the commits together before going with the final ACK.
If you need help with git squash or rebasing, this guide will prove helpful!

https://www.freecodecamp.org/news/git-squash-commits/

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

So everything looks good?

@shaavan

Copy link
Copy Markdown
Member

Yep!

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Can you please update the commit to have a description of what its doing, rather than a list of previous commit titles? See https://cbea.ms/git-commit/ for suggested formats.

@Sharmalm

Sharmalm commented Dec 6, 2023

Copy link
Copy Markdown
ContributorAuthor

I have update the the description.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just a quick note:

This commit is logging confirmed TXIDs and also logging when we add things to the filter.

The commit message is improved, but it still feels like it's missing something. How about adding a mention of implementing the Display trait?

Here's my suggestion:

"Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints. Additionally, add log tracing for best_block_update and confirmed transactions."

Thanks!

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ACK

valentinewallace
valentinewallace previously approved these changes Dec 7, 2023
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@valentinewallace
valentinewallace dismissed their stale reviewDecember 7, 2023 22:40

needs to use new logging wrappers

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints.
Additionally, add log tracing for best_block_update and confirmed transactions.
solves lightningdevkit#2348

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

Good enough.

@TheBlueMatt
TheBlueMatt merged commit 4b35697 into lightningdevkit:mainDec 11, 2023
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.

6 participants

@Sharmalm@codecov-commenter@shaavan@TheBlueMatt@jkczyz@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" + '
Improve block connection logging and filtered txids by Sharmalm · Pull Request #2637 · lightningdevkit/rust-lightning · GitHub
Skip to content

Improve block connection logging and filtered txids - #2637

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348
Dec 11, 2023
Merged

Improve block connection logging and filtered txids#2637
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348

Conversation

@Sharmalm

Copy link
Copy Markdown
Contributor

this pr solves #2348.

@codecov-commenter

codecov-commenter commented Oct 2, 2023

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (fcf47a4) 88.57% compared to head (f89d42c) 89.68%.
Report is 50 commits behind head on main.

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

Additional details and impacted files
@@ Coverage Diff @@## main #2637 +/- ##
==========================================
+ Coverage 88.57% 89.68% +1.10% 
==========================================
Files 115 115 Lines 90687 98529 +7842 Branches 90687 98529 +7842 ==========================================
+ Hits 80327 88364 +8037 + Misses 7962 7842 -120 + Partials 2398 2323 -75 

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

@Sharmalm
Sharmalm marked this pull request as ready for review October 2, 2023 16:11
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Sharmalm commented Oct 15, 2023

Copy link
Copy Markdown
ContributorAuthor

I have updated the changes, please review it :)

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs

@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, somehow missed your previous push. Two more comments and I think this is good.

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
valentinewallace
valentinewallace previously approved these changes Nov 1, 2023

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some nits but nothing blocking!

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

if every looks good in this PR, then i'll rebase this commit also.
Thank you everyone for the guidance and help during this PR :)

valentinewallace
valentinewallace previously approved these changes Nov 2, 2023
Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

I have been busy with my End term examination of my college , so i wasn't able to update this PR. Now i am active.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hi @Sharmalm! Thank you for the PR update, and I hope your End Term Examinations went well!

I have a suggestion to enhance consistency in the PR. Given that we have explicitly defined "Display" for the OutPoint struct, I propose using it instead of (".. {}:{} ..", txid, index) for better clarity.

Here's the proposed diff:

 let lock = self.inner.lock().unwrap();
filter.register_tx(&lock.get_funding_txo().0.txid, &lock.get_funding_txo().1);
log_trace!(logger, - "Registering funding outpoint {}:{}", &lock.get_funding_txo().0.txid, &lock.get_funding_txo().0.index);+ "Registering funding outpoint {}", &lock.get_funding_txo().0);
for (txid, outputs) in lock.get_outputs_to_watch().iter() {
for (index, script_pubkey) in outputs.iter() {
assert!(*index <= u16::max_value() as u32);
+ let outpoint = OutPoint { txid: *txid, index: *index as u16 };
filter.register_output(WatchedOutput {
block_hash: None,
- outpoint: OutPoint { txid: *txid, index: *index as u16 },+ outpoint: outpoint,
script_pubkey: script_pubkey.clone(),
});
- log_trace!(logger, "Adding monitoring for spends of outpoint {}:{} to the filter", txid, index);+ log_trace!(logger, "Adding monitoring for spends of outpoint {} to the filter", outpoint);
}
}
}

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

Okay

@shaavan

Copy link
Copy Markdown
Member

Let's squash the commits together before going with the final ACK.
If you need help with git squash or rebasing, this guide will prove helpful!

https://www.freecodecamp.org/news/git-squash-commits/

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

So everything looks good?

@shaavan

Copy link
Copy Markdown
Member

Yep!

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Can you please update the commit to have a description of what its doing, rather than a list of previous commit titles? See https://cbea.ms/git-commit/ for suggested formats.

@Sharmalm

Sharmalm commented Dec 6, 2023

Copy link
Copy Markdown
ContributorAuthor

I have update the the description.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just a quick note:

This commit is logging confirmed TXIDs and also logging when we add things to the filter.

The commit message is improved, but it still feels like it's missing something. How about adding a mention of implementing the Display trait?

Here's my suggestion:

"Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints. Additionally, add log tracing for best_block_update and confirmed transactions."

Thanks!

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ACK

valentinewallace
valentinewallace previously approved these changes Dec 7, 2023
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@valentinewallace
valentinewallace dismissed their stale reviewDecember 7, 2023 22:40

needs to use new logging wrappers

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints.
Additionally, add log tracing for best_block_update and confirmed transactions.
solves lightningdevkit#2348

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

Good enough.

@TheBlueMatt
TheBlueMatt merged commit 4b35697 into lightningdevkit:mainDec 11, 2023
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.

6 participants

@Sharmalm@codecov-commenter@shaavan@TheBlueMatt@jkczyz@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('^' + ".*" + ' Improve block connection logging and filtered txids by Sharmalm · Pull Request #2637 · lightningdevkit/rust-lightning · GitHub
Skip to content

Improve block connection logging and filtered txids - #2637

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348
Dec 11, 2023
Merged

Improve block connection logging and filtered txids#2637
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348

Conversation

@Sharmalm

Copy link
Copy Markdown
Contributor

this pr solves #2348.

@codecov-commenter

codecov-commenter commented Oct 2, 2023

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (fcf47a4) 88.57% compared to head (f89d42c) 89.68%.
Report is 50 commits behind head on main.

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

Additional details and impacted files
@@ Coverage Diff @@## main #2637 +/- ##
==========================================
+ Coverage 88.57% 89.68% +1.10% 
==========================================
Files 115 115 Lines 90687 98529 +7842 Branches 90687 98529 +7842 ==========================================
+ Hits 80327 88364 +8037 + Misses 7962 7842 -120 + Partials 2398 2323 -75 

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

@Sharmalm
Sharmalm marked this pull request as ready for review October 2, 2023 16:11
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Sharmalm commented Oct 15, 2023

Copy link
Copy Markdown
ContributorAuthor

I have updated the changes, please review it :)

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs

@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, somehow missed your previous push. Two more comments and I think this is good.

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
valentinewallace
valentinewallace previously approved these changes Nov 1, 2023

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some nits but nothing blocking!

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

if every looks good in this PR, then i'll rebase this commit also.
Thank you everyone for the guidance and help during this PR :)

valentinewallace
valentinewallace previously approved these changes Nov 2, 2023
Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

I have been busy with my End term examination of my college , so i wasn't able to update this PR. Now i am active.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hi @Sharmalm! Thank you for the PR update, and I hope your End Term Examinations went well!

I have a suggestion to enhance consistency in the PR. Given that we have explicitly defined "Display" for the OutPoint struct, I propose using it instead of (".. {}:{} ..", txid, index) for better clarity.

Here's the proposed diff:

 let lock = self.inner.lock().unwrap();
filter.register_tx(&lock.get_funding_txo().0.txid, &lock.get_funding_txo().1);
log_trace!(logger, - "Registering funding outpoint {}:{}", &lock.get_funding_txo().0.txid, &lock.get_funding_txo().0.index);+ "Registering funding outpoint {}", &lock.get_funding_txo().0);
for (txid, outputs) in lock.get_outputs_to_watch().iter() {
for (index, script_pubkey) in outputs.iter() {
assert!(*index <= u16::max_value() as u32);
+ let outpoint = OutPoint { txid: *txid, index: *index as u16 };
filter.register_output(WatchedOutput {
block_hash: None,
- outpoint: OutPoint { txid: *txid, index: *index as u16 },+ outpoint: outpoint,
script_pubkey: script_pubkey.clone(),
});
- log_trace!(logger, "Adding monitoring for spends of outpoint {}:{} to the filter", txid, index);+ log_trace!(logger, "Adding monitoring for spends of outpoint {} to the filter", outpoint);
}
}
}

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

Okay

@shaavan

Copy link
Copy Markdown
Member

Let's squash the commits together before going with the final ACK.
If you need help with git squash or rebasing, this guide will prove helpful!

https://www.freecodecamp.org/news/git-squash-commits/

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

So everything looks good?

@shaavan

Copy link
Copy Markdown
Member

Yep!

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Can you please update the commit to have a description of what its doing, rather than a list of previous commit titles? See https://cbea.ms/git-commit/ for suggested formats.

@Sharmalm

Sharmalm commented Dec 6, 2023

Copy link
Copy Markdown
ContributorAuthor

I have update the the description.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just a quick note:

This commit is logging confirmed TXIDs and also logging when we add things to the filter.

The commit message is improved, but it still feels like it's missing something. How about adding a mention of implementing the Display trait?

Here's my suggestion:

"Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints. Additionally, add log tracing for best_block_update and confirmed transactions."

Thanks!

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ACK

valentinewallace
valentinewallace previously approved these changes Dec 7, 2023
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@valentinewallace
valentinewallace dismissed their stale reviewDecember 7, 2023 22:40

needs to use new logging wrappers

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints.
Additionally, add log tracing for best_block_update and confirmed transactions.
solves lightningdevkit#2348

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

Good enough.

@TheBlueMatt
TheBlueMatt merged commit 4b35697 into lightningdevkit:mainDec 11, 2023
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.

6 participants

@Sharmalm@codecov-commenter@shaavan@TheBlueMatt@jkczyz@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('^' + ".*" + ' Improve block connection logging and filtered txids by Sharmalm · Pull Request #2637 · lightningdevkit/rust-lightning · GitHub
Skip to content

Improve block connection logging and filtered txids - #2637

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348
Dec 11, 2023
Merged

Improve block connection logging and filtered txids#2637
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348

Conversation

@Sharmalm

Copy link
Copy Markdown
Contributor

this pr solves #2348.

@codecov-commenter

codecov-commenter commented Oct 2, 2023

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (fcf47a4) 88.57% compared to head (f89d42c) 89.68%.
Report is 50 commits behind head on main.

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

Additional details and impacted files
@@ Coverage Diff @@## main #2637 +/- ##
==========================================
+ Coverage 88.57% 89.68% +1.10% 
==========================================
Files 115 115 Lines 90687 98529 +7842 Branches 90687 98529 +7842 ==========================================
+ Hits 80327 88364 +8037 + Misses 7962 7842 -120 + Partials 2398 2323 -75 

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

@Sharmalm
Sharmalm marked this pull request as ready for review October 2, 2023 16:11
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Sharmalm commented Oct 15, 2023

Copy link
Copy Markdown
ContributorAuthor

I have updated the changes, please review it :)

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs

@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, somehow missed your previous push. Two more comments and I think this is good.

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
valentinewallace
valentinewallace previously approved these changes Nov 1, 2023

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some nits but nothing blocking!

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

if every looks good in this PR, then i'll rebase this commit also.
Thank you everyone for the guidance and help during this PR :)

valentinewallace
valentinewallace previously approved these changes Nov 2, 2023
Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

I have been busy with my End term examination of my college , so i wasn't able to update this PR. Now i am active.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hi @Sharmalm! Thank you for the PR update, and I hope your End Term Examinations went well!

I have a suggestion to enhance consistency in the PR. Given that we have explicitly defined "Display" for the OutPoint struct, I propose using it instead of (".. {}:{} ..", txid, index) for better clarity.

Here's the proposed diff:

 let lock = self.inner.lock().unwrap();
filter.register_tx(&lock.get_funding_txo().0.txid, &lock.get_funding_txo().1);
log_trace!(logger, - "Registering funding outpoint {}:{}", &lock.get_funding_txo().0.txid, &lock.get_funding_txo().0.index);+ "Registering funding outpoint {}", &lock.get_funding_txo().0);
for (txid, outputs) in lock.get_outputs_to_watch().iter() {
for (index, script_pubkey) in outputs.iter() {
assert!(*index <= u16::max_value() as u32);
+ let outpoint = OutPoint { txid: *txid, index: *index as u16 };
filter.register_output(WatchedOutput {
block_hash: None,
- outpoint: OutPoint { txid: *txid, index: *index as u16 },+ outpoint: outpoint,
script_pubkey: script_pubkey.clone(),
});
- log_trace!(logger, "Adding monitoring for spends of outpoint {}:{} to the filter", txid, index);+ log_trace!(logger, "Adding monitoring for spends of outpoint {} to the filter", outpoint);
}
}
}

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

Okay

@shaavan

Copy link
Copy Markdown
Member

Let's squash the commits together before going with the final ACK.
If you need help with git squash or rebasing, this guide will prove helpful!

https://www.freecodecamp.org/news/git-squash-commits/

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

So everything looks good?

@shaavan

Copy link
Copy Markdown
Member

Yep!

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Can you please update the commit to have a description of what its doing, rather than a list of previous commit titles? See https://cbea.ms/git-commit/ for suggested formats.

@Sharmalm

Sharmalm commented Dec 6, 2023

Copy link
Copy Markdown
ContributorAuthor

I have update the the description.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just a quick note:

This commit is logging confirmed TXIDs and also logging when we add things to the filter.

The commit message is improved, but it still feels like it's missing something. How about adding a mention of implementing the Display trait?

Here's my suggestion:

"Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints. Additionally, add log tracing for best_block_update and confirmed transactions."

Thanks!

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ACK

valentinewallace
valentinewallace previously approved these changes Dec 7, 2023
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@valentinewallace
valentinewallace dismissed their stale reviewDecember 7, 2023 22:40

needs to use new logging wrappers

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints.
Additionally, add log tracing for best_block_update and confirmed transactions.
solves lightningdevkit#2348

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

Good enough.

@TheBlueMatt
TheBlueMatt merged commit 4b35697 into lightningdevkit:mainDec 11, 2023
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.

6 participants

@Sharmalm@codecov-commenter@shaavan@TheBlueMatt@jkczyz@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" + ' Improve block connection logging and filtered txids by Sharmalm · Pull Request #2637 · lightningdevkit/rust-lightning · GitHub
Skip to content

Improve block connection logging and filtered txids - #2637

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348
Dec 11, 2023
Merged

Improve block connection logging and filtered txids#2637
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348

Conversation

@Sharmalm

Copy link
Copy Markdown
Contributor

this pr solves #2348.

@codecov-commenter

codecov-commenter commented Oct 2, 2023

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (fcf47a4) 88.57% compared to head (f89d42c) 89.68%.
Report is 50 commits behind head on main.

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

Additional details and impacted files
@@ Coverage Diff @@## main #2637 +/- ##
==========================================
+ Coverage 88.57% 89.68% +1.10% 
==========================================
Files 115 115 Lines 90687 98529 +7842 Branches 90687 98529 +7842 ==========================================
+ Hits 80327 88364 +8037 + Misses 7962 7842 -120 + Partials 2398 2323 -75 

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

@Sharmalm
Sharmalm marked this pull request as ready for review October 2, 2023 16:11
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Sharmalm commented Oct 15, 2023

Copy link
Copy Markdown
ContributorAuthor

I have updated the changes, please review it :)

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs

@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, somehow missed your previous push. Two more comments and I think this is good.

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
valentinewallace
valentinewallace previously approved these changes Nov 1, 2023

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some nits but nothing blocking!

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

if every looks good in this PR, then i'll rebase this commit also.
Thank you everyone for the guidance and help during this PR :)

valentinewallace
valentinewallace previously approved these changes Nov 2, 2023
Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

I have been busy with my End term examination of my college , so i wasn't able to update this PR. Now i am active.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hi @Sharmalm! Thank you for the PR update, and I hope your End Term Examinations went well!

I have a suggestion to enhance consistency in the PR. Given that we have explicitly defined "Display" for the OutPoint struct, I propose using it instead of (".. {}:{} ..", txid, index) for better clarity.

Here's the proposed diff:

 let lock = self.inner.lock().unwrap();
filter.register_tx(&lock.get_funding_txo().0.txid, &lock.get_funding_txo().1);
log_trace!(logger, - "Registering funding outpoint {}:{}", &lock.get_funding_txo().0.txid, &lock.get_funding_txo().0.index);+ "Registering funding outpoint {}", &lock.get_funding_txo().0);
for (txid, outputs) in lock.get_outputs_to_watch().iter() {
for (index, script_pubkey) in outputs.iter() {
assert!(*index <= u16::max_value() as u32);
+ let outpoint = OutPoint { txid: *txid, index: *index as u16 };
filter.register_output(WatchedOutput {
block_hash: None,
- outpoint: OutPoint { txid: *txid, index: *index as u16 },+ outpoint: outpoint,
script_pubkey: script_pubkey.clone(),
});
- log_trace!(logger, "Adding monitoring for spends of outpoint {}:{} to the filter", txid, index);+ log_trace!(logger, "Adding monitoring for spends of outpoint {} to the filter", outpoint);
}
}
}

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

Okay

@shaavan

Copy link
Copy Markdown
Member

Let's squash the commits together before going with the final ACK.
If you need help with git squash or rebasing, this guide will prove helpful!

https://www.freecodecamp.org/news/git-squash-commits/

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

So everything looks good?

@shaavan

Copy link
Copy Markdown
Member

Yep!

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Can you please update the commit to have a description of what its doing, rather than a list of previous commit titles? See https://cbea.ms/git-commit/ for suggested formats.

@Sharmalm

Sharmalm commented Dec 6, 2023

Copy link
Copy Markdown
ContributorAuthor

I have update the the description.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just a quick note:

This commit is logging confirmed TXIDs and also logging when we add things to the filter.

The commit message is improved, but it still feels like it's missing something. How about adding a mention of implementing the Display trait?

Here's my suggestion:

"Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints. Additionally, add log tracing for best_block_update and confirmed transactions."

Thanks!

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ACK

valentinewallace
valentinewallace previously approved these changes Dec 7, 2023
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@valentinewallace
valentinewallace dismissed their stale reviewDecember 7, 2023 22:40

needs to use new logging wrappers

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints.
Additionally, add log tracing for best_block_update and confirmed transactions.
solves lightningdevkit#2348

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

Good enough.

@TheBlueMatt
TheBlueMatt merged commit 4b35697 into lightningdevkit:mainDec 11, 2023
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.

6 participants

@Sharmalm@codecov-commenter@shaavan@TheBlueMatt@jkczyz@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('^' + ".*" + ' Improve block connection logging and filtered txids by Sharmalm · Pull Request #2637 · lightningdevkit/rust-lightning · GitHub
Skip to content

Improve block connection logging and filtered txids - #2637

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348
Dec 11, 2023
Merged

Improve block connection logging and filtered txids#2637
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348

Conversation

@Sharmalm

Copy link
Copy Markdown
Contributor

this pr solves #2348.

@codecov-commenter

codecov-commenter commented Oct 2, 2023

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (fcf47a4) 88.57% compared to head (f89d42c) 89.68%.
Report is 50 commits behind head on main.

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

Additional details and impacted files
@@ Coverage Diff @@## main #2637 +/- ##
==========================================
+ Coverage 88.57% 89.68% +1.10% 
==========================================
Files 115 115 Lines 90687 98529 +7842 Branches 90687 98529 +7842 ==========================================
+ Hits 80327 88364 +8037 + Misses 7962 7842 -120 + Partials 2398 2323 -75 

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

@Sharmalm
Sharmalm marked this pull request as ready for review October 2, 2023 16:11
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Sharmalm commented Oct 15, 2023

Copy link
Copy Markdown
ContributorAuthor

I have updated the changes, please review it :)

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs

@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, somehow missed your previous push. Two more comments and I think this is good.

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
valentinewallace
valentinewallace previously approved these changes Nov 1, 2023

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some nits but nothing blocking!

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

if every looks good in this PR, then i'll rebase this commit also.
Thank you everyone for the guidance and help during this PR :)

valentinewallace
valentinewallace previously approved these changes Nov 2, 2023
Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

I have been busy with my End term examination of my college , so i wasn't able to update this PR. Now i am active.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hi @Sharmalm! Thank you for the PR update, and I hope your End Term Examinations went well!

I have a suggestion to enhance consistency in the PR. Given that we have explicitly defined "Display" for the OutPoint struct, I propose using it instead of (".. {}:{} ..", txid, index) for better clarity.

Here's the proposed diff:

 let lock = self.inner.lock().unwrap();
filter.register_tx(&lock.get_funding_txo().0.txid, &lock.get_funding_txo().1);
log_trace!(logger, - "Registering funding outpoint {}:{}", &lock.get_funding_txo().0.txid, &lock.get_funding_txo().0.index);+ "Registering funding outpoint {}", &lock.get_funding_txo().0);
for (txid, outputs) in lock.get_outputs_to_watch().iter() {
for (index, script_pubkey) in outputs.iter() {
assert!(*index <= u16::max_value() as u32);
+ let outpoint = OutPoint { txid: *txid, index: *index as u16 };
filter.register_output(WatchedOutput {
block_hash: None,
- outpoint: OutPoint { txid: *txid, index: *index as u16 },+ outpoint: outpoint,
script_pubkey: script_pubkey.clone(),
});
- log_trace!(logger, "Adding monitoring for spends of outpoint {}:{} to the filter", txid, index);+ log_trace!(logger, "Adding monitoring for spends of outpoint {} to the filter", outpoint);
}
}
}

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

Okay

@shaavan

Copy link
Copy Markdown
Member

Let's squash the commits together before going with the final ACK.
If you need help with git squash or rebasing, this guide will prove helpful!

https://www.freecodecamp.org/news/git-squash-commits/

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

So everything looks good?

@shaavan

Copy link
Copy Markdown
Member

Yep!

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Can you please update the commit to have a description of what its doing, rather than a list of previous commit titles? See https://cbea.ms/git-commit/ for suggested formats.

@Sharmalm

Sharmalm commented Dec 6, 2023

Copy link
Copy Markdown
ContributorAuthor

I have update the the description.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just a quick note:

This commit is logging confirmed TXIDs and also logging when we add things to the filter.

The commit message is improved, but it still feels like it's missing something. How about adding a mention of implementing the Display trait?

Here's my suggestion:

"Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints. Additionally, add log tracing for best_block_update and confirmed transactions."

Thanks!

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ACK

valentinewallace
valentinewallace previously approved these changes Dec 7, 2023
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@valentinewallace
valentinewallace dismissed their stale reviewDecember 7, 2023 22:40

needs to use new logging wrappers

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints.
Additionally, add log tracing for best_block_update and confirmed transactions.
solves lightningdevkit#2348

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

Good enough.

@TheBlueMatt
TheBlueMatt merged commit 4b35697 into lightningdevkit:mainDec 11, 2023
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.

6 participants

@Sharmalm@codecov-commenter@shaavan@TheBlueMatt@jkczyz@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('^' + ".*" + ' Improve block connection logging and filtered txids by Sharmalm · Pull Request #2637 · lightningdevkit/rust-lightning · GitHub
Skip to content

Improve block connection logging and filtered txids - #2637

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348
Dec 11, 2023
Merged

Improve block connection logging and filtered txids#2637
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348

Conversation

@Sharmalm

Copy link
Copy Markdown
Contributor

this pr solves #2348.

@codecov-commenter

codecov-commenter commented Oct 2, 2023

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (fcf47a4) 88.57% compared to head (f89d42c) 89.68%.
Report is 50 commits behind head on main.

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

Additional details and impacted files
@@ Coverage Diff @@## main #2637 +/- ##
==========================================
+ Coverage 88.57% 89.68% +1.10% 
==========================================
Files 115 115 Lines 90687 98529 +7842 Branches 90687 98529 +7842 ==========================================
+ Hits 80327 88364 +8037 + Misses 7962 7842 -120 + Partials 2398 2323 -75 

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

@Sharmalm
Sharmalm marked this pull request as ready for review October 2, 2023 16:11
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Sharmalm commented Oct 15, 2023

Copy link
Copy Markdown
ContributorAuthor

I have updated the changes, please review it :)

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs

@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, somehow missed your previous push. Two more comments and I think this is good.

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
valentinewallace
valentinewallace previously approved these changes Nov 1, 2023

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some nits but nothing blocking!

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

if every looks good in this PR, then i'll rebase this commit also.
Thank you everyone for the guidance and help during this PR :)

valentinewallace
valentinewallace previously approved these changes Nov 2, 2023
Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

I have been busy with my End term examination of my college , so i wasn't able to update this PR. Now i am active.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hi @Sharmalm! Thank you for the PR update, and I hope your End Term Examinations went well!

I have a suggestion to enhance consistency in the PR. Given that we have explicitly defined "Display" for the OutPoint struct, I propose using it instead of (".. {}:{} ..", txid, index) for better clarity.

Here's the proposed diff:

 let lock = self.inner.lock().unwrap();
filter.register_tx(&lock.get_funding_txo().0.txid, &lock.get_funding_txo().1);
log_trace!(logger, - "Registering funding outpoint {}:{}", &lock.get_funding_txo().0.txid, &lock.get_funding_txo().0.index);+ "Registering funding outpoint {}", &lock.get_funding_txo().0);
for (txid, outputs) in lock.get_outputs_to_watch().iter() {
for (index, script_pubkey) in outputs.iter() {
assert!(*index <= u16::max_value() as u32);
+ let outpoint = OutPoint { txid: *txid, index: *index as u16 };
filter.register_output(WatchedOutput {
block_hash: None,
- outpoint: OutPoint { txid: *txid, index: *index as u16 },+ outpoint: outpoint,
script_pubkey: script_pubkey.clone(),
});
- log_trace!(logger, "Adding monitoring for spends of outpoint {}:{} to the filter", txid, index);+ log_trace!(logger, "Adding monitoring for spends of outpoint {} to the filter", outpoint);
}
}
}

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

Okay

@shaavan

Copy link
Copy Markdown
Member

Let's squash the commits together before going with the final ACK.
If you need help with git squash or rebasing, this guide will prove helpful!

https://www.freecodecamp.org/news/git-squash-commits/

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

So everything looks good?

@shaavan

Copy link
Copy Markdown
Member

Yep!

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Can you please update the commit to have a description of what its doing, rather than a list of previous commit titles? See https://cbea.ms/git-commit/ for suggested formats.

@Sharmalm

Sharmalm commented Dec 6, 2023

Copy link
Copy Markdown
ContributorAuthor

I have update the the description.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just a quick note:

This commit is logging confirmed TXIDs and also logging when we add things to the filter.

The commit message is improved, but it still feels like it's missing something. How about adding a mention of implementing the Display trait?

Here's my suggestion:

"Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints. Additionally, add log tracing for best_block_update and confirmed transactions."

Thanks!

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ACK

valentinewallace
valentinewallace previously approved these changes Dec 7, 2023
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@valentinewallace
valentinewallace dismissed their stale reviewDecember 7, 2023 22:40

needs to use new logging wrappers

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints.
Additionally, add log tracing for best_block_update and confirmed transactions.
solves lightningdevkit#2348

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

Good enough.

@TheBlueMatt
TheBlueMatt merged commit 4b35697 into lightningdevkit:mainDec 11, 2023
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.

6 participants

@Sharmalm@codecov-commenter@shaavan@TheBlueMatt@jkczyz@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); } })(); })(); Improve block connection logging and filtered txids by Sharmalm · Pull Request #2637 · lightningdevkit/rust-lightning · GitHub
Skip to content

Improve block connection logging and filtered txids - #2637

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348
Dec 11, 2023
Merged

Improve block connection logging and filtered txids#2637
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
Sharmalm:2348

Conversation

@Sharmalm

Copy link
Copy Markdown
Contributor

this pr solves #2348.

@codecov-commenter

codecov-commenter commented Oct 2, 2023

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (fcf47a4) 88.57% compared to head (f89d42c) 89.68%.
Report is 50 commits behind head on main.

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

Additional details and impacted files
@@ Coverage Diff @@## main #2637 +/- ##
==========================================
+ Coverage 88.57% 89.68% +1.10% 
==========================================
Files 115 115 Lines 90687 98529 +7842 Branches 90687 98529 +7842 ==========================================
+ Hits 80327 88364 +8037 + Misses 7962 7842 -120 + Partials 2398 2323 -75 

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

@Sharmalm
Sharmalm marked this pull request as ready for review October 2, 2023 16:11
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Sharmalm commented Oct 15, 2023

Copy link
Copy Markdown
ContributorAuthor

I have updated the changes, please review it :)

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs

@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, somehow missed your previous push. Two more comments and I think this is good.

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
valentinewallace
valentinewallace previously approved these changes Nov 1, 2023

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some nits but nothing blocking!

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/chainmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

if every looks good in this PR, then i'll rebase this commit also.
Thank you everyone for the guidance and help during this PR :)

valentinewallace
valentinewallace previously approved these changes Nov 2, 2023
Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

I have been busy with my End term examination of my college , so i wasn't able to update this PR. Now i am active.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hi @Sharmalm! Thank you for the PR update, and I hope your End Term Examinations went well!

I have a suggestion to enhance consistency in the PR. Given that we have explicitly defined "Display" for the OutPoint struct, I propose using it instead of (".. {}:{} ..", txid, index) for better clarity.

Here's the proposed diff:

 let lock = self.inner.lock().unwrap();
filter.register_tx(&lock.get_funding_txo().0.txid, &lock.get_funding_txo().1);
log_trace!(logger, - "Registering funding outpoint {}:{}", &lock.get_funding_txo().0.txid, &lock.get_funding_txo().0.index);+ "Registering funding outpoint {}", &lock.get_funding_txo().0);
for (txid, outputs) in lock.get_outputs_to_watch().iter() {
for (index, script_pubkey) in outputs.iter() {
assert!(*index <= u16::max_value() as u32);
+ let outpoint = OutPoint { txid: *txid, index: *index as u16 };
filter.register_output(WatchedOutput {
block_hash: None,
- outpoint: OutPoint { txid: *txid, index: *index as u16 },+ outpoint: outpoint,
script_pubkey: script_pubkey.clone(),
});
- log_trace!(logger, "Adding monitoring for spends of outpoint {}:{} to the filter", txid, index);+ log_trace!(logger, "Adding monitoring for spends of outpoint {} to the filter", outpoint);
}
}
}

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

Okay

@shaavan

Copy link
Copy Markdown
Member

Let's squash the commits together before going with the final ACK.
If you need help with git squash or rebasing, this guide will prove helpful!

https://www.freecodecamp.org/news/git-squash-commits/

@Sharmalm

Copy link
Copy Markdown
ContributorAuthor

So everything looks good?

@shaavan

Copy link
Copy Markdown
Member

Yep!

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM after squash.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Can you please update the commit to have a description of what its doing, rather than a list of previous commit titles? See https://cbea.ms/git-commit/ for suggested formats.

@Sharmalm

Sharmalm commented Dec 6, 2023

Copy link
Copy Markdown
ContributorAuthor

I have update the the description.

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just a quick note:

This commit is logging confirmed TXIDs and also logging when we add things to the filter.

The commit message is improved, but it still feels like it's missing something. How about adding a mention of implementing the Display trait?

Here's my suggestion:

"Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints. Additionally, add log tracing for best_block_update and confirmed transactions."

Thanks!

@shaavanshaavan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ACK

valentinewallace
valentinewallace previously approved these changes Dec 7, 2023
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@valentinewallace
valentinewallace dismissed their stale reviewDecember 7, 2023 22:40

needs to use new logging wrappers

Comment threadlightning/src/chain/chainmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
Implement the Display trait for Outpoint and utilize it in the codebase for monitoring outpoints.
Additionally, add log tracing for best_block_update and confirmed transactions.
solves lightningdevkit#2348

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

Good enough.

@TheBlueMatt
TheBlueMatt merged commit 4b35697 into lightningdevkit:mainDec 11, 2023
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.

6 participants

@Sharmalm@codecov-commenter@shaavan@TheBlueMatt@jkczyz@valentinewallace