') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); implement LSPS5 by johncantrell97 · Pull Request #3499 · lightningdevkit/rust-lightning · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions lightning-liquidity/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ categories = ["cryptography::cryptocurrencies"]
default = ["std"]
std = ["lightning/std"]
backtrace = ["dep:backtrace"]
lsps5 = ["minreq", "url"]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think we'll want to add an HTTP client dependency here, especially since recently rustls bumped MSRV.

As send_webhook doesn't even return any data, we should be fine just creating an event variant for it and letting the service implement it however they want, no?

Feel free to convert the lsps5 feature to an lsps5 cfg-gate while you're here though, that would allow us to land this before we're sure LSPS5 is fully ready to be shipped.


[dependencies]
lightning = { version = "0.0.124", path = "../lightning", default-features = false }
Expand All@@ -30,6 +31,9 @@ serde = { version = "1.0", default-features = false, features = ["derive", "allo
serde_json = "1.0"
backtrace = { version = "0.3", optional = true }

minreq = { version = "2.11.1", optional = true, features = ["https", "json-using-serde"] }
url = { version = "2.5.0", optional = true, features = ["serde"] }

[dev-dependencies]
lightning = { version = "0.0.124", path = "../lightning", default-features = false, features = ["_test_utils"] }
lightning-invoice = { version = "0.32.0", path = "../lightning-invoice", default-features = false, features = ["serde", "std"] }
Expand Down
8 changes: 8 additions & 0 deletions lightning-liquidity/src/events.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,8 @@
use crate::lsps0;
use crate::lsps1;
use crate::lsps2;
#[cfg(feature = "lsps5")]
use crate::lsps5;
use crate::prelude::{Vec, VecDeque};
use crate::sync::{Arc, Mutex};

Expand DownExpand Up@@ -114,6 +116,12 @@ pub enum Event {
LSPS2Client(lsps2::event::LSPS2ClientEvent),
/// An LSPS2 (JIT Channel) server event.
LSPS2Service(lsps2::event::LSPS2ServiceEvent),
/// An LSPS5 (Webhook Notifications) client event.
#[cfg(feature = "lsps5")]
LSPS5Client(lsps5::event::LSPS5ClientEvent),
/// An LSPS5 (Webhook Notifications) server event.
#[cfg(feature = "lsps5")]
LSPS5Service(lsps5::event::LSPS5ServiceEvent),
}

struct EventFuture {
Expand Down
2 changes: 2 additions & 0 deletions lightning-liquidity/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,8 @@ pub mod events;
pub mod lsps0;
pub mod lsps1;
pub mod lsps2;
#[cfg(feature = "lsps5")]
pub mod lsps5;
mod manager;
pub mod message_queue;
#[allow(dead_code)]
Expand Down
2 changes: 2 additions & 0 deletions lightning-liquidity/src/lsps0/msgs.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,8 @@ impl TryFrom<LSPSMessage> for LSPS0Message {
LSPSMessage::LSPS0(message) => Ok(message),
LSPSMessage::LSPS1(_) => Err(()),
LSPSMessage::LSPS2(_) => Err(()),
#[cfg(feature = "lsps5")]
LSPSMessage::LSPS5(_) => Err(()),
}
}
}
Expand Down
Loading