Skip to content

Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature#2085

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 2 commits into from
Mar 8, 2023
Merged

Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature #2085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a30f3e
Support HTTPS Esplora endpoints via new feature
tnull Mar 8, 2023
09038ee
Remove unnecessary logging imports
tnull Mar 8, 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
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,18 +127,21 @@ jobs:
cd lightning-transaction-sync
cargo build --verbose --color always --features esplora-blocking
cargo build --verbose --color always --features esplora-async
cargo build --verbose --color always --features esplora-async-https
- name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
if: "matrix.build-tx-sync && matrix.coverage"
run: |
cd lightning-transaction-sync
RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
- name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
if: "matrix.build-tx-sync"
run: |
cd lightning-transaction-sync
cargo test --verbose --color always --features esplora-blocking
cargo test --verbose --color always --features esplora-async
cargo test --verbose --color always --features esplora-async-https
- name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
if: "matrix.toolchain == 'stable'"
shell: bash # Default on Winblows is powershell
Expand Down
2 changes: 2 additions & 0 deletions lightning-transaction-sync/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[features]
default = []
esplora-async = ["async-interface", "esplora-client/async", "futures"]
esplora-async-https = ["esplora-async", "reqwest/rustls-tls"]
esplora-blocking = ["esplora-client/blocking"]
Comment thread
tnull marked this conversation as resolved.
async-interface = []

Expand All@@ -25,6 +26,7 @@ bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
Expand Down
2 changes: 1 addition & 1 deletion lightning-transaction-sync/src/esplora.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use crate::error::{TxSyncError, InternalError};
use crate::common::{SyncState, FilterQueue, ConfirmedTx};

use lightning::util::logger::Logger;
use lightning::{log_error, log_given_level, log_info, log_internal, log_debug, log_trace};
use lightning::{log_error, log_info, log_debug, log_trace};
use lightning::chain::WatchedOutput;
use lightning::chain::{Confirm, Filter};

Expand Down
5 changes: 3 additions & 2 deletions lightning-transaction-sync/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
//!
//! ## Features and Backend Support
//!
//!- `esplora_blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora_async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora-async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-async-https` enables the async Esplora client with support for HTTPS.
//!
//! ## Version Compatibility
//!
Expand Down
17 changes: 17 additions & 0 deletions lightning-transaction-sync/tests/integration_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -348,3 +348,20 @@ async fn test_esplora_syncs() {
_ => panic!("Unexpected event"),
}
}

#[tokio::test]
#[cfg(any(feature = "esplora-async-https", feature = "esplora-blocking"))]
async fn test_esplora_connects_to_public_server() {
let mut logger = TestLogger {};
let esplora_url = "https://blockstream.info/api".to_string();
let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
let confirmable = TestConfirmable::new();

// Check we connect and pick up on new best blocks
assert_eq!(confirmable.best_block.lock().unwrap().1, 0);
#[cfg(feature = "esplora-async-https")]
tx_sync.sync(vec![&confirmable]).await.unwrap();
#[cfg(feature = "esplora-blocking")]
tx_sync.sync(vec![&confirmable]).unwrap();
assert_ne!(confirmable.best_block.lock().unwrap().1, 0);
}
, '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" + '
Support HTTPS Esplora endpoints in `lightning-transaction-sync` via new feature by tnull · Pull Request #2085 · lightningdevkit/rust-lightning · GitHub
Skip to content
Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature#2085

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 8, 2023
 Merged


Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature
#2085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7a30f3e

Support HTTPS Esplora endpoints via new feature


tnull Mar 8, 2023
09038ee

Remove unnecessary logging imports


tnull Mar 8, 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


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,18 +127,21 @@ jobs:
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
Expand Down

2 changes: 2 additions & 0 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[features]
default = []
esplora-async = ["async-interface", "esplora-client/async", "futures"]
esplora-async-https = ["esplora-async", "reqwest/rustls-tls"]
esplora-blocking = ["esplora-client/blocking"]
Comment thread
tnull marked this conversation as resolved.

async-interface = []

Expand All@@ -25,6 +26,7 @@ bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
Expand Down

2 changes: 1 addition & 1 deletion
lightning-transaction-sync/src/esplora.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use crate::error::{TxSyncError, InternalError};
use crate::common::{SyncState, FilterQueue, ConfirmedTx};

use lightning::util::logger::Logger;
use lightning::{log_error, log_given_level, log_info, log_internal, log_debug, log_trace};
use lightning::{log_error, log_info, log_debug, log_trace};
use lightning::chain::WatchedOutput;
use lightning::chain::{Confirm, Filter};

Expand Down

5 changes: 3 additions & 2 deletions
lightning-transaction-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
//!
//! ## Features and Backend Support
//!
//!- `esplora_blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora_async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora-async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-async-https` enables the async Esplora client with support for HTTPS.
//!
//! ## Version Compatibility
//!
Expand Down

17 changes: 17 additions & 0 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,3 +348,20 @@ async fn test_esplora_syncs() {
 _ => panic!("Unexpected event"),
	}
}

#[tokio::test]
#[cfg(any(feature = "esplora-async-https", feature = "esplora-blocking"))]
async fn test_esplora_connects_to_public_server() {
	let mut logger = TestLogger {};
	let esplora_url = "https://blockstream.info/api".to_string();
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we connect and pick up on new best blocks
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);
	#[cfg(feature = "esplora-async-https")]
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	#[cfg(feature = "esplora-blocking")]
	tx_sync.sync(vec![&confirmable]).unwrap();
	assert_ne!(confirmable.best_block.lock().unwrap().1, 0);
}

, '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('^' + ".*" + '
Support HTTPS Esplora endpoints in `lightning-transaction-sync` via new feature by tnull · Pull Request #2085 · lightningdevkit/rust-lightning · GitHub
Skip to content
Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature#2085

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 8, 2023
 Merged


Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature
#2085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7a30f3e

Support HTTPS Esplora endpoints via new feature


tnull Mar 8, 2023
09038ee

Remove unnecessary logging imports


tnull Mar 8, 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


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,18 +127,21 @@ jobs:
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
Expand Down

2 changes: 2 additions & 0 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[features]
default = []
esplora-async = ["async-interface", "esplora-client/async", "futures"]
esplora-async-https = ["esplora-async", "reqwest/rustls-tls"]
esplora-blocking = ["esplora-client/blocking"]
Comment thread
tnull marked this conversation as resolved.

async-interface = []

Expand All@@ -25,6 +26,7 @@ bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
Expand Down

2 changes: 1 addition & 1 deletion
lightning-transaction-sync/src/esplora.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use crate::error::{TxSyncError, InternalError};
use crate::common::{SyncState, FilterQueue, ConfirmedTx};

use lightning::util::logger::Logger;
use lightning::{log_error, log_given_level, log_info, log_internal, log_debug, log_trace};
use lightning::{log_error, log_info, log_debug, log_trace};
use lightning::chain::WatchedOutput;
use lightning::chain::{Confirm, Filter};

Expand Down

5 changes: 3 additions & 2 deletions
lightning-transaction-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
//!
//! ## Features and Backend Support
//!
//!- `esplora_blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora_async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora-async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-async-https` enables the async Esplora client with support for HTTPS.
//!
//! ## Version Compatibility
//!
Expand Down

17 changes: 17 additions & 0 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,3 +348,20 @@ async fn test_esplora_syncs() {
 _ => panic!("Unexpected event"),
	}
}

#[tokio::test]
#[cfg(any(feature = "esplora-async-https", feature = "esplora-blocking"))]
async fn test_esplora_connects_to_public_server() {
	let mut logger = TestLogger {};
	let esplora_url = "https://blockstream.info/api".to_string();
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we connect and pick up on new best blocks
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);
	#[cfg(feature = "esplora-async-https")]
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	#[cfg(feature = "esplora-blocking")]
	tx_sync.sync(vec![&confirmable]).unwrap();
	assert_ne!(confirmable.best_block.lock().unwrap().1, 0);
}

, '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('^' + ".*" + '
Support HTTPS Esplora endpoints in `lightning-transaction-sync` via new feature by tnull · Pull Request #2085 · lightningdevkit/rust-lightning · GitHub
Skip to content
Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature#2085

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 8, 2023
 Merged


Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature
#2085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7a30f3e

Support HTTPS Esplora endpoints via new feature


tnull Mar 8, 2023
09038ee

Remove unnecessary logging imports


tnull Mar 8, 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


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,18 +127,21 @@ jobs:
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
Expand Down

2 changes: 2 additions & 0 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[features]
default = []
esplora-async = ["async-interface", "esplora-client/async", "futures"]
esplora-async-https = ["esplora-async", "reqwest/rustls-tls"]
esplora-blocking = ["esplora-client/blocking"]
Comment thread
tnull marked this conversation as resolved.

async-interface = []

Expand All@@ -25,6 +26,7 @@ bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
Expand Down

2 changes: 1 addition & 1 deletion
lightning-transaction-sync/src/esplora.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use crate::error::{TxSyncError, InternalError};
use crate::common::{SyncState, FilterQueue, ConfirmedTx};

use lightning::util::logger::Logger;
use lightning::{log_error, log_given_level, log_info, log_internal, log_debug, log_trace};
use lightning::{log_error, log_info, log_debug, log_trace};
use lightning::chain::WatchedOutput;
use lightning::chain::{Confirm, Filter};

Expand Down

5 changes: 3 additions & 2 deletions
lightning-transaction-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
//!
//! ## Features and Backend Support
//!
//!- `esplora_blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora_async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora-async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-async-https` enables the async Esplora client with support for HTTPS.
//!
//! ## Version Compatibility
//!
Expand Down

17 changes: 17 additions & 0 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,3 +348,20 @@ async fn test_esplora_syncs() {
 _ => panic!("Unexpected event"),
	}
}

#[tokio::test]
#[cfg(any(feature = "esplora-async-https", feature = "esplora-blocking"))]
async fn test_esplora_connects_to_public_server() {
	let mut logger = TestLogger {};
	let esplora_url = "https://blockstream.info/api".to_string();
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we connect and pick up on new best blocks
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);
	#[cfg(feature = "esplora-async-https")]
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	#[cfg(feature = "esplora-blocking")]
	tx_sync.sync(vec![&confirmable]).unwrap();
	assert_ne!(confirmable.best_block.lock().unwrap().1, 0);
}

, '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" + '
Support HTTPS Esplora endpoints in `lightning-transaction-sync` via new feature by tnull · Pull Request #2085 · lightningdevkit/rust-lightning · GitHub
Skip to content
Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature#2085

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 8, 2023
 Merged


Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature
#2085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7a30f3e

Support HTTPS Esplora endpoints via new feature


tnull Mar 8, 2023
09038ee

Remove unnecessary logging imports


tnull Mar 8, 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


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,18 +127,21 @@ jobs:
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
Expand Down

2 changes: 2 additions & 0 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[features]
default = []
esplora-async = ["async-interface", "esplora-client/async", "futures"]
esplora-async-https = ["esplora-async", "reqwest/rustls-tls"]
esplora-blocking = ["esplora-client/blocking"]
Comment thread
tnull marked this conversation as resolved.

async-interface = []

Expand All@@ -25,6 +26,7 @@ bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
Expand Down

2 changes: 1 addition & 1 deletion
lightning-transaction-sync/src/esplora.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use crate::error::{TxSyncError, InternalError};
use crate::common::{SyncState, FilterQueue, ConfirmedTx};

use lightning::util::logger::Logger;
use lightning::{log_error, log_given_level, log_info, log_internal, log_debug, log_trace};
use lightning::{log_error, log_info, log_debug, log_trace};
use lightning::chain::WatchedOutput;
use lightning::chain::{Confirm, Filter};

Expand Down

5 changes: 3 additions & 2 deletions
lightning-transaction-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
//!
//! ## Features and Backend Support
//!
//!- `esplora_blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora_async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora-async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-async-https` enables the async Esplora client with support for HTTPS.
//!
//! ## Version Compatibility
//!
Expand Down

17 changes: 17 additions & 0 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,3 +348,20 @@ async fn test_esplora_syncs() {
 _ => panic!("Unexpected event"),
	}
}

#[tokio::test]
#[cfg(any(feature = "esplora-async-https", feature = "esplora-blocking"))]
async fn test_esplora_connects_to_public_server() {
	let mut logger = TestLogger {};
	let esplora_url = "https://blockstream.info/api".to_string();
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we connect and pick up on new best blocks
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);
	#[cfg(feature = "esplora-async-https")]
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	#[cfg(feature = "esplora-blocking")]
	tx_sync.sync(vec![&confirmable]).unwrap();
	assert_ne!(confirmable.best_block.lock().unwrap().1, 0);
}

, '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('^' + ".*" + '
Support HTTPS Esplora endpoints in `lightning-transaction-sync` via new feature by tnull · Pull Request #2085 · lightningdevkit/rust-lightning · GitHub
Skip to content
Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature#2085

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 8, 2023
 Merged


Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature
#2085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7a30f3e

Support HTTPS Esplora endpoints via new feature


tnull Mar 8, 2023
09038ee

Remove unnecessary logging imports


tnull Mar 8, 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


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,18 +127,21 @@ jobs:
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
Expand Down

2 changes: 2 additions & 0 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[features]
default = []
esplora-async = ["async-interface", "esplora-client/async", "futures"]
esplora-async-https = ["esplora-async", "reqwest/rustls-tls"]
esplora-blocking = ["esplora-client/blocking"]
Comment thread
tnull marked this conversation as resolved.

async-interface = []

Expand All@@ -25,6 +26,7 @@ bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
Expand Down

2 changes: 1 addition & 1 deletion
lightning-transaction-sync/src/esplora.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use crate::error::{TxSyncError, InternalError};
use crate::common::{SyncState, FilterQueue, ConfirmedTx};

use lightning::util::logger::Logger;
use lightning::{log_error, log_given_level, log_info, log_internal, log_debug, log_trace};
use lightning::{log_error, log_info, log_debug, log_trace};
use lightning::chain::WatchedOutput;
use lightning::chain::{Confirm, Filter};

Expand Down

5 changes: 3 additions & 2 deletions
lightning-transaction-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
//!
//! ## Features and Backend Support
//!
//!- `esplora_blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora_async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora-async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-async-https` enables the async Esplora client with support for HTTPS.
//!
//! ## Version Compatibility
//!
Expand Down

17 changes: 17 additions & 0 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,3 +348,20 @@ async fn test_esplora_syncs() {
 _ => panic!("Unexpected event"),
	}
}

#[tokio::test]
#[cfg(any(feature = "esplora-async-https", feature = "esplora-blocking"))]
async fn test_esplora_connects_to_public_server() {
	let mut logger = TestLogger {};
	let esplora_url = "https://blockstream.info/api".to_string();
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we connect and pick up on new best blocks
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);
	#[cfg(feature = "esplora-async-https")]
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	#[cfg(feature = "esplora-blocking")]
	tx_sync.sync(vec![&confirmable]).unwrap();
	assert_ne!(confirmable.best_block.lock().unwrap().1, 0);
}

, '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('^' + ".*" + '
Support HTTPS Esplora endpoints in `lightning-transaction-sync` via new feature by tnull · Pull Request #2085 · lightningdevkit/rust-lightning · GitHub
Skip to content
Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature#2085

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 8, 2023
 Merged


Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature
#2085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7a30f3e

Support HTTPS Esplora endpoints via new feature


tnull Mar 8, 2023
09038ee

Remove unnecessary logging imports


tnull Mar 8, 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


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,18 +127,21 @@ jobs:
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
Expand Down

2 changes: 2 additions & 0 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[features]
default = []
esplora-async = ["async-interface", "esplora-client/async", "futures"]
esplora-async-https = ["esplora-async", "reqwest/rustls-tls"]
esplora-blocking = ["esplora-client/blocking"]
Comment thread
tnull marked this conversation as resolved.

async-interface = []

Expand All@@ -25,6 +26,7 @@ bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
Expand Down

2 changes: 1 addition & 1 deletion
lightning-transaction-sync/src/esplora.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use crate::error::{TxSyncError, InternalError};
use crate::common::{SyncState, FilterQueue, ConfirmedTx};

use lightning::util::logger::Logger;
use lightning::{log_error, log_given_level, log_info, log_internal, log_debug, log_trace};
use lightning::{log_error, log_info, log_debug, log_trace};
use lightning::chain::WatchedOutput;
use lightning::chain::{Confirm, Filter};

Expand Down

5 changes: 3 additions & 2 deletions
lightning-transaction-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
//!
//! ## Features and Backend Support
//!
//!- `esplora_blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora_async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora-async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-async-https` enables the async Esplora client with support for HTTPS.
//!
//! ## Version Compatibility
//!
Expand Down

17 changes: 17 additions & 0 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,3 +348,20 @@ async fn test_esplora_syncs() {
 _ => panic!("Unexpected event"),
	}
}

#[tokio::test]
#[cfg(any(feature = "esplora-async-https", feature = "esplora-blocking"))]
async fn test_esplora_connects_to_public_server() {
	let mut logger = TestLogger {};
	let esplora_url = "https://blockstream.info/api".to_string();
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we connect and pick up on new best blocks
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);
	#[cfg(feature = "esplora-async-https")]
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	#[cfg(feature = "esplora-blocking")]
	tx_sync.sync(vec![&confirmable]).unwrap();
	assert_ne!(confirmable.best_block.lock().unwrap().1, 0);
}

, '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); }
})();
})();
Support HTTPS Esplora endpoints in `lightning-transaction-sync` via new feature by tnull · Pull Request #2085 · lightningdevkit/rust-lightning · GitHub
Skip to content
Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature#2085

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Mar 8, 2023
 Merged


Support HTTPS Esplora endpoints in lightning-transaction-sync via new feature
#2085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7a30f3e

Support HTTPS Esplora endpoints via new feature


tnull Mar 8, 2023
09038ee

Remove unnecessary logging imports


tnull Mar 8, 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


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,18 +127,21 @@ jobs:
 cd lightning-transaction-sync
 cargo build --verbose --color always --features esplora-blocking
 cargo build --verbose --color always --features esplora-async
 cargo build --verbose --color always --features esplora-async-https
 - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
 if: "matrix.build-tx-sync && matrix.coverage"
 run: |
 cd lightning-transaction-sync
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
 RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
 - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
 if: "matrix.build-tx-sync"
 run: |
 cd lightning-transaction-sync
 cargo test --verbose --color always --features esplora-blocking
 cargo test --verbose --color always --features esplora-async
 cargo test --verbose --color always --features esplora-async-https
 - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
 if: "matrix.toolchain == 'stable'"
 shell: bash # Default on Winblows is powershell
Expand Down

2 changes: 2 additions & 0 deletions
lightning-transaction-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[features]
default = []
esplora-async = ["async-interface", "esplora-client/async", "futures"]
esplora-async-https = ["esplora-async", "reqwest/rustls-tls"]
esplora-blocking = ["esplora-client/blocking"]
Comment thread
tnull marked this conversation as resolved.

async-interface = []

Expand All@@ -25,6 +26,7 @@ bitcoin = { version = "0.29.0", default-features = false }
bdk-macros = "0.6"
futures = { version = "0.3", optional = true }
esplora-client = { version = "0.3.0", default-features = false, optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
lightning = { version = "0.0.114", path = "../lightning", features = ["std"] }
Expand Down

2 changes: 1 addition & 1 deletion
lightning-transaction-sync/src/esplora.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use crate::error::{TxSyncError, InternalError};
use crate::common::{SyncState, FilterQueue, ConfirmedTx};

use lightning::util::logger::Logger;
use lightning::{log_error, log_given_level, log_info, log_internal, log_debug, log_trace};
use lightning::{log_error, log_info, log_debug, log_trace};
use lightning::chain::WatchedOutput;
use lightning::chain::{Confirm, Filter};

Expand Down

5 changes: 3 additions & 2 deletions
lightning-transaction-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
//!
//! ## Features and Backend Support
//!
//!- `esplora_blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora_async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-blocking` enables syncing against an Esplora backend based on a blocking client.
//!- `esplora-async` enables syncing against an Esplora backend based on an async client.
//!- `esplora-async-https` enables the async Esplora client with support for HTTPS.
//!
//! ## Version Compatibility
//!
Expand Down

17 changes: 17 additions & 0 deletions
lightning-transaction-sync/tests/integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,3 +348,20 @@ async fn test_esplora_syncs() {
 _ => panic!("Unexpected event"),
	}
}

#[tokio::test]
#[cfg(any(feature = "esplora-async-https", feature = "esplora-blocking"))]
async fn test_esplora_connects_to_public_server() {
	let mut logger = TestLogger {};
	let esplora_url = "https://blockstream.info/api".to_string();
	let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
	let confirmable = TestConfirmable::new();

	// Check we connect and pick up on new best blocks
	assert_eq!(confirmable.best_block.lock().unwrap().1, 0);
	#[cfg(feature = "esplora-async-https")]
	tx_sync.sync(vec![&confirmable]).await.unwrap();
	#[cfg(feature = "esplora-blocking")]
	tx_sync.sync(vec![&confirmable]).unwrap();
	assert_ne!(confirmable.best_block.lock().unwrap().1, 0);
}