Skip to content

cfg-gate async signing logic#2792

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
wpaulino merged 1 commit into from
Dec 14, 2023
Merged

cfg-gate async signing logic #2792

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
2 changes: 2 additions & 0 deletions ci/check-cfg-flags.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,8 @@ def check_cfg_tag(cfg):
pass
elif cfg == "taproot":
pass
elif cfg == "async_signing":
pass
elif cfg == "require_route_graph_test":
pass
else:
Expand Down
5 changes: 2 additions & 3 deletions ci/ci-tests.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -171,7 +171,6 @@ if [ -f "$(which arm-none-eabi-gcc)" ]; then
popd
fi

echo -e "\n\nTest Taproot builds"
pushd lightning
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="$RUSTFLAGS --cfg=taproot" cargo test --verbose --color always -p lightning
popd
RUSTFLAGS="$RUSTFLAGS --cfg=async_signing" cargo test --verbose --color always -p lightning
37 changes: 26 additions & 11 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2434,8 +2434,13 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
.ok();

if funding_signed.is_none() {
log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
self.signer_pending_funding = true;
#[cfg(not(async_signing))] {
panic!("Failed to get signature for funding_signed");
}
#[cfg(async_signing)] {
log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
self.signer_pending_funding = true;
}
} else if self.signer_pending_funding {
log_trace!(logger, "Counterparty commitment signature available for funding_signed message; clearing signer_pending_funding");
self.signer_pending_funding = false;
Expand DownExpand Up@@ -4259,7 +4264,7 @@ impl<SP: Deref> Channel<SP> where

/// Indicates that the signer may have some signatures for us, so we should retry if we're
/// blocked.
#[allow(unused)]
#[cfg(async_signing)]
pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> SignerResumeUpdates where L::Target: Logger {
let commitment_update = if self.context.signer_pending_commitment_update {
self.get_last_commitment_update_for_send(logger).ok()
Expand DownExpand Up@@ -4363,11 +4368,16 @@ impl<SP: Deref> Channel<SP> where
}
update
} else {
if !self.context.signer_pending_commitment_update {
log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
self.context.signer_pending_commitment_update = true;
#[cfg(not(async_signing))] {
panic!("Failed to get signature for new commitment state");
}
#[cfg(async_signing)] {
if !self.context.signer_pending_commitment_update {
log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
self.context.signer_pending_commitment_update = true;
}
return Err(());
}
return Err(());
};
Ok(msgs::CommitmentUpdate {
update_add_htlcs, update_fulfill_htlcs, update_fail_htlcs, update_fail_malformed_htlcs, update_fee,
Expand DownExpand Up@@ -6448,9 +6458,14 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

let funding_created = self.get_funding_created_msg(logger);
if funding_created.is_none() {
if !self.context.signer_pending_funding {
log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
self.context.signer_pending_funding = true;
#[cfg(not(async_signing))] {
panic!("Failed to get signature for new funding creation");
}
#[cfg(async_signing)] {
if !self.context.signer_pending_funding {
log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
self.context.signer_pending_funding = true;
}
}
}

Expand DownExpand Up@@ -6796,7 +6811,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

/// Indicates that the signer may have some signatures for us, so we should retry if we're
/// blocked.
#[allow(unused)]
#[cfg(async_signing)]
pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> Option<msgs::FundingCreated> where L::Target: Logger {
if self.context.signer_pending_funding && self.context.is_outbound() {
log_trace!(logger, "Signer unblocked a funding_created");
Expand Down
3 changes: 1 addition & 2 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7322,8 +7322,7 @@ where
/// attempted in every channel, or in the specifically provided channel.
///
/// [`ChannelSigner`]: crate::sign::ChannelSigner
#[cfg(test)] // This is only implemented for one signer method, and should be private until we
// actually finish implementing it fully.
#[cfg(async_signing)]
pub fn signer_unblocked(&self, channel_opt: Option<(PublicKey, ChannelId)>) {
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);

Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ mod monitor_tests;
#[cfg(test)]
#[allow(unused_mut)]
mod shutdown_tests;
#[cfg(test)]
#[cfg(all(test, async_signing))]
#[allow(unused_mut)]
mod async_signer_tests;

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

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

wpaulino
merged 1 commit into

from

Dec 14, 2023
 Merged


cfg-gate async signing logic
#2792
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


2 changes: 2 additions & 0 deletions
ci/check-cfg-flags.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,8 @@ def check_cfg_tag(cfg):
 pass
 elif cfg == "taproot":
 pass
 elif cfg == "async_signing":
 pass
 elif cfg == "require_route_graph_test":
 pass
 else:
Expand Down

5 changes: 2 additions & 3 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,7 +171,6 @@ if [ -f "$(which arm-none-eabi-gcc)" ]; then
	popd
fi

echo -e "\n\nTest Taproot builds"
pushd lightning
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="$RUSTFLAGS --cfg=taproot" cargo test --verbose --color always -p lightning
popd
RUSTFLAGS="$RUSTFLAGS --cfg=async_signing" cargo test --verbose --color always -p lightning

37 changes: 26 additions & 11 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2434,8 +2434,13 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 .ok();

 if funding_signed.is_none() {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for funding_signed");
 }
 #[cfg(async_signing)] {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 }
 } else if self.signer_pending_funding {
 log_trace!(logger, "Counterparty commitment signature available for funding_signed message; clearing signer_pending_funding");
 self.signer_pending_funding = false;
Expand DownExpand Up@@ -4259,7 +4264,7 @@ impl<SP: Deref> Channel<SP> where

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> SignerResumeUpdates where L::Target: Logger {
 let commitment_update = if self.context.signer_pending_commitment_update {
 self.get_last_commitment_update_for_send(logger).ok()
Expand DownExpand Up@@ -4363,11 +4368,16 @@ impl<SP: Deref> Channel<SP> where
 }
 update
 } else {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new commitment state");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 }
 return Err(());
 }
 return Err(());
 };
 Ok(msgs::CommitmentUpdate {
 update_add_htlcs, update_fulfill_htlcs, update_fail_htlcs, update_fail_malformed_htlcs, update_fee,
Expand DownExpand Up@@ -6448,9 +6458,14 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

 let funding_created = self.get_funding_created_msg(logger);
 if funding_created.is_none() {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new funding creation");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 }
 }
 }

Expand DownExpand Up@@ -6796,7 +6811,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> Option<msgs::FundingCreated> where L::Target: Logger {
 if self.context.signer_pending_funding && self.context.is_outbound() {
 log_trace!(logger, "Signer unblocked a funding_created");
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7322,8 +7322,7 @@ where
	/// attempted in every channel, or in the specifically provided channel.
	///
	/// [`ChannelSigner`]: crate::sign::ChannelSigner
	#[cfg(test)] // This is only implemented for one signer method, and should be private until we
 // actually finish implementing it fully.
	#[cfg(async_signing)]
	pub fn signer_unblocked(&self, channel_opt: Option<(PublicKey, ChannelId)>) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ mod monitor_tests;
#[cfg(test)]
#[allow(unused_mut)]
mod shutdown_tests;
#[cfg(test)]
#[cfg(all(test, async_signing))]
#[allow(unused_mut)]
mod async_signer_tests;

Expand Down

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

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

wpaulino
merged 1 commit into

from

Dec 14, 2023
 Merged


cfg-gate async signing logic
#2792
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


2 changes: 2 additions & 0 deletions
ci/check-cfg-flags.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,8 @@ def check_cfg_tag(cfg):
 pass
 elif cfg == "taproot":
 pass
 elif cfg == "async_signing":
 pass
 elif cfg == "require_route_graph_test":
 pass
 else:
Expand Down

5 changes: 2 additions & 3 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,7 +171,6 @@ if [ -f "$(which arm-none-eabi-gcc)" ]; then
	popd
fi

echo -e "\n\nTest Taproot builds"
pushd lightning
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="$RUSTFLAGS --cfg=taproot" cargo test --verbose --color always -p lightning
popd
RUSTFLAGS="$RUSTFLAGS --cfg=async_signing" cargo test --verbose --color always -p lightning

37 changes: 26 additions & 11 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2434,8 +2434,13 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 .ok();

 if funding_signed.is_none() {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for funding_signed");
 }
 #[cfg(async_signing)] {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 }
 } else if self.signer_pending_funding {
 log_trace!(logger, "Counterparty commitment signature available for funding_signed message; clearing signer_pending_funding");
 self.signer_pending_funding = false;
Expand DownExpand Up@@ -4259,7 +4264,7 @@ impl<SP: Deref> Channel<SP> where

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> SignerResumeUpdates where L::Target: Logger {
 let commitment_update = if self.context.signer_pending_commitment_update {
 self.get_last_commitment_update_for_send(logger).ok()
Expand DownExpand Up@@ -4363,11 +4368,16 @@ impl<SP: Deref> Channel<SP> where
 }
 update
 } else {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new commitment state");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 }
 return Err(());
 }
 return Err(());
 };
 Ok(msgs::CommitmentUpdate {
 update_add_htlcs, update_fulfill_htlcs, update_fail_htlcs, update_fail_malformed_htlcs, update_fee,
Expand DownExpand Up@@ -6448,9 +6458,14 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

 let funding_created = self.get_funding_created_msg(logger);
 if funding_created.is_none() {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new funding creation");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 }
 }
 }

Expand DownExpand Up@@ -6796,7 +6811,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> Option<msgs::FundingCreated> where L::Target: Logger {
 if self.context.signer_pending_funding && self.context.is_outbound() {
 log_trace!(logger, "Signer unblocked a funding_created");
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7322,8 +7322,7 @@ where
	/// attempted in every channel, or in the specifically provided channel.
	///
	/// [`ChannelSigner`]: crate::sign::ChannelSigner
	#[cfg(test)] // This is only implemented for one signer method, and should be private until we
 // actually finish implementing it fully.
	#[cfg(async_signing)]
	pub fn signer_unblocked(&self, channel_opt: Option<(PublicKey, ChannelId)>) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ mod monitor_tests;
#[cfg(test)]
#[allow(unused_mut)]
mod shutdown_tests;
#[cfg(test)]
#[cfg(all(test, async_signing))]
#[allow(unused_mut)]
mod async_signer_tests;

Expand Down

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

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

wpaulino
merged 1 commit into

from

Dec 14, 2023
 Merged


cfg-gate async signing logic
#2792
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


2 changes: 2 additions & 0 deletions
ci/check-cfg-flags.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,8 @@ def check_cfg_tag(cfg):
 pass
 elif cfg == "taproot":
 pass
 elif cfg == "async_signing":
 pass
 elif cfg == "require_route_graph_test":
 pass
 else:
Expand Down

5 changes: 2 additions & 3 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,7 +171,6 @@ if [ -f "$(which arm-none-eabi-gcc)" ]; then
	popd
fi

echo -e "\n\nTest Taproot builds"
pushd lightning
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="$RUSTFLAGS --cfg=taproot" cargo test --verbose --color always -p lightning
popd
RUSTFLAGS="$RUSTFLAGS --cfg=async_signing" cargo test --verbose --color always -p lightning

37 changes: 26 additions & 11 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2434,8 +2434,13 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 .ok();

 if funding_signed.is_none() {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for funding_signed");
 }
 #[cfg(async_signing)] {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 }
 } else if self.signer_pending_funding {
 log_trace!(logger, "Counterparty commitment signature available for funding_signed message; clearing signer_pending_funding");
 self.signer_pending_funding = false;
Expand DownExpand Up@@ -4259,7 +4264,7 @@ impl<SP: Deref> Channel<SP> where

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> SignerResumeUpdates where L::Target: Logger {
 let commitment_update = if self.context.signer_pending_commitment_update {
 self.get_last_commitment_update_for_send(logger).ok()
Expand DownExpand Up@@ -4363,11 +4368,16 @@ impl<SP: Deref> Channel<SP> where
 }
 update
 } else {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new commitment state");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 }
 return Err(());
 }
 return Err(());
 };
 Ok(msgs::CommitmentUpdate {
 update_add_htlcs, update_fulfill_htlcs, update_fail_htlcs, update_fail_malformed_htlcs, update_fee,
Expand DownExpand Up@@ -6448,9 +6458,14 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

 let funding_created = self.get_funding_created_msg(logger);
 if funding_created.is_none() {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new funding creation");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 }
 }
 }

Expand DownExpand Up@@ -6796,7 +6811,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> Option<msgs::FundingCreated> where L::Target: Logger {
 if self.context.signer_pending_funding && self.context.is_outbound() {
 log_trace!(logger, "Signer unblocked a funding_created");
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7322,8 +7322,7 @@ where
	/// attempted in every channel, or in the specifically provided channel.
	///
	/// [`ChannelSigner`]: crate::sign::ChannelSigner
	#[cfg(test)] // This is only implemented for one signer method, and should be private until we
 // actually finish implementing it fully.
	#[cfg(async_signing)]
	pub fn signer_unblocked(&self, channel_opt: Option<(PublicKey, ChannelId)>) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ mod monitor_tests;
#[cfg(test)]
#[allow(unused_mut)]
mod shutdown_tests;
#[cfg(test)]
#[cfg(all(test, async_signing))]
#[allow(unused_mut)]
mod async_signer_tests;

Expand Down

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

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

wpaulino
merged 1 commit into

from

Dec 14, 2023
 Merged


cfg-gate async signing logic
#2792
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


2 changes: 2 additions & 0 deletions
ci/check-cfg-flags.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,8 @@ def check_cfg_tag(cfg):
 pass
 elif cfg == "taproot":
 pass
 elif cfg == "async_signing":
 pass
 elif cfg == "require_route_graph_test":
 pass
 else:
Expand Down

5 changes: 2 additions & 3 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,7 +171,6 @@ if [ -f "$(which arm-none-eabi-gcc)" ]; then
	popd
fi

echo -e "\n\nTest Taproot builds"
pushd lightning
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="$RUSTFLAGS --cfg=taproot" cargo test --verbose --color always -p lightning
popd
RUSTFLAGS="$RUSTFLAGS --cfg=async_signing" cargo test --verbose --color always -p lightning

37 changes: 26 additions & 11 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2434,8 +2434,13 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 .ok();

 if funding_signed.is_none() {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for funding_signed");
 }
 #[cfg(async_signing)] {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 }
 } else if self.signer_pending_funding {
 log_trace!(logger, "Counterparty commitment signature available for funding_signed message; clearing signer_pending_funding");
 self.signer_pending_funding = false;
Expand DownExpand Up@@ -4259,7 +4264,7 @@ impl<SP: Deref> Channel<SP> where

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> SignerResumeUpdates where L::Target: Logger {
 let commitment_update = if self.context.signer_pending_commitment_update {
 self.get_last_commitment_update_for_send(logger).ok()
Expand DownExpand Up@@ -4363,11 +4368,16 @@ impl<SP: Deref> Channel<SP> where
 }
 update
 } else {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new commitment state");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 }
 return Err(());
 }
 return Err(());
 };
 Ok(msgs::CommitmentUpdate {
 update_add_htlcs, update_fulfill_htlcs, update_fail_htlcs, update_fail_malformed_htlcs, update_fee,
Expand DownExpand Up@@ -6448,9 +6458,14 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

 let funding_created = self.get_funding_created_msg(logger);
 if funding_created.is_none() {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new funding creation");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 }
 }
 }

Expand DownExpand Up@@ -6796,7 +6811,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> Option<msgs::FundingCreated> where L::Target: Logger {
 if self.context.signer_pending_funding && self.context.is_outbound() {
 log_trace!(logger, "Signer unblocked a funding_created");
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7322,8 +7322,7 @@ where
	/// attempted in every channel, or in the specifically provided channel.
	///
	/// [`ChannelSigner`]: crate::sign::ChannelSigner
	#[cfg(test)] // This is only implemented for one signer method, and should be private until we
 // actually finish implementing it fully.
	#[cfg(async_signing)]
	pub fn signer_unblocked(&self, channel_opt: Option<(PublicKey, ChannelId)>) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ mod monitor_tests;
#[cfg(test)]
#[allow(unused_mut)]
mod shutdown_tests;
#[cfg(test)]
#[cfg(all(test, async_signing))]
#[allow(unused_mut)]
mod async_signer_tests;

Expand Down

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

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

wpaulino
merged 1 commit into

from

Dec 14, 2023
 Merged


cfg-gate async signing logic
#2792
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


2 changes: 2 additions & 0 deletions
ci/check-cfg-flags.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,8 @@ def check_cfg_tag(cfg):
 pass
 elif cfg == "taproot":
 pass
 elif cfg == "async_signing":
 pass
 elif cfg == "require_route_graph_test":
 pass
 else:
Expand Down

5 changes: 2 additions & 3 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,7 +171,6 @@ if [ -f "$(which arm-none-eabi-gcc)" ]; then
	popd
fi

echo -e "\n\nTest Taproot builds"
pushd lightning
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="$RUSTFLAGS --cfg=taproot" cargo test --verbose --color always -p lightning
popd
RUSTFLAGS="$RUSTFLAGS --cfg=async_signing" cargo test --verbose --color always -p lightning

37 changes: 26 additions & 11 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2434,8 +2434,13 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 .ok();

 if funding_signed.is_none() {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for funding_signed");
 }
 #[cfg(async_signing)] {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 }
 } else if self.signer_pending_funding {
 log_trace!(logger, "Counterparty commitment signature available for funding_signed message; clearing signer_pending_funding");
 self.signer_pending_funding = false;
Expand DownExpand Up@@ -4259,7 +4264,7 @@ impl<SP: Deref> Channel<SP> where

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> SignerResumeUpdates where L::Target: Logger {
 let commitment_update = if self.context.signer_pending_commitment_update {
 self.get_last_commitment_update_for_send(logger).ok()
Expand DownExpand Up@@ -4363,11 +4368,16 @@ impl<SP: Deref> Channel<SP> where
 }
 update
 } else {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new commitment state");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 }
 return Err(());
 }
 return Err(());
 };
 Ok(msgs::CommitmentUpdate {
 update_add_htlcs, update_fulfill_htlcs, update_fail_htlcs, update_fail_malformed_htlcs, update_fee,
Expand DownExpand Up@@ -6448,9 +6458,14 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

 let funding_created = self.get_funding_created_msg(logger);
 if funding_created.is_none() {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new funding creation");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 }
 }
 }

Expand DownExpand Up@@ -6796,7 +6811,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> Option<msgs::FundingCreated> where L::Target: Logger {
 if self.context.signer_pending_funding && self.context.is_outbound() {
 log_trace!(logger, "Signer unblocked a funding_created");
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7322,8 +7322,7 @@ where
	/// attempted in every channel, or in the specifically provided channel.
	///
	/// [`ChannelSigner`]: crate::sign::ChannelSigner
	#[cfg(test)] // This is only implemented for one signer method, and should be private until we
 // actually finish implementing it fully.
	#[cfg(async_signing)]
	pub fn signer_unblocked(&self, channel_opt: Option<(PublicKey, ChannelId)>) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ mod monitor_tests;
#[cfg(test)]
#[allow(unused_mut)]
mod shutdown_tests;
#[cfg(test)]
#[cfg(all(test, async_signing))]
#[allow(unused_mut)]
mod async_signer_tests;

Expand Down

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

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

wpaulino
merged 1 commit into

from

Dec 14, 2023
 Merged


cfg-gate async signing logic
#2792
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


2 changes: 2 additions & 0 deletions
ci/check-cfg-flags.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,8 @@ def check_cfg_tag(cfg):
 pass
 elif cfg == "taproot":
 pass
 elif cfg == "async_signing":
 pass
 elif cfg == "require_route_graph_test":
 pass
 else:
Expand Down

5 changes: 2 additions & 3 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,7 +171,6 @@ if [ -f "$(which arm-none-eabi-gcc)" ]; then
	popd
fi

echo -e "\n\nTest Taproot builds"
pushd lightning
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="$RUSTFLAGS --cfg=taproot" cargo test --verbose --color always -p lightning
popd
RUSTFLAGS="$RUSTFLAGS --cfg=async_signing" cargo test --verbose --color always -p lightning

37 changes: 26 additions & 11 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2434,8 +2434,13 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 .ok();

 if funding_signed.is_none() {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for funding_signed");
 }
 #[cfg(async_signing)] {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 }
 } else if self.signer_pending_funding {
 log_trace!(logger, "Counterparty commitment signature available for funding_signed message; clearing signer_pending_funding");
 self.signer_pending_funding = false;
Expand DownExpand Up@@ -4259,7 +4264,7 @@ impl<SP: Deref> Channel<SP> where

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> SignerResumeUpdates where L::Target: Logger {
 let commitment_update = if self.context.signer_pending_commitment_update {
 self.get_last_commitment_update_for_send(logger).ok()
Expand DownExpand Up@@ -4363,11 +4368,16 @@ impl<SP: Deref> Channel<SP> where
 }
 update
 } else {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new commitment state");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 }
 return Err(());
 }
 return Err(());
 };
 Ok(msgs::CommitmentUpdate {
 update_add_htlcs, update_fulfill_htlcs, update_fail_htlcs, update_fail_malformed_htlcs, update_fee,
Expand DownExpand Up@@ -6448,9 +6458,14 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

 let funding_created = self.get_funding_created_msg(logger);
 if funding_created.is_none() {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new funding creation");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 }
 }
 }

Expand DownExpand Up@@ -6796,7 +6811,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> Option<msgs::FundingCreated> where L::Target: Logger {
 if self.context.signer_pending_funding && self.context.is_outbound() {
 log_trace!(logger, "Signer unblocked a funding_created");
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7322,8 +7322,7 @@ where
	/// attempted in every channel, or in the specifically provided channel.
	///
	/// [`ChannelSigner`]: crate::sign::ChannelSigner
	#[cfg(test)] // This is only implemented for one signer method, and should be private until we
 // actually finish implementing it fully.
	#[cfg(async_signing)]
	pub fn signer_unblocked(&self, channel_opt: Option<(PublicKey, ChannelId)>) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ mod monitor_tests;
#[cfg(test)]
#[allow(unused_mut)]
mod shutdown_tests;
#[cfg(test)]
#[cfg(all(test, async_signing))]
#[allow(unused_mut)]
mod async_signer_tests;

Expand Down

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

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

wpaulino
merged 1 commit into

from

Dec 14, 2023
 Merged


cfg-gate async signing logic
#2792
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


2 changes: 2 additions & 0 deletions
ci/check-cfg-flags.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,8 @@ def check_cfg_tag(cfg):
 pass
 elif cfg == "taproot":
 pass
 elif cfg == "async_signing":
 pass
 elif cfg == "require_route_graph_test":
 pass
 else:
Expand Down

5 changes: 2 additions & 3 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,7 +171,6 @@ if [ -f "$(which arm-none-eabi-gcc)" ]; then
	popd
fi

echo -e "\n\nTest Taproot builds"
pushd lightning
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="$RUSTFLAGS --cfg=taproot" cargo test --verbose --color always -p lightning
popd
RUSTFLAGS="$RUSTFLAGS --cfg=async_signing" cargo test --verbose --color always -p lightning

37 changes: 26 additions & 11 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2434,8 +2434,13 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 .ok();

 if funding_signed.is_none() {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for funding_signed");
 }
 #[cfg(async_signing)] {
 log_trace!(logger, "Counterparty commitment signature not available for funding_signed message; setting signer_pending_funding");
 self.signer_pending_funding = true;
 }
 } else if self.signer_pending_funding {
 log_trace!(logger, "Counterparty commitment signature available for funding_signed message; clearing signer_pending_funding");
 self.signer_pending_funding = false;
Expand DownExpand Up@@ -4259,7 +4264,7 @@ impl<SP: Deref> Channel<SP> where

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> SignerResumeUpdates where L::Target: Logger {
 let commitment_update = if self.context.signer_pending_commitment_update {
 self.get_last_commitment_update_for_send(logger).ok()
Expand DownExpand Up@@ -4363,11 +4368,16 @@ impl<SP: Deref> Channel<SP> where
 }
 update
 } else {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new commitment state");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_commitment_update {
 log_trace!(logger, "Commitment update awaiting signer: setting signer_pending_commitment_update");
 self.context.signer_pending_commitment_update = true;
 }
 return Err(());
 }
 return Err(());
 };
 Ok(msgs::CommitmentUpdate {
 update_add_htlcs, update_fulfill_htlcs, update_fail_htlcs, update_fail_malformed_htlcs, update_fee,
Expand DownExpand Up@@ -6448,9 +6458,14 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

 let funding_created = self.get_funding_created_msg(logger);
 if funding_created.is_none() {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 #[cfg(not(async_signing))] {
 panic!("Failed to get signature for new funding creation");
 }
 #[cfg(async_signing)] {
 if !self.context.signer_pending_funding {
 log_trace!(logger, "funding_created awaiting signer; setting signer_pending_funding");
 self.context.signer_pending_funding = true;
 }
 }
 }

Expand DownExpand Up@@ -6796,7 +6811,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {

	/// Indicates that the signer may have some signatures for us, so we should retry if we're
	/// blocked.
	#[allow(unused)]
	#[cfg(async_signing)]
	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> Option<msgs::FundingCreated> where L::Target: Logger {
 if self.context.signer_pending_funding && self.context.is_outbound() {
 log_trace!(logger, "Signer unblocked a funding_created");
Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7322,8 +7322,7 @@ where
	/// attempted in every channel, or in the specifically provided channel.
	///
	/// [`ChannelSigner`]: crate::sign::ChannelSigner
	#[cfg(test)] // This is only implemented for one signer method, and should be private until we
 // actually finish implementing it fully.
	#[cfg(async_signing)]
	pub fn signer_unblocked(&self, channel_opt: Option<(PublicKey, ChannelId)>) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ mod monitor_tests;
#[cfg(test)]
#[allow(unused_mut)]
mod shutdown_tests;
#[cfg(test)]
#[cfg(all(test, async_signing))]
#[allow(unused_mut)]
mod async_signer_tests;

Expand Down