Support manual signaling of channel readiness#2137

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

Closed
johncantrell97 wants to merge 3 commits into from
Closed

Support manual signaling of channel readiness #2137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebcaaea
replace do_chain_event tuple with ChainActionUpdates struct
johncantrell97 Mar 28, 2023
7fcbd34
add manual signaling of channel readiness
johncantrell97 Mar 28, 2023
5c88c17
use ChannelReadyStatus enum instead of tuple
johncantrell97 Mar 29, 2023
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
76 changes: 76 additions & 0 deletions lightning/src/events/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ pub mod bump_transaction;
pub use bump_transaction::BumpTransactionEvent;

use crate::chain::keysinterface::SpendableOutputDescriptor;
use crate::chain::transaction::OutPoint;
use crate::ln::channelmanager::{InterceptId, PaymentId};
use crate::ln::channel::FUNDING_CONF_DEADLINE_BLOCKS;
use crate::ln::features::ChannelTypeFeatures;
Expand DownExpand Up@@ -604,6 +605,50 @@ pub enum Event {
/// transaction.
claim_from_onchain_tx: bool,
},
/// Indicates a channel has received sufficient confirmations and LDK is ready to send [`msgs::ChannelReady`].
///
/// To signal readiness, call [`ChannelManager::signal_channel_readiness`]. To reject the
/// request, call [`ChannelManager::force_close_broadcasting_latest_txn`].
///
/// The event is only triggered when the [`ChannelHandshakeConfig::manually_signal_channel_ready`]
/// config flag is set to true.
///
/// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
/// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
/// [`ChannelHandshakeConfig::manually_signal_channel_ready`]: crate::util::config::ChannelHandshakeConfig::manually_signal_channel_ready
/// [`msgs::ChannelReady`]: crate::ln::msgs::ChannelReady
PendingChannelReady {
/// The channel ID of the channel.
///
/// When responding to the request, the `channel_id` should be passed
/// back to the ChannelManager through [`ChannelManager::signal_channel_readiness`] to signal,
/// or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject.
///
/// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
/// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
channel_id: [u8; 32],
/// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
/// channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
/// [`UserConfig::manually_accept_inbound_channels`] config flag is set to true. Otherwise
/// `user_channel_id` will be randomized for an inbound channel.
///
/// [`ChannelManager::create_channel`]: crate::ln::channelmanager::ChannelManager::create_channel
/// [`ChannelManager::accept_inbound_channel`]: crate::ln::channelmanager::ChannelManager::accept_inbound_channel
/// [`UserConfig::manually_accept_inbound_channels`]: crate::util::config::UserConfig::manually_accept_inbound_channels
user_channel_id: u128,
/// The node_id of the counterparty requesting to open the channel.
///
/// When responding to the request, the `counterparty_node_id` should be passed
/// back to the `ChannelManager` through [`ChannelManager::signal_channel_readiness`] to
/// signal readiness, or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject the
/// request.
///
/// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
/// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
counterparty_node_id: PublicKey,
/// The outpoint that holds the channel funds on-chain.
funding_outpoint: OutPoint,
},
/// Used to indicate that a channel with the given `channel_id` is ready to
/// be used. This event is emitted either when the funding transaction has been confirmed
/// on-chain, or, in case of a 0conf channel, when both parties have confirmed the channel
Expand DownExpand Up@@ -923,6 +968,15 @@ impl Writeable for Event {
(6, channel_type, required),
});
},
&Event::PendingChannelReady { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref funding_outpoint } => {
31u8.write(writer)?;
write_tlv_fields!(writer, {
(0, channel_id, required),
(2, user_channel_id, required),
(4, counterparty_node_id, required),
(6, funding_outpoint, required)
});
},
// Note that, going forward, all new events must only write data inside of
// `write_tlv_fields`. Versions 0.0.101+ will ignore odd-numbered events that write
// data via `write_tlv_fields`.
Expand DownExpand Up@@ -1258,6 +1312,28 @@ impl MaybeReadable for Event {
};
f()
},
31u8 => {
let f = || {
let mut channel_id = [0; 32];
let mut user_channel_id: u128 = 0;
let mut counterparty_node_id = RequiredWrapper(None);
let mut funding_outpoint = RequiredWrapper(None);
read_tlv_fields!(reader, {
(0, channel_id, required),
(2, user_channel_id, required),
(4, counterparty_node_id, required),
(6, funding_outpoint, required),
});

Ok(Some(Event::PendingChannelReady {
channel_id,
user_channel_id,
counterparty_node_id: counterparty_node_id.0.unwrap(),
funding_outpoint: funding_outpoint.0.unwrap()
}))
};
f()
},
// Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
// Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt
// reads.
Expand Down
Loading
, '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
Support manual signaling of channel readiness#2137

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

 Closed

johncantrell97
wants to merge
3
commits into

from

 Closed


Support manual signaling of channel readiness
#2137
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ebcaaea

replace do_chain_event tuple with ChainActionUpdates struct


johncantrell97 Mar 28, 2023
7fcbd34

add manual signaling of channel readiness


johncantrell97 Mar 28, 2023
5c88c17

use ChannelReadyStatus enum instead of tuple


johncantrell97 Mar 29, 2023

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


76 changes: 76 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ pub mod bump_transaction;
pub use bump_transaction::BumpTransactionEvent;

use crate::chain::keysinterface::SpendableOutputDescriptor;
use crate::chain::transaction::OutPoint;
use crate::ln::channelmanager::{InterceptId, PaymentId};
use crate::ln::channel::FUNDING_CONF_DEADLINE_BLOCKS;
use crate::ln::features::ChannelTypeFeatures;
Expand DownExpand Up@@ -604,6 +605,50 @@ pub enum Event {
 /// transaction.
 claim_from_onchain_tx: bool,
	},
	/// Indicates a channel has received sufficient confirmations and LDK is ready to send [`msgs::ChannelReady`].
	///
	/// To signal readiness, call [`ChannelManager::signal_channel_readiness`]. To reject the
	/// request, call [`ChannelManager::force_close_broadcasting_latest_txn`].
	///
	/// The event is only triggered when the [`ChannelHandshakeConfig::manually_signal_channel_ready`] 
	/// config flag is set to true.
	///
	/// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
	/// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
	/// [`ChannelHandshakeConfig::manually_signal_channel_ready`]: crate::util::config::ChannelHandshakeConfig::manually_signal_channel_ready
	/// [`msgs::ChannelReady`]: crate::ln::msgs::ChannelReady
	PendingChannelReady {
 /// The channel ID of the channel.
 ///
 /// When responding to the request, the `channel_id` should be passed
 /// back to the ChannelManager through [`ChannelManager::signal_channel_readiness`] to signal,
 /// or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 channel_id: [u8; 32],
 /// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
 /// channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
 /// [`UserConfig::manually_accept_inbound_channels`] config flag is set to true. Otherwise
 /// `user_channel_id` will be randomized for an inbound channel.
 ///
 /// [`ChannelManager::create_channel`]: crate::ln::channelmanager::ChannelManager::create_channel
 /// [`ChannelManager::accept_inbound_channel`]: crate::ln::channelmanager::ChannelManager::accept_inbound_channel
 /// [`UserConfig::manually_accept_inbound_channels`]: crate::util::config::UserConfig::manually_accept_inbound_channels
 user_channel_id: u128,
 /// The node_id of the counterparty requesting to open the channel.
 ///
 /// When responding to the request, the `counterparty_node_id` should be passed
 /// back to the `ChannelManager` through [`ChannelManager::signal_channel_readiness`] to
 /// signal readiness, or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject the
 /// request.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 counterparty_node_id: PublicKey,
 /// The outpoint that holds the channel funds on-chain.
 funding_outpoint: OutPoint,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to
	/// be used. This event is emitted either when the funding transaction has been confirmed
	/// on-chain, or, in case of a 0conf channel, when both parties have confirmed the channel
Expand DownExpand Up@@ -923,6 +968,15 @@ impl Writeable for Event {
 (6, channel_type, required),
 });
 },
 &Event::PendingChannelReady { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref funding_outpoint } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required)
 });
 },
 // Note that, going forward, all new events must only write data inside of
 // `write_tlv_fields`. Versions 0.0.101+ will ignore odd-numbered events that write
 // data via `write_tlv_fields`.
Expand DownExpand Up@@ -1258,6 +1312,28 @@ impl MaybeReadable for Event {
 };
 f()
 },
 31u8 => {
 let f = || {
 let mut channel_id = [0; 32];
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_outpoint = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required),
 });

 Ok(Some(Event::PendingChannelReady {
 channel_id,
 user_channel_id,
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_outpoint: funding_outpoint.0.unwrap()
 }))
 };
 f()
 },
 // Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
 // Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt
 // reads.
Expand Down
Loading

, '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
Support manual signaling of channel readiness#2137

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

 Closed

johncantrell97
wants to merge
3
commits into

from

 Closed


Support manual signaling of channel readiness
#2137
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ebcaaea

replace do_chain_event tuple with ChainActionUpdates struct


johncantrell97 Mar 28, 2023
7fcbd34

add manual signaling of channel readiness


johncantrell97 Mar 28, 2023
5c88c17

use ChannelReadyStatus enum instead of tuple


johncantrell97 Mar 29, 2023

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


76 changes: 76 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ pub mod bump_transaction;
pub use bump_transaction::BumpTransactionEvent;

use crate::chain::keysinterface::SpendableOutputDescriptor;
use crate::chain::transaction::OutPoint;
use crate::ln::channelmanager::{InterceptId, PaymentId};
use crate::ln::channel::FUNDING_CONF_DEADLINE_BLOCKS;
use crate::ln::features::ChannelTypeFeatures;
Expand DownExpand Up@@ -604,6 +605,50 @@ pub enum Event {
 /// transaction.
 claim_from_onchain_tx: bool,
	},
	/// Indicates a channel has received sufficient confirmations and LDK is ready to send [`msgs::ChannelReady`].
	///
	/// To signal readiness, call [`ChannelManager::signal_channel_readiness`]. To reject the
	/// request, call [`ChannelManager::force_close_broadcasting_latest_txn`].
	///
	/// The event is only triggered when the [`ChannelHandshakeConfig::manually_signal_channel_ready`] 
	/// config flag is set to true.
	///
	/// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
	/// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
	/// [`ChannelHandshakeConfig::manually_signal_channel_ready`]: crate::util::config::ChannelHandshakeConfig::manually_signal_channel_ready
	/// [`msgs::ChannelReady`]: crate::ln::msgs::ChannelReady
	PendingChannelReady {
 /// The channel ID of the channel.
 ///
 /// When responding to the request, the `channel_id` should be passed
 /// back to the ChannelManager through [`ChannelManager::signal_channel_readiness`] to signal,
 /// or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 channel_id: [u8; 32],
 /// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
 /// channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
 /// [`UserConfig::manually_accept_inbound_channels`] config flag is set to true. Otherwise
 /// `user_channel_id` will be randomized for an inbound channel.
 ///
 /// [`ChannelManager::create_channel`]: crate::ln::channelmanager::ChannelManager::create_channel
 /// [`ChannelManager::accept_inbound_channel`]: crate::ln::channelmanager::ChannelManager::accept_inbound_channel
 /// [`UserConfig::manually_accept_inbound_channels`]: crate::util::config::UserConfig::manually_accept_inbound_channels
 user_channel_id: u128,
 /// The node_id of the counterparty requesting to open the channel.
 ///
 /// When responding to the request, the `counterparty_node_id` should be passed
 /// back to the `ChannelManager` through [`ChannelManager::signal_channel_readiness`] to
 /// signal readiness, or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject the
 /// request.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 counterparty_node_id: PublicKey,
 /// The outpoint that holds the channel funds on-chain.
 funding_outpoint: OutPoint,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to
	/// be used. This event is emitted either when the funding transaction has been confirmed
	/// on-chain, or, in case of a 0conf channel, when both parties have confirmed the channel
Expand DownExpand Up@@ -923,6 +968,15 @@ impl Writeable for Event {
 (6, channel_type, required),
 });
 },
 &Event::PendingChannelReady { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref funding_outpoint } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required)
 });
 },
 // Note that, going forward, all new events must only write data inside of
 // `write_tlv_fields`. Versions 0.0.101+ will ignore odd-numbered events that write
 // data via `write_tlv_fields`.
Expand DownExpand Up@@ -1258,6 +1312,28 @@ impl MaybeReadable for Event {
 };
 f()
 },
 31u8 => {
 let f = || {
 let mut channel_id = [0; 32];
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_outpoint = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required),
 });

 Ok(Some(Event::PendingChannelReady {
 channel_id,
 user_channel_id,
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_outpoint: funding_outpoint.0.unwrap()
 }))
 };
 f()
 },
 // Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
 // Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt
 // reads.
Expand Down
Loading

, '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
Support manual signaling of channel readiness#2137

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

 Closed

johncantrell97
wants to merge
3
commits into

from

 Closed


Support manual signaling of channel readiness
#2137
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ebcaaea

replace do_chain_event tuple with ChainActionUpdates struct


johncantrell97 Mar 28, 2023
7fcbd34

add manual signaling of channel readiness


johncantrell97 Mar 28, 2023
5c88c17

use ChannelReadyStatus enum instead of tuple


johncantrell97 Mar 29, 2023

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


76 changes: 76 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ pub mod bump_transaction;
pub use bump_transaction::BumpTransactionEvent;

use crate::chain::keysinterface::SpendableOutputDescriptor;
use crate::chain::transaction::OutPoint;
use crate::ln::channelmanager::{InterceptId, PaymentId};
use crate::ln::channel::FUNDING_CONF_DEADLINE_BLOCKS;
use crate::ln::features::ChannelTypeFeatures;
Expand DownExpand Up@@ -604,6 +605,50 @@ pub enum Event {
 /// transaction.
 claim_from_onchain_tx: bool,
	},
	/// Indicates a channel has received sufficient confirmations and LDK is ready to send [`msgs::ChannelReady`].
	///
	/// To signal readiness, call [`ChannelManager::signal_channel_readiness`]. To reject the
	/// request, call [`ChannelManager::force_close_broadcasting_latest_txn`].
	///
	/// The event is only triggered when the [`ChannelHandshakeConfig::manually_signal_channel_ready`] 
	/// config flag is set to true.
	///
	/// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
	/// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
	/// [`ChannelHandshakeConfig::manually_signal_channel_ready`]: crate::util::config::ChannelHandshakeConfig::manually_signal_channel_ready
	/// [`msgs::ChannelReady`]: crate::ln::msgs::ChannelReady
	PendingChannelReady {
 /// The channel ID of the channel.
 ///
 /// When responding to the request, the `channel_id` should be passed
 /// back to the ChannelManager through [`ChannelManager::signal_channel_readiness`] to signal,
 /// or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 channel_id: [u8; 32],
 /// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
 /// channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
 /// [`UserConfig::manually_accept_inbound_channels`] config flag is set to true. Otherwise
 /// `user_channel_id` will be randomized for an inbound channel.
 ///
 /// [`ChannelManager::create_channel`]: crate::ln::channelmanager::ChannelManager::create_channel
 /// [`ChannelManager::accept_inbound_channel`]: crate::ln::channelmanager::ChannelManager::accept_inbound_channel
 /// [`UserConfig::manually_accept_inbound_channels`]: crate::util::config::UserConfig::manually_accept_inbound_channels
 user_channel_id: u128,
 /// The node_id of the counterparty requesting to open the channel.
 ///
 /// When responding to the request, the `counterparty_node_id` should be passed
 /// back to the `ChannelManager` through [`ChannelManager::signal_channel_readiness`] to
 /// signal readiness, or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject the
 /// request.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 counterparty_node_id: PublicKey,
 /// The outpoint that holds the channel funds on-chain.
 funding_outpoint: OutPoint,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to
	/// be used. This event is emitted either when the funding transaction has been confirmed
	/// on-chain, or, in case of a 0conf channel, when both parties have confirmed the channel
Expand DownExpand Up@@ -923,6 +968,15 @@ impl Writeable for Event {
 (6, channel_type, required),
 });
 },
 &Event::PendingChannelReady { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref funding_outpoint } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required)
 });
 },
 // Note that, going forward, all new events must only write data inside of
 // `write_tlv_fields`. Versions 0.0.101+ will ignore odd-numbered events that write
 // data via `write_tlv_fields`.
Expand DownExpand Up@@ -1258,6 +1312,28 @@ impl MaybeReadable for Event {
 };
 f()
 },
 31u8 => {
 let f = || {
 let mut channel_id = [0; 32];
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_outpoint = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required),
 });

 Ok(Some(Event::PendingChannelReady {
 channel_id,
 user_channel_id,
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_outpoint: funding_outpoint.0.unwrap()
 }))
 };
 f()
 },
 // Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
 // Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt
 // reads.
Expand Down
Loading

, '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
Support manual signaling of channel readiness#2137

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

 Closed

johncantrell97
wants to merge
3
commits into

from

 Closed


Support manual signaling of channel readiness
#2137
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ebcaaea

replace do_chain_event tuple with ChainActionUpdates struct


johncantrell97 Mar 28, 2023
7fcbd34

add manual signaling of channel readiness


johncantrell97 Mar 28, 2023
5c88c17

use ChannelReadyStatus enum instead of tuple


johncantrell97 Mar 29, 2023

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


76 changes: 76 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ pub mod bump_transaction;
pub use bump_transaction::BumpTransactionEvent;

use crate::chain::keysinterface::SpendableOutputDescriptor;
use crate::chain::transaction::OutPoint;
use crate::ln::channelmanager::{InterceptId, PaymentId};
use crate::ln::channel::FUNDING_CONF_DEADLINE_BLOCKS;
use crate::ln::features::ChannelTypeFeatures;
Expand DownExpand Up@@ -604,6 +605,50 @@ pub enum Event {
 /// transaction.
 claim_from_onchain_tx: bool,
	},
	/// Indicates a channel has received sufficient confirmations and LDK is ready to send [`msgs::ChannelReady`].
	///
	/// To signal readiness, call [`ChannelManager::signal_channel_readiness`]. To reject the
	/// request, call [`ChannelManager::force_close_broadcasting_latest_txn`].
	///
	/// The event is only triggered when the [`ChannelHandshakeConfig::manually_signal_channel_ready`] 
	/// config flag is set to true.
	///
	/// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
	/// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
	/// [`ChannelHandshakeConfig::manually_signal_channel_ready`]: crate::util::config::ChannelHandshakeConfig::manually_signal_channel_ready
	/// [`msgs::ChannelReady`]: crate::ln::msgs::ChannelReady
	PendingChannelReady {
 /// The channel ID of the channel.
 ///
 /// When responding to the request, the `channel_id` should be passed
 /// back to the ChannelManager through [`ChannelManager::signal_channel_readiness`] to signal,
 /// or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 channel_id: [u8; 32],
 /// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
 /// channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
 /// [`UserConfig::manually_accept_inbound_channels`] config flag is set to true. Otherwise
 /// `user_channel_id` will be randomized for an inbound channel.
 ///
 /// [`ChannelManager::create_channel`]: crate::ln::channelmanager::ChannelManager::create_channel
 /// [`ChannelManager::accept_inbound_channel`]: crate::ln::channelmanager::ChannelManager::accept_inbound_channel
 /// [`UserConfig::manually_accept_inbound_channels`]: crate::util::config::UserConfig::manually_accept_inbound_channels
 user_channel_id: u128,
 /// The node_id of the counterparty requesting to open the channel.
 ///
 /// When responding to the request, the `counterparty_node_id` should be passed
 /// back to the `ChannelManager` through [`ChannelManager::signal_channel_readiness`] to
 /// signal readiness, or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject the
 /// request.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 counterparty_node_id: PublicKey,
 /// The outpoint that holds the channel funds on-chain.
 funding_outpoint: OutPoint,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to
	/// be used. This event is emitted either when the funding transaction has been confirmed
	/// on-chain, or, in case of a 0conf channel, when both parties have confirmed the channel
Expand DownExpand Up@@ -923,6 +968,15 @@ impl Writeable for Event {
 (6, channel_type, required),
 });
 },
 &Event::PendingChannelReady { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref funding_outpoint } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required)
 });
 },
 // Note that, going forward, all new events must only write data inside of
 // `write_tlv_fields`. Versions 0.0.101+ will ignore odd-numbered events that write
 // data via `write_tlv_fields`.
Expand DownExpand Up@@ -1258,6 +1312,28 @@ impl MaybeReadable for Event {
 };
 f()
 },
 31u8 => {
 let f = || {
 let mut channel_id = [0; 32];
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_outpoint = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required),
 });

 Ok(Some(Event::PendingChannelReady {
 channel_id,
 user_channel_id,
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_outpoint: funding_outpoint.0.unwrap()
 }))
 };
 f()
 },
 // Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
 // Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt
 // reads.
Expand Down
Loading

, '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
Support manual signaling of channel readiness#2137

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

 Closed

johncantrell97
wants to merge
3
commits into

from

 Closed


Support manual signaling of channel readiness
#2137
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ebcaaea

replace do_chain_event tuple with ChainActionUpdates struct


johncantrell97 Mar 28, 2023
7fcbd34

add manual signaling of channel readiness


johncantrell97 Mar 28, 2023
5c88c17

use ChannelReadyStatus enum instead of tuple


johncantrell97 Mar 29, 2023

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


76 changes: 76 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ pub mod bump_transaction;
pub use bump_transaction::BumpTransactionEvent;

use crate::chain::keysinterface::SpendableOutputDescriptor;
use crate::chain::transaction::OutPoint;
use crate::ln::channelmanager::{InterceptId, PaymentId};
use crate::ln::channel::FUNDING_CONF_DEADLINE_BLOCKS;
use crate::ln::features::ChannelTypeFeatures;
Expand DownExpand Up@@ -604,6 +605,50 @@ pub enum Event {
 /// transaction.
 claim_from_onchain_tx: bool,
	},
	/// Indicates a channel has received sufficient confirmations and LDK is ready to send [`msgs::ChannelReady`].
	///
	/// To signal readiness, call [`ChannelManager::signal_channel_readiness`]. To reject the
	/// request, call [`ChannelManager::force_close_broadcasting_latest_txn`].
	///
	/// The event is only triggered when the [`ChannelHandshakeConfig::manually_signal_channel_ready`] 
	/// config flag is set to true.
	///
	/// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
	/// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
	/// [`ChannelHandshakeConfig::manually_signal_channel_ready`]: crate::util::config::ChannelHandshakeConfig::manually_signal_channel_ready
	/// [`msgs::ChannelReady`]: crate::ln::msgs::ChannelReady
	PendingChannelReady {
 /// The channel ID of the channel.
 ///
 /// When responding to the request, the `channel_id` should be passed
 /// back to the ChannelManager through [`ChannelManager::signal_channel_readiness`] to signal,
 /// or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 channel_id: [u8; 32],
 /// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
 /// channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
 /// [`UserConfig::manually_accept_inbound_channels`] config flag is set to true. Otherwise
 /// `user_channel_id` will be randomized for an inbound channel.
 ///
 /// [`ChannelManager::create_channel`]: crate::ln::channelmanager::ChannelManager::create_channel
 /// [`ChannelManager::accept_inbound_channel`]: crate::ln::channelmanager::ChannelManager::accept_inbound_channel
 /// [`UserConfig::manually_accept_inbound_channels`]: crate::util::config::UserConfig::manually_accept_inbound_channels
 user_channel_id: u128,
 /// The node_id of the counterparty requesting to open the channel.
 ///
 /// When responding to the request, the `counterparty_node_id` should be passed
 /// back to the `ChannelManager` through [`ChannelManager::signal_channel_readiness`] to
 /// signal readiness, or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject the
 /// request.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 counterparty_node_id: PublicKey,
 /// The outpoint that holds the channel funds on-chain.
 funding_outpoint: OutPoint,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to
	/// be used. This event is emitted either when the funding transaction has been confirmed
	/// on-chain, or, in case of a 0conf channel, when both parties have confirmed the channel
Expand DownExpand Up@@ -923,6 +968,15 @@ impl Writeable for Event {
 (6, channel_type, required),
 });
 },
 &Event::PendingChannelReady { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref funding_outpoint } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required)
 });
 },
 // Note that, going forward, all new events must only write data inside of
 // `write_tlv_fields`. Versions 0.0.101+ will ignore odd-numbered events that write
 // data via `write_tlv_fields`.
Expand DownExpand Up@@ -1258,6 +1312,28 @@ impl MaybeReadable for Event {
 };
 f()
 },
 31u8 => {
 let f = || {
 let mut channel_id = [0; 32];
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_outpoint = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required),
 });

 Ok(Some(Event::PendingChannelReady {
 channel_id,
 user_channel_id,
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_outpoint: funding_outpoint.0.unwrap()
 }))
 };
 f()
 },
 // Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
 // Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt
 // reads.
Expand Down
Loading

, '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
Support manual signaling of channel readiness#2137

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

 Closed

johncantrell97
wants to merge
3
commits into

from

 Closed


Support manual signaling of channel readiness
#2137
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ebcaaea

replace do_chain_event tuple with ChainActionUpdates struct


johncantrell97 Mar 28, 2023
7fcbd34

add manual signaling of channel readiness


johncantrell97 Mar 28, 2023
5c88c17

use ChannelReadyStatus enum instead of tuple


johncantrell97 Mar 29, 2023

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


76 changes: 76 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ pub mod bump_transaction;
pub use bump_transaction::BumpTransactionEvent;

use crate::chain::keysinterface::SpendableOutputDescriptor;
use crate::chain::transaction::OutPoint;
use crate::ln::channelmanager::{InterceptId, PaymentId};
use crate::ln::channel::FUNDING_CONF_DEADLINE_BLOCKS;
use crate::ln::features::ChannelTypeFeatures;
Expand DownExpand Up@@ -604,6 +605,50 @@ pub enum Event {
 /// transaction.
 claim_from_onchain_tx: bool,
	},
	/// Indicates a channel has received sufficient confirmations and LDK is ready to send [`msgs::ChannelReady`].
	///
	/// To signal readiness, call [`ChannelManager::signal_channel_readiness`]. To reject the
	/// request, call [`ChannelManager::force_close_broadcasting_latest_txn`].
	///
	/// The event is only triggered when the [`ChannelHandshakeConfig::manually_signal_channel_ready`] 
	/// config flag is set to true.
	///
	/// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
	/// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
	/// [`ChannelHandshakeConfig::manually_signal_channel_ready`]: crate::util::config::ChannelHandshakeConfig::manually_signal_channel_ready
	/// [`msgs::ChannelReady`]: crate::ln::msgs::ChannelReady
	PendingChannelReady {
 /// The channel ID of the channel.
 ///
 /// When responding to the request, the `channel_id` should be passed
 /// back to the ChannelManager through [`ChannelManager::signal_channel_readiness`] to signal,
 /// or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 channel_id: [u8; 32],
 /// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
 /// channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
 /// [`UserConfig::manually_accept_inbound_channels`] config flag is set to true. Otherwise
 /// `user_channel_id` will be randomized for an inbound channel.
 ///
 /// [`ChannelManager::create_channel`]: crate::ln::channelmanager::ChannelManager::create_channel
 /// [`ChannelManager::accept_inbound_channel`]: crate::ln::channelmanager::ChannelManager::accept_inbound_channel
 /// [`UserConfig::manually_accept_inbound_channels`]: crate::util::config::UserConfig::manually_accept_inbound_channels
 user_channel_id: u128,
 /// The node_id of the counterparty requesting to open the channel.
 ///
 /// When responding to the request, the `counterparty_node_id` should be passed
 /// back to the `ChannelManager` through [`ChannelManager::signal_channel_readiness`] to
 /// signal readiness, or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject the
 /// request.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 counterparty_node_id: PublicKey,
 /// The outpoint that holds the channel funds on-chain.
 funding_outpoint: OutPoint,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to
	/// be used. This event is emitted either when the funding transaction has been confirmed
	/// on-chain, or, in case of a 0conf channel, when both parties have confirmed the channel
Expand DownExpand Up@@ -923,6 +968,15 @@ impl Writeable for Event {
 (6, channel_type, required),
 });
 },
 &Event::PendingChannelReady { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref funding_outpoint } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required)
 });
 },
 // Note that, going forward, all new events must only write data inside of
 // `write_tlv_fields`. Versions 0.0.101+ will ignore odd-numbered events that write
 // data via `write_tlv_fields`.
Expand DownExpand Up@@ -1258,6 +1312,28 @@ impl MaybeReadable for Event {
 };
 f()
 },
 31u8 => {
 let f = || {
 let mut channel_id = [0; 32];
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_outpoint = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required),
 });

 Ok(Some(Event::PendingChannelReady {
 channel_id,
 user_channel_id,
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_outpoint: funding_outpoint.0.unwrap()
 }))
 };
 f()
 },
 // Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
 // Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt
 // reads.
Expand Down
Loading

, '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
Support manual signaling of channel readiness#2137

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

 Closed

johncantrell97
wants to merge
3
commits into

from

 Closed


Support manual signaling of channel readiness
#2137
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ebcaaea

replace do_chain_event tuple with ChainActionUpdates struct


johncantrell97 Mar 28, 2023
7fcbd34

add manual signaling of channel readiness


johncantrell97 Mar 28, 2023
5c88c17

use ChannelReadyStatus enum instead of tuple


johncantrell97 Mar 29, 2023

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


76 changes: 76 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ pub mod bump_transaction;
pub use bump_transaction::BumpTransactionEvent;

use crate::chain::keysinterface::SpendableOutputDescriptor;
use crate::chain::transaction::OutPoint;
use crate::ln::channelmanager::{InterceptId, PaymentId};
use crate::ln::channel::FUNDING_CONF_DEADLINE_BLOCKS;
use crate::ln::features::ChannelTypeFeatures;
Expand DownExpand Up@@ -604,6 +605,50 @@ pub enum Event {
 /// transaction.
 claim_from_onchain_tx: bool,
	},
	/// Indicates a channel has received sufficient confirmations and LDK is ready to send [`msgs::ChannelReady`].
	///
	/// To signal readiness, call [`ChannelManager::signal_channel_readiness`]. To reject the
	/// request, call [`ChannelManager::force_close_broadcasting_latest_txn`].
	///
	/// The event is only triggered when the [`ChannelHandshakeConfig::manually_signal_channel_ready`] 
	/// config flag is set to true.
	///
	/// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
	/// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
	/// [`ChannelHandshakeConfig::manually_signal_channel_ready`]: crate::util::config::ChannelHandshakeConfig::manually_signal_channel_ready
	/// [`msgs::ChannelReady`]: crate::ln::msgs::ChannelReady
	PendingChannelReady {
 /// The channel ID of the channel.
 ///
 /// When responding to the request, the `channel_id` should be passed
 /// back to the ChannelManager through [`ChannelManager::signal_channel_readiness`] to signal,
 /// or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 channel_id: [u8; 32],
 /// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
 /// channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
 /// [`UserConfig::manually_accept_inbound_channels`] config flag is set to true. Otherwise
 /// `user_channel_id` will be randomized for an inbound channel.
 ///
 /// [`ChannelManager::create_channel`]: crate::ln::channelmanager::ChannelManager::create_channel
 /// [`ChannelManager::accept_inbound_channel`]: crate::ln::channelmanager::ChannelManager::accept_inbound_channel
 /// [`UserConfig::manually_accept_inbound_channels`]: crate::util::config::UserConfig::manually_accept_inbound_channels
 user_channel_id: u128,
 /// The node_id of the counterparty requesting to open the channel.
 ///
 /// When responding to the request, the `counterparty_node_id` should be passed
 /// back to the `ChannelManager` through [`ChannelManager::signal_channel_readiness`] to
 /// signal readiness, or through [`ChannelManager::force_close_broadcasting_latest_txn`] to reject the
 /// request.
 ///
 /// [`ChannelManager::signal_channel_readiness`]: crate::ln::channelmanager::ChannelManager::signal_channel_readiness
 /// [`ChannelManager::force_close_broadcasting_latest_txn`]: crate::ln::channelmanager::ChannelManager::force_close_broadcasting_latest_txn
 counterparty_node_id: PublicKey,
 /// The outpoint that holds the channel funds on-chain.
 funding_outpoint: OutPoint,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to
	/// be used. This event is emitted either when the funding transaction has been confirmed
	/// on-chain, or, in case of a 0conf channel, when both parties have confirmed the channel
Expand DownExpand Up@@ -923,6 +968,15 @@ impl Writeable for Event {
 (6, channel_type, required),
 });
 },
 &Event::PendingChannelReady { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref funding_outpoint } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required)
 });
 },
 // Note that, going forward, all new events must only write data inside of
 // `write_tlv_fields`. Versions 0.0.101+ will ignore odd-numbered events that write
 // data via `write_tlv_fields`.
Expand DownExpand Up@@ -1258,6 +1312,28 @@ impl MaybeReadable for Event {
 };
 f()
 },
 31u8 => {
 let f = || {
 let mut channel_id = [0; 32];
 let mut user_channel_id: u128 = 0;
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_outpoint = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (2, user_channel_id, required),
 (4, counterparty_node_id, required),
 (6, funding_outpoint, required),
 });

 Ok(Some(Event::PendingChannelReady {
 channel_id,
 user_channel_id,
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_outpoint: funding_outpoint.0.unwrap()
 }))
 };
 f()
 },
 // Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
 // Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt
 // reads.
Expand Down
Loading