Expose channel_id / counterparty_node_id in BumpTransaction event#2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 1 commit into from
Feb 7, 2024
Merged

Expose channel_id / counterparty_node_id in BumpTransaction event #2873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1416,8 +1416,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
/// Loads the funding txo and outputs to watch into the given `chain::Filter` by repeatedly
/// calling `chain::Filter::register_output` and `chain::Filter::register_tx` until all outputs
/// have been registered.
pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
where
pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
where
F::Target: chain::Filter, L::Target: Logger,
{
let lock = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2931,12 +2931,19 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
ClaimEvent::BumpCommitment {
package_target_feerate_sat_per_1000_weight, commitment_tx, anchor_output_idx,
} => {
let channel_id = self.channel_id;
// unwrap safety: `ClaimEvent`s are only available for Anchor channels,
// introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
// since v0.0.110.
let counterparty_node_id = self.counterparty_node_id.unwrap();
let commitment_txid = commitment_tx.txid();
debug_assert_eq!(self.current_holder_commitment_tx.txid, commitment_txid);
let pending_htlcs = self.current_holder_commitment_tx.non_dust_htlcs();
let commitment_tx_fee_satoshis = self.channel_value_satoshis -
commitment_tx.output.iter().fold(0u64, |sum, output| sum + output.value);
ret.push(Event::BumpTransaction(BumpTransactionEvent::ChannelClose {
channel_id,
counterparty_node_id,
claim_id,
package_target_feerate_sat_per_1000_weight,
commitment_tx,
Expand All@@ -2958,6 +2965,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
ClaimEvent::BumpHTLC {
target_feerate_sat_per_1000_weight, htlcs, tx_lock_time,
} => {
let channel_id = self.channel_id;
// unwrap safety: `ClaimEvent`s are only available for Anchor channels,
// introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
// since v0.0.110.
let counterparty_node_id = self.counterparty_node_id.unwrap();
let mut htlc_descriptors = Vec::with_capacity(htlcs.len());
for htlc in htlcs {
htlc_descriptors.push(HTLCDescriptor {
Expand All@@ -2978,6 +2990,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
});
}
ret.push(Event::BumpTransaction(BumpTransactionEvent::HTLCResolution {
channel_id,
counterparty_node_id,
claim_id,
target_feerate_sat_per_1000_weight,
htlc_descriptors,
Expand Down
13 changes: 11 additions & 2 deletions lightning/src/events/bump_transaction.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ use crate::chain::chaininterface::{BroadcasterInterface, fee_for_weight};
use crate::chain::ClaimId;
use crate::io_extras::sink;
use crate::ln::channel::ANCHOR_OUTPUT_VALUE_SATOSHI;
use crate::ln::ChannelId;
use crate::ln::chan_utils;
use crate::ln::chan_utils::{
ANCHOR_INPUT_WITNESS_WEIGHT, HTLC_SUCCESS_INPUT_ANCHOR_WITNESS_WEIGHT,
Expand All@@ -37,7 +38,7 @@ use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::consensus::Encodable;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::secp256k1;
use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::secp256k1::ecdsa::Signature;

const EMPTY_SCRIPT_SIG_WEIGHT: u64 = 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64;
Expand DownExpand Up@@ -147,6 +148,10 @@ pub enum BumpTransactionEvent {
/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_anchor_input
/// [`build_anchor_input_witness`]: crate::ln::chan_utils::build_anchor_input_witness
ChannelClose {
/// The `channel_id` of the channel which has been closed.
channel_id: ChannelId,
/// Counterparty in the closed channel.
counterparty_node_id: PublicKey,
/// The unique identifier for the claim of the anchor output in the commitment transaction.
///
/// The identifier must map to the set of external UTXOs assigned to the claim, such that
Expand DownExpand Up@@ -200,6 +205,10 @@ pub enum BumpTransactionEvent {
/// [`EcdsaChannelSigner`]: crate::sign::ecdsa::EcdsaChannelSigner
/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_htlc_transaction
HTLCResolution {
/// The `channel_id` of the channel which has been closed.
channel_id: ChannelId,
/// Counterparty in the closed channel.
counterparty_node_id: PublicKey,
/// The unique identifier for the claim of the HTLCs in the confirmed commitment
/// transaction.
///
Expand DownExpand Up@@ -797,7 +806,7 @@ where
}
}
BumpTransactionEvent::HTLCResolution {
claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time,
claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time, ..
} => {
log_info!(self.logger, "Handling HTLC bump (claim_id = {}, htlcs_to_claim = {})",
log_bytes!(claim_id.0), log_iter!(htlc_descriptors.iter().map(|d| d.outpoint())));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Expose channel_id / counterparty_node_id in BumpTransaction event#2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Feb 7, 2024
 Merged


Expose channel_id / counterparty_node_id in BumpTransaction event
#2873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 16 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1416,8 +1416,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// Loads the funding txo and outputs to watch into the given `chain::Filter` by repeatedly
	/// calling `chain::Filter::register_output` and `chain::Filter::register_tx` until all outputs
	/// have been registered.
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
 F::Target: chain::Filter, L::Target: Logger,
	{
 let lock = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2931,12 +2931,19 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpCommitment {
 package_target_feerate_sat_per_1000_weight, commitment_tx, anchor_output_idx,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let commitment_txid = commitment_tx.txid();
 debug_assert_eq!(self.current_holder_commitment_tx.txid, commitment_txid);
 let pending_htlcs = self.current_holder_commitment_tx.non_dust_htlcs();
 let commitment_tx_fee_satoshis = self.channel_value_satoshis -
 commitment_tx.output.iter().fold(0u64, |sum, output| sum + output.value);
 ret.push(Event::BumpTransaction(BumpTransactionEvent::ChannelClose {
 channel_id,
 counterparty_node_id,
 claim_id,
 package_target_feerate_sat_per_1000_weight,
 commitment_tx,
Expand All@@ -2958,6 +2965,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpHTLC {
 target_feerate_sat_per_1000_weight, htlcs, tx_lock_time,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let mut htlc_descriptors = Vec::with_capacity(htlcs.len());
 for htlc in htlcs {
 htlc_descriptors.push(HTLCDescriptor {
Expand All@@ -2978,6 +2990,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 });
 }
 ret.push(Event::BumpTransaction(BumpTransactionEvent::HTLCResolution {
 channel_id,
 counterparty_node_id,
 claim_id,
 target_feerate_sat_per_1000_weight,
 htlc_descriptors,
Expand Down

13 changes: 11 additions & 2 deletions
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ use crate::chain::chaininterface::{BroadcasterInterface, fee_for_weight};
use crate::chain::ClaimId;
use crate::io_extras::sink;
use crate::ln::channel::ANCHOR_OUTPUT_VALUE_SATOSHI;
use crate::ln::ChannelId;
use crate::ln::chan_utils;
use crate::ln::chan_utils::{
	ANCHOR_INPUT_WITNESS_WEIGHT, HTLC_SUCCESS_INPUT_ANCHOR_WITNESS_WEIGHT,
Expand All@@ -37,7 +38,7 @@ use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::consensus::Encodable;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::secp256k1;
use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::secp256k1::ecdsa::Signature;

const EMPTY_SCRIPT_SIG_WEIGHT: u64 = 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64;
Expand DownExpand Up@@ -147,6 +148,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_anchor_input
	/// [`build_anchor_input_witness`]: crate::ln::chan_utils::build_anchor_input_witness
	ChannelClose {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the anchor output in the commitment transaction.
 ///
 /// The identifier must map to the set of external UTXOs assigned to the claim, such that
Expand DownExpand Up@@ -200,6 +205,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner`]: crate::sign::ecdsa::EcdsaChannelSigner
	/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_htlc_transaction
	HTLCResolution {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the HTLCs in the confirmed commitment
 /// transaction.
 ///
Expand DownExpand Up@@ -797,7 +806,7 @@ where
 }
 }
 BumpTransactionEvent::HTLCResolution {
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time,
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time, ..
 } => {
 log_info!(self.logger, "Handling HTLC bump (claim_id = {}, htlcs_to_claim = {})",
 log_bytes!(claim_id.0), log_iter!(htlc_descriptors.iter().map(|d| d.outpoint())));
Expand Down

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

Skip to content
Expose channel_id / counterparty_node_id in BumpTransaction event#2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Feb 7, 2024
 Merged


Expose channel_id / counterparty_node_id in BumpTransaction event
#2873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 16 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1416,8 +1416,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// Loads the funding txo and outputs to watch into the given `chain::Filter` by repeatedly
	/// calling `chain::Filter::register_output` and `chain::Filter::register_tx` until all outputs
	/// have been registered.
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
 F::Target: chain::Filter, L::Target: Logger,
	{
 let lock = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2931,12 +2931,19 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpCommitment {
 package_target_feerate_sat_per_1000_weight, commitment_tx, anchor_output_idx,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let commitment_txid = commitment_tx.txid();
 debug_assert_eq!(self.current_holder_commitment_tx.txid, commitment_txid);
 let pending_htlcs = self.current_holder_commitment_tx.non_dust_htlcs();
 let commitment_tx_fee_satoshis = self.channel_value_satoshis -
 commitment_tx.output.iter().fold(0u64, |sum, output| sum + output.value);
 ret.push(Event::BumpTransaction(BumpTransactionEvent::ChannelClose {
 channel_id,
 counterparty_node_id,
 claim_id,
 package_target_feerate_sat_per_1000_weight,
 commitment_tx,
Expand All@@ -2958,6 +2965,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpHTLC {
 target_feerate_sat_per_1000_weight, htlcs, tx_lock_time,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let mut htlc_descriptors = Vec::with_capacity(htlcs.len());
 for htlc in htlcs {
 htlc_descriptors.push(HTLCDescriptor {
Expand All@@ -2978,6 +2990,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 });
 }
 ret.push(Event::BumpTransaction(BumpTransactionEvent::HTLCResolution {
 channel_id,
 counterparty_node_id,
 claim_id,
 target_feerate_sat_per_1000_weight,
 htlc_descriptors,
Expand Down

13 changes: 11 additions & 2 deletions
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ use crate::chain::chaininterface::{BroadcasterInterface, fee_for_weight};
use crate::chain::ClaimId;
use crate::io_extras::sink;
use crate::ln::channel::ANCHOR_OUTPUT_VALUE_SATOSHI;
use crate::ln::ChannelId;
use crate::ln::chan_utils;
use crate::ln::chan_utils::{
	ANCHOR_INPUT_WITNESS_WEIGHT, HTLC_SUCCESS_INPUT_ANCHOR_WITNESS_WEIGHT,
Expand All@@ -37,7 +38,7 @@ use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::consensus::Encodable;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::secp256k1;
use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::secp256k1::ecdsa::Signature;

const EMPTY_SCRIPT_SIG_WEIGHT: u64 = 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64;
Expand DownExpand Up@@ -147,6 +148,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_anchor_input
	/// [`build_anchor_input_witness`]: crate::ln::chan_utils::build_anchor_input_witness
	ChannelClose {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the anchor output in the commitment transaction.
 ///
 /// The identifier must map to the set of external UTXOs assigned to the claim, such that
Expand DownExpand Up@@ -200,6 +205,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner`]: crate::sign::ecdsa::EcdsaChannelSigner
	/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_htlc_transaction
	HTLCResolution {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the HTLCs in the confirmed commitment
 /// transaction.
 ///
Expand DownExpand Up@@ -797,7 +806,7 @@ where
 }
 }
 BumpTransactionEvent::HTLCResolution {
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time,
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time, ..
 } => {
 log_info!(self.logger, "Handling HTLC bump (claim_id = {}, htlcs_to_claim = {})",
 log_bytes!(claim_id.0), log_iter!(htlc_descriptors.iter().map(|d| d.outpoint())));
Expand Down

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

Skip to content
Expose channel_id / counterparty_node_id in BumpTransaction event#2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Feb 7, 2024
 Merged


Expose channel_id / counterparty_node_id in BumpTransaction event
#2873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 16 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1416,8 +1416,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// Loads the funding txo and outputs to watch into the given `chain::Filter` by repeatedly
	/// calling `chain::Filter::register_output` and `chain::Filter::register_tx` until all outputs
	/// have been registered.
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
 F::Target: chain::Filter, L::Target: Logger,
	{
 let lock = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2931,12 +2931,19 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpCommitment {
 package_target_feerate_sat_per_1000_weight, commitment_tx, anchor_output_idx,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let commitment_txid = commitment_tx.txid();
 debug_assert_eq!(self.current_holder_commitment_tx.txid, commitment_txid);
 let pending_htlcs = self.current_holder_commitment_tx.non_dust_htlcs();
 let commitment_tx_fee_satoshis = self.channel_value_satoshis -
 commitment_tx.output.iter().fold(0u64, |sum, output| sum + output.value);
 ret.push(Event::BumpTransaction(BumpTransactionEvent::ChannelClose {
 channel_id,
 counterparty_node_id,
 claim_id,
 package_target_feerate_sat_per_1000_weight,
 commitment_tx,
Expand All@@ -2958,6 +2965,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpHTLC {
 target_feerate_sat_per_1000_weight, htlcs, tx_lock_time,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let mut htlc_descriptors = Vec::with_capacity(htlcs.len());
 for htlc in htlcs {
 htlc_descriptors.push(HTLCDescriptor {
Expand All@@ -2978,6 +2990,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 });
 }
 ret.push(Event::BumpTransaction(BumpTransactionEvent::HTLCResolution {
 channel_id,
 counterparty_node_id,
 claim_id,
 target_feerate_sat_per_1000_weight,
 htlc_descriptors,
Expand Down

13 changes: 11 additions & 2 deletions
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ use crate::chain::chaininterface::{BroadcasterInterface, fee_for_weight};
use crate::chain::ClaimId;
use crate::io_extras::sink;
use crate::ln::channel::ANCHOR_OUTPUT_VALUE_SATOSHI;
use crate::ln::ChannelId;
use crate::ln::chan_utils;
use crate::ln::chan_utils::{
	ANCHOR_INPUT_WITNESS_WEIGHT, HTLC_SUCCESS_INPUT_ANCHOR_WITNESS_WEIGHT,
Expand All@@ -37,7 +38,7 @@ use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::consensus::Encodable;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::secp256k1;
use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::secp256k1::ecdsa::Signature;

const EMPTY_SCRIPT_SIG_WEIGHT: u64 = 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64;
Expand DownExpand Up@@ -147,6 +148,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_anchor_input
	/// [`build_anchor_input_witness`]: crate::ln::chan_utils::build_anchor_input_witness
	ChannelClose {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the anchor output in the commitment transaction.
 ///
 /// The identifier must map to the set of external UTXOs assigned to the claim, such that
Expand DownExpand Up@@ -200,6 +205,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner`]: crate::sign::ecdsa::EcdsaChannelSigner
	/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_htlc_transaction
	HTLCResolution {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the HTLCs in the confirmed commitment
 /// transaction.
 ///
Expand DownExpand Up@@ -797,7 +806,7 @@ where
 }
 }
 BumpTransactionEvent::HTLCResolution {
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time,
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time, ..
 } => {
 log_info!(self.logger, "Handling HTLC bump (claim_id = {}, htlcs_to_claim = {})",
 log_bytes!(claim_id.0), log_iter!(htlc_descriptors.iter().map(|d| d.outpoint())));
Expand Down

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

Skip to content
Expose channel_id / counterparty_node_id in BumpTransaction event#2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Feb 7, 2024
 Merged


Expose channel_id / counterparty_node_id in BumpTransaction event
#2873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 16 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1416,8 +1416,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// Loads the funding txo and outputs to watch into the given `chain::Filter` by repeatedly
	/// calling `chain::Filter::register_output` and `chain::Filter::register_tx` until all outputs
	/// have been registered.
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
 F::Target: chain::Filter, L::Target: Logger,
	{
 let lock = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2931,12 +2931,19 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpCommitment {
 package_target_feerate_sat_per_1000_weight, commitment_tx, anchor_output_idx,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let commitment_txid = commitment_tx.txid();
 debug_assert_eq!(self.current_holder_commitment_tx.txid, commitment_txid);
 let pending_htlcs = self.current_holder_commitment_tx.non_dust_htlcs();
 let commitment_tx_fee_satoshis = self.channel_value_satoshis -
 commitment_tx.output.iter().fold(0u64, |sum, output| sum + output.value);
 ret.push(Event::BumpTransaction(BumpTransactionEvent::ChannelClose {
 channel_id,
 counterparty_node_id,
 claim_id,
 package_target_feerate_sat_per_1000_weight,
 commitment_tx,
Expand All@@ -2958,6 +2965,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpHTLC {
 target_feerate_sat_per_1000_weight, htlcs, tx_lock_time,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let mut htlc_descriptors = Vec::with_capacity(htlcs.len());
 for htlc in htlcs {
 htlc_descriptors.push(HTLCDescriptor {
Expand All@@ -2978,6 +2990,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 });
 }
 ret.push(Event::BumpTransaction(BumpTransactionEvent::HTLCResolution {
 channel_id,
 counterparty_node_id,
 claim_id,
 target_feerate_sat_per_1000_weight,
 htlc_descriptors,
Expand Down

13 changes: 11 additions & 2 deletions
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ use crate::chain::chaininterface::{BroadcasterInterface, fee_for_weight};
use crate::chain::ClaimId;
use crate::io_extras::sink;
use crate::ln::channel::ANCHOR_OUTPUT_VALUE_SATOSHI;
use crate::ln::ChannelId;
use crate::ln::chan_utils;
use crate::ln::chan_utils::{
	ANCHOR_INPUT_WITNESS_WEIGHT, HTLC_SUCCESS_INPUT_ANCHOR_WITNESS_WEIGHT,
Expand All@@ -37,7 +38,7 @@ use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::consensus::Encodable;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::secp256k1;
use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::secp256k1::ecdsa::Signature;

const EMPTY_SCRIPT_SIG_WEIGHT: u64 = 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64;
Expand DownExpand Up@@ -147,6 +148,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_anchor_input
	/// [`build_anchor_input_witness`]: crate::ln::chan_utils::build_anchor_input_witness
	ChannelClose {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the anchor output in the commitment transaction.
 ///
 /// The identifier must map to the set of external UTXOs assigned to the claim, such that
Expand DownExpand Up@@ -200,6 +205,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner`]: crate::sign::ecdsa::EcdsaChannelSigner
	/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_htlc_transaction
	HTLCResolution {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the HTLCs in the confirmed commitment
 /// transaction.
 ///
Expand DownExpand Up@@ -797,7 +806,7 @@ where
 }
 }
 BumpTransactionEvent::HTLCResolution {
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time,
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time, ..
 } => {
 log_info!(self.logger, "Handling HTLC bump (claim_id = {}, htlcs_to_claim = {})",
 log_bytes!(claim_id.0), log_iter!(htlc_descriptors.iter().map(|d| d.outpoint())));
Expand Down

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

Skip to content
Expose channel_id / counterparty_node_id in BumpTransaction event#2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Feb 7, 2024
 Merged


Expose channel_id / counterparty_node_id in BumpTransaction event
#2873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 16 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1416,8 +1416,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// Loads the funding txo and outputs to watch into the given `chain::Filter` by repeatedly
	/// calling `chain::Filter::register_output` and `chain::Filter::register_tx` until all outputs
	/// have been registered.
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
 F::Target: chain::Filter, L::Target: Logger,
	{
 let lock = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2931,12 +2931,19 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpCommitment {
 package_target_feerate_sat_per_1000_weight, commitment_tx, anchor_output_idx,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let commitment_txid = commitment_tx.txid();
 debug_assert_eq!(self.current_holder_commitment_tx.txid, commitment_txid);
 let pending_htlcs = self.current_holder_commitment_tx.non_dust_htlcs();
 let commitment_tx_fee_satoshis = self.channel_value_satoshis -
 commitment_tx.output.iter().fold(0u64, |sum, output| sum + output.value);
 ret.push(Event::BumpTransaction(BumpTransactionEvent::ChannelClose {
 channel_id,
 counterparty_node_id,
 claim_id,
 package_target_feerate_sat_per_1000_weight,
 commitment_tx,
Expand All@@ -2958,6 +2965,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpHTLC {
 target_feerate_sat_per_1000_weight, htlcs, tx_lock_time,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let mut htlc_descriptors = Vec::with_capacity(htlcs.len());
 for htlc in htlcs {
 htlc_descriptors.push(HTLCDescriptor {
Expand All@@ -2978,6 +2990,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 });
 }
 ret.push(Event::BumpTransaction(BumpTransactionEvent::HTLCResolution {
 channel_id,
 counterparty_node_id,
 claim_id,
 target_feerate_sat_per_1000_weight,
 htlc_descriptors,
Expand Down

13 changes: 11 additions & 2 deletions
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ use crate::chain::chaininterface::{BroadcasterInterface, fee_for_weight};
use crate::chain::ClaimId;
use crate::io_extras::sink;
use crate::ln::channel::ANCHOR_OUTPUT_VALUE_SATOSHI;
use crate::ln::ChannelId;
use crate::ln::chan_utils;
use crate::ln::chan_utils::{
	ANCHOR_INPUT_WITNESS_WEIGHT, HTLC_SUCCESS_INPUT_ANCHOR_WITNESS_WEIGHT,
Expand All@@ -37,7 +38,7 @@ use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::consensus::Encodable;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::secp256k1;
use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::secp256k1::ecdsa::Signature;

const EMPTY_SCRIPT_SIG_WEIGHT: u64 = 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64;
Expand DownExpand Up@@ -147,6 +148,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_anchor_input
	/// [`build_anchor_input_witness`]: crate::ln::chan_utils::build_anchor_input_witness
	ChannelClose {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the anchor output in the commitment transaction.
 ///
 /// The identifier must map to the set of external UTXOs assigned to the claim, such that
Expand DownExpand Up@@ -200,6 +205,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner`]: crate::sign::ecdsa::EcdsaChannelSigner
	/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_htlc_transaction
	HTLCResolution {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the HTLCs in the confirmed commitment
 /// transaction.
 ///
Expand DownExpand Up@@ -797,7 +806,7 @@ where
 }
 }
 BumpTransactionEvent::HTLCResolution {
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time,
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time, ..
 } => {
 log_info!(self.logger, "Handling HTLC bump (claim_id = {}, htlcs_to_claim = {})",
 log_bytes!(claim_id.0), log_iter!(htlc_descriptors.iter().map(|d| d.outpoint())));
Expand Down

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

Skip to content
Expose channel_id / counterparty_node_id in BumpTransaction event#2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Feb 7, 2024
 Merged


Expose channel_id / counterparty_node_id in BumpTransaction event
#2873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 16 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1416,8 +1416,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// Loads the funding txo and outputs to watch into the given `chain::Filter` by repeatedly
	/// calling `chain::Filter::register_output` and `chain::Filter::register_tx` until all outputs
	/// have been registered.
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
 F::Target: chain::Filter, L::Target: Logger,
	{
 let lock = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2931,12 +2931,19 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpCommitment {
 package_target_feerate_sat_per_1000_weight, commitment_tx, anchor_output_idx,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let commitment_txid = commitment_tx.txid();
 debug_assert_eq!(self.current_holder_commitment_tx.txid, commitment_txid);
 let pending_htlcs = self.current_holder_commitment_tx.non_dust_htlcs();
 let commitment_tx_fee_satoshis = self.channel_value_satoshis -
 commitment_tx.output.iter().fold(0u64, |sum, output| sum + output.value);
 ret.push(Event::BumpTransaction(BumpTransactionEvent::ChannelClose {
 channel_id,
 counterparty_node_id,
 claim_id,
 package_target_feerate_sat_per_1000_weight,
 commitment_tx,
Expand All@@ -2958,6 +2965,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpHTLC {
 target_feerate_sat_per_1000_weight, htlcs, tx_lock_time,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let mut htlc_descriptors = Vec::with_capacity(htlcs.len());
 for htlc in htlcs {
 htlc_descriptors.push(HTLCDescriptor {
Expand All@@ -2978,6 +2990,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 });
 }
 ret.push(Event::BumpTransaction(BumpTransactionEvent::HTLCResolution {
 channel_id,
 counterparty_node_id,
 claim_id,
 target_feerate_sat_per_1000_weight,
 htlc_descriptors,
Expand Down

13 changes: 11 additions & 2 deletions
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ use crate::chain::chaininterface::{BroadcasterInterface, fee_for_weight};
use crate::chain::ClaimId;
use crate::io_extras::sink;
use crate::ln::channel::ANCHOR_OUTPUT_VALUE_SATOSHI;
use crate::ln::ChannelId;
use crate::ln::chan_utils;
use crate::ln::chan_utils::{
	ANCHOR_INPUT_WITNESS_WEIGHT, HTLC_SUCCESS_INPUT_ANCHOR_WITNESS_WEIGHT,
Expand All@@ -37,7 +38,7 @@ use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::consensus::Encodable;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::secp256k1;
use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::secp256k1::ecdsa::Signature;

const EMPTY_SCRIPT_SIG_WEIGHT: u64 = 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64;
Expand DownExpand Up@@ -147,6 +148,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_anchor_input
	/// [`build_anchor_input_witness`]: crate::ln::chan_utils::build_anchor_input_witness
	ChannelClose {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the anchor output in the commitment transaction.
 ///
 /// The identifier must map to the set of external UTXOs assigned to the claim, such that
Expand DownExpand Up@@ -200,6 +205,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner`]: crate::sign::ecdsa::EcdsaChannelSigner
	/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_htlc_transaction
	HTLCResolution {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the HTLCs in the confirmed commitment
 /// transaction.
 ///
Expand DownExpand Up@@ -797,7 +806,7 @@ where
 }
 }
 BumpTransactionEvent::HTLCResolution {
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time,
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time, ..
 } => {
 log_info!(self.logger, "Handling HTLC bump (claim_id = {}, htlcs_to_claim = {})",
 log_bytes!(claim_id.0), log_iter!(htlc_descriptors.iter().map(|d| d.outpoint())));
Expand Down

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

Skip to content
Expose channel_id / counterparty_node_id in BumpTransaction event#2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Feb 7, 2024
 Merged


Expose channel_id / counterparty_node_id in BumpTransaction event
#2873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 16 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1416,8 +1416,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// Loads the funding txo and outputs to watch into the given `chain::Filter` by repeatedly
	/// calling `chain::Filter::register_output` and `chain::Filter::register_tx` until all outputs
	/// have been registered.
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
	pub fn load_outputs_to_watch<F: Deref, L: Deref>(&self, filter: &F, logger: &L)
	where
 F::Target: chain::Filter, L::Target: Logger,
	{
 let lock = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2931,12 +2931,19 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpCommitment {
 package_target_feerate_sat_per_1000_weight, commitment_tx, anchor_output_idx,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let commitment_txid = commitment_tx.txid();
 debug_assert_eq!(self.current_holder_commitment_tx.txid, commitment_txid);
 let pending_htlcs = self.current_holder_commitment_tx.non_dust_htlcs();
 let commitment_tx_fee_satoshis = self.channel_value_satoshis -
 commitment_tx.output.iter().fold(0u64, |sum, output| sum + output.value);
 ret.push(Event::BumpTransaction(BumpTransactionEvent::ChannelClose {
 channel_id,
 counterparty_node_id,
 claim_id,
 package_target_feerate_sat_per_1000_weight,
 commitment_tx,
Expand All@@ -2958,6 +2965,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 ClaimEvent::BumpHTLC {
 target_feerate_sat_per_1000_weight, htlcs, tx_lock_time,
 } => {
 let channel_id = self.channel_id;
 // unwrap safety: `ClaimEvent`s are only available for Anchor channels,
 // introduced with v0.0.116. counterparty_node_id is guaranteed to be `Some`
 // since v0.0.110.
 let counterparty_node_id = self.counterparty_node_id.unwrap();
 let mut htlc_descriptors = Vec::with_capacity(htlcs.len());
 for htlc in htlcs {
 htlc_descriptors.push(HTLCDescriptor {
Expand All@@ -2978,6 +2990,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 });
 }
 ret.push(Event::BumpTransaction(BumpTransactionEvent::HTLCResolution {
 channel_id,
 counterparty_node_id,
 claim_id,
 target_feerate_sat_per_1000_weight,
 htlc_descriptors,
Expand Down

13 changes: 11 additions & 2 deletions
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ use crate::chain::chaininterface::{BroadcasterInterface, fee_for_weight};
use crate::chain::ClaimId;
use crate::io_extras::sink;
use crate::ln::channel::ANCHOR_OUTPUT_VALUE_SATOSHI;
use crate::ln::ChannelId;
use crate::ln::chan_utils;
use crate::ln::chan_utils::{
	ANCHOR_INPUT_WITNESS_WEIGHT, HTLC_SUCCESS_INPUT_ANCHOR_WITNESS_WEIGHT,
Expand All@@ -37,7 +38,7 @@ use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::consensus::Encodable;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::secp256k1;
use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::secp256k1::ecdsa::Signature;

const EMPTY_SCRIPT_SIG_WEIGHT: u64 = 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64;
Expand DownExpand Up@@ -147,6 +148,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_anchor_input
	/// [`build_anchor_input_witness`]: crate::ln::chan_utils::build_anchor_input_witness
	ChannelClose {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the anchor output in the commitment transaction.
 ///
 /// The identifier must map to the set of external UTXOs assigned to the claim, such that
Expand DownExpand Up@@ -200,6 +205,10 @@ pub enum BumpTransactionEvent {
	/// [`EcdsaChannelSigner`]: crate::sign::ecdsa::EcdsaChannelSigner
	/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_htlc_transaction
	HTLCResolution {
 /// The `channel_id` of the channel which has been closed.
 channel_id: ChannelId,
 /// Counterparty in the closed channel.
 counterparty_node_id: PublicKey,
 /// The unique identifier for the claim of the HTLCs in the confirmed commitment
 /// transaction.
 ///
Expand DownExpand Up@@ -797,7 +806,7 @@ where
 }
 }
 BumpTransactionEvent::HTLCResolution {
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time,
 claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time, ..
 } => {
 log_info!(self.logger, "Handling HTLC bump (claim_id = {}, htlcs_to_claim = {})",
 log_bytes!(claim_id.0), log_iter!(htlc_descriptors.iter().map(|d| d.outpoint())));
Expand Down