Skip to content
This repository was archived by the owner on Aug 3, 2026. It is now read-only.

Upgrade to LDK 0.0.125#136

Merged
tnull merged 5 commits into from
Oct 28, 2024
Merged

Upgrade to LDK 0.0.125 #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d171e0
Drop `sendonionmessage` custom message sending command
TheBlueMatt Oct 14, 2024
d8ab0a6
Upgrade to LDK 0.0.125/rust-bitcoin 0.32
TheBlueMatt Oct 14, 2024
cfcd28b
Use `Balance`s to calculate balances instead of `ChannelDetails`
TheBlueMatt Oct 14, 2024
c52bf5b
Print network graph statistics in nodeinfo
TheBlueMatt Oct 14, 2024
7ca1088
Switch to `submitpackage` for broadcasting transactions
TheBlueMatt Oct 14, 2024
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
16 changes: 8 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,16 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
lightning = { version = "0.0.123", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.123", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.31.0" }
lightning-net-tokio = { version = "0.0.123" }
lightning-persister = { version = "0.0.123" }
lightning-background-processor = { version = "0.0.123", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.123" }
lightning = { version = "0.0.125", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.125", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.32.0" }
lightning-net-tokio = { version = "0.0.125" }
lightning-persister = { version = "0.0.125" }
lightning-background-processor = { version = "0.0.125", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.125" }

base64 = "0.13.0"
bitcoin = "0.30.2"
bitcoin = "0.32"
bitcoin-bech32 = "0.12"
bech32 = "0.8"
libc = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion src/args.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
use crate::cli::LdkUserInfo;
use bitcoin::network::constants::Network;
use bitcoin::network::Network;
use lightning::ln::msgs::SocketAddress;
use std::collections::HashMap;
use std::env;
Expand Down
117 changes: 77 additions & 40 deletions src/bitcoind_client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ use crate::convert::{
use crate::disk::FilesystemLogger;
use crate::hex_utils;
use base64;
use bitcoin::address::{Address, Payload, WitnessVersion};
use bitcoin::address::Address;
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::consensus::{encode, Decodable, Encodable};
use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::Hash;
use bitcoin::key::XOnlyPublicKey;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::psbt::Psbt;
use bitcoin::{Network, OutPoint, TxOut, WPubkeyHash};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::events::bump_transaction::{Utxo, WalletSource};
Expand DownExpand Up@@ -80,7 +80,8 @@ impl BitcoindClient {
"Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
})?;
let mut fees: HashMap<ConfirmationTarget, AtomicU32> = HashMap::new();
fees.insert(ConfirmationTarget::OnChainSweep, AtomicU32::new(5000));
fees.insert(ConfirmationTarget::MaximumFeeEstimate, AtomicU32::new(50000));
fees.insert(ConfirmationTarget::UrgentOnChainSweep, AtomicU32::new(5000));
fees.insert(
ConfirmationTarget::MinAllowedAnchorChannelRemoteFee,
AtomicU32::new(MIN_FEERATE),
Expand All@@ -92,6 +93,7 @@ impl BitcoindClient {
fees.insert(ConfirmationTarget::AnchorChannelFee, AtomicU32::new(MIN_FEERATE));
fees.insert(ConfirmationTarget::NonAnchorChannelFee, AtomicU32::new(2000));
fees.insert(ConfirmationTarget::ChannelCloseMinimum, AtomicU32::new(MIN_FEERATE));
fees.insert(ConfirmationTarget::OutputSpendingFee, AtomicU32::new(MIN_FEERATE));

let client = Self {
bitcoind_rpc_client: Arc::new(bitcoind_rpc_client),
Expand DownExpand Up@@ -177,7 +179,27 @@ impl BitcoindClient {
}
};

fees.get(&ConfirmationTarget::OnChainSweep)
let very_high_prio_estimate = {
let high_prio_conf_target = serde_json::json!(2);
let high_prio_estimate_mode = serde_json::json!("CONSERVATIVE");
let resp = rpc_client
.call_method::<FeeResponse>(
"estimatesmartfee",
&vec![high_prio_conf_target, high_prio_estimate_mode],
)
.await
.unwrap();

match resp.feerate_sat_per_kw {
Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
None => 50000,
}
};

fees.get(&ConfirmationTarget::MaximumFeeEstimate)
.unwrap()
.store(very_high_prio_estimate, Ordering::Release);
fees.get(&ConfirmationTarget::UrgentOnChainSweep)
.unwrap()
.store(high_prio_estimate, Ordering::Release);
fees.get(&ConfirmationTarget::MinAllowedAnchorChannelRemoteFee)
Expand All@@ -195,6 +217,9 @@ impl BitcoindClient {
fees.get(&ConfirmationTarget::ChannelCloseMinimum)
.unwrap()
.store(background_estimate, Ordering::Release);
fees.get(&ConfirmationTarget::OutputSpendingFee)
.unwrap()
.store(background_estimate, Ordering::Release);

tokio::time::sleep(Duration::from_secs(60)).await;
}
Expand DownExpand Up@@ -289,32 +314,42 @@ impl FeeEstimator for BitcoindClient {

impl BroadcasterInterface for BitcoindClient {
fn broadcast_transactions(&self, txs: &[&Transaction]) {
// TODO: Rather than calling `sendrawtransaction` in a a loop, we should probably use
// `submitpackage` once it becomes available.
for tx in txs {
let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
let tx_serialized = encode::serialize_hex(tx);
let tx_json = serde_json::json!(tx_serialized);
let logger = Arc::clone(&self.logger);
self.handle.spawn(async move {
// This may error due to RL calling `broadcast_transactions` with the same transaction
// multiple times, but the error is safe to ignore.
match bitcoind_rpc_client
.call_method::<Txid>("sendrawtransaction", &vec![tx_json])
// As of Bitcoin Core 28, using `submitpackage` allows us to broadcast multiple
// transactions at once and have them propagate through the network as a whole, avoiding
// some pitfalls with anchor channels where the first transaction doesn't make it into the
// mempool at all. Several older versions of Bitcoin Core also support `submitpackage`,
// however, so we just use it unconditionally here.
// Sadly, Bitcoin Core has an arbitrary restriction on `submitpackage` - it must actually
// contain a package (see https://github.com/bitcoin/bitcoin/issues/31085).
let txn = txs.iter().map(|tx| encode::serialize_hex(tx)).collect::<Vec<_>>();
let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
let logger = Arc::clone(&self.logger);
self.handle.spawn(async move {
let res = if txn.len() == 1 {
let tx_json = serde_json::json!(txn[0]);
bitcoind_rpc_client
.call_method::<serde_json::Value>("sendrawtransaction", &[tx_json])
.await
{
Ok(_) => {}
Err(e) => {
let err_str = e.get_ref().unwrap().to_string();
log_error!(logger,
"Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransaction: {}",
err_str,
tx_serialized);
print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
}
}
});
}
} else {
let tx_json = serde_json::json!(txn);
bitcoind_rpc_client
.call_method::<serde_json::Value>("submitpackage", &[tx_json])
.await
};
// This may error due to RL calling `broadcast_transactions` with the same transaction
// multiple times, but the error is safe to ignore.
match res {
Ok(_) => {}
Err(e) => {
let err_str = e.get_ref().unwrap().to_string();
log_error!(logger,
"Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransactions: {:?}",
err_str,
txn);
print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
}
}
});
}
}

Expand All@@ -335,24 +370,26 @@ impl WalletSource for BitcoindClient {
.into_iter()
.filter_map(|utxo| {
let outpoint = OutPoint { txid: utxo.txid, vout: utxo.vout };
match utxo.address.payload.clone() {
Payload::WitnessProgram(wp) => match wp.version() {
WitnessVersion::V0 => WPubkeyHash::from_slice(wp.program().as_bytes())
.map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, utxo.amount, &wpkh))
.ok(),
let value = bitcoin::Amount::from_sat(utxo.amount);
match utxo.address.witness_program() {
Some(prog) if prog.is_p2wpkh() => {
WPubkeyHash::from_slice(prog.program().as_bytes())
.map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, value, &wpkh))
.ok()
},
Some(prog) if prog.is_p2tr() => {
// TODO: Add `Utxo::new_v1_p2tr` upstream.
WitnessVersion::V1 => XOnlyPublicKey::from_slice(wp.program().as_bytes())
XOnlyPublicKey::from_slice(prog.program().as_bytes())
.map(|_| Utxo {
outpoint,
output: TxOut {
value: utxo.amount,
script_pubkey: ScriptBuf::new_witness_program(&wp),
value,
script_pubkey: utxo.address.script_pubkey(),
},
satisfaction_weight: 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 +
1 /* witness items */ + 1 /* schnorr sig len */ + 64, /* schnorr sig */
})
.ok(),
_ => None,
.ok()
},
_ => None,
}
Expand All@@ -366,7 +403,7 @@ impl WalletSource for BitcoindClient {
})
}

fn sign_psbt(&self, tx: PartiallySignedTransaction) -> Result<Transaction, ()> {
fn sign_psbt(&self, tx: Psbt) -> Result<Transaction, ()> {
let mut tx_bytes = Vec::new();
let _ = tx.unsigned_tx.consensus_encode(&mut tx_bytes).map_err(|_| ());
let tx_hex = hex_utils::hex_str(&tx_bytes);
Expand Down
Loading
, '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" + '
Upgrade to LDK 0.0.125 by TheBlueMatt · Pull Request #136 · lightningdevkit/ldk-sample · GitHub
Skip to content

This repository was archived by the owner on Aug 3, 2026. It is now read-only.

Upgrade to LDK 0.0.125#136
 Merged

tnull
merged 5 commits into

from

Oct 28, 2024
 Merged


Upgrade to LDK 0.0.125
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6d171e0

Drop `sendonionmessage` custom message sending command


TheBlueMatt Oct 14, 2024
d8ab0a6

Upgrade to LDK 0.0.125/rust-bitcoin 0.32


TheBlueMatt Oct 14, 2024
cfcd28b

Use `Balance`s to calculate balances instead of `ChannelDetails`


TheBlueMatt Oct 14, 2024
c52bf5b

Print network graph statistics in nodeinfo


TheBlueMatt Oct 14, 2024
7ca1088

Switch to `submitpackage` for broadcasting transactions


TheBlueMatt Oct 14, 2024

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


16 changes: 8 additions & 8 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,16 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
lightning = { version = "0.0.123", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.123", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.31.0" }
lightning-net-tokio = { version = "0.0.123" }
lightning-persister = { version = "0.0.123" }
lightning-background-processor = { version = "0.0.123", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.123" }
lightning = { version = "0.0.125", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.125", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.32.0" }
lightning-net-tokio = { version = "0.0.125" }
lightning-persister = { version = "0.0.125" }
lightning-background-processor = { version = "0.0.125", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.125" }

base64 = "0.13.0"
bitcoin = "0.30.2"
bitcoin = "0.32"
bitcoin-bech32 = "0.12"
bech32 = "0.8"
libc = "0.2"
Expand Down

2 changes: 1 addition & 1 deletion
src/args.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
use crate::cli::LdkUserInfo;
use bitcoin::network::constants::Network;
use bitcoin::network::Network;
use lightning::ln::msgs::SocketAddress;
use std::collections::HashMap;
use std::env;
Expand Down

117 changes: 77 additions & 40 deletions
src/bitcoind_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ use crate::convert::{
use crate::disk::FilesystemLogger;
use crate::hex_utils;
use base64;
use bitcoin::address::{Address, Payload, WitnessVersion};
use bitcoin::address::Address;
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::consensus::{encode, Decodable, Encodable};
use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::Hash;
use bitcoin::key::XOnlyPublicKey;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::psbt::Psbt;
use bitcoin::{Network, OutPoint, TxOut, WPubkeyHash};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::events::bump_transaction::{Utxo, WalletSource};
Expand DownExpand Up@@ -80,7 +80,8 @@ impl BitcoindClient {
 "Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
 })?;
 let mut fees: HashMap<ConfirmationTarget, AtomicU32> = HashMap::new();
 fees.insert(ConfirmationTarget::OnChainSweep, AtomicU32::new(5000));
 fees.insert(ConfirmationTarget::MaximumFeeEstimate, AtomicU32::new(50000));
 fees.insert(ConfirmationTarget::UrgentOnChainSweep, AtomicU32::new(5000));
 fees.insert(
 ConfirmationTarget::MinAllowedAnchorChannelRemoteFee,
 AtomicU32::new(MIN_FEERATE),
Expand All@@ -92,6 +93,7 @@ impl BitcoindClient {
 fees.insert(ConfirmationTarget::AnchorChannelFee, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::NonAnchorChannelFee, AtomicU32::new(2000));
 fees.insert(ConfirmationTarget::ChannelCloseMinimum, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::OutputSpendingFee, AtomicU32::new(MIN_FEERATE));

 let client = Self {
 bitcoind_rpc_client: Arc::new(bitcoind_rpc_client),
Expand DownExpand Up@@ -177,7 +179,27 @@ impl BitcoindClient {
 }
 };

 fees.get(&ConfirmationTarget::OnChainSweep)
 let very_high_prio_estimate = {
 let high_prio_conf_target = serde_json::json!(2);
 let high_prio_estimate_mode = serde_json::json!("CONSERVATIVE");
 let resp = rpc_client
 .call_method::<FeeResponse>(
 "estimatesmartfee",
 &vec![high_prio_conf_target, high_prio_estimate_mode],
 )
 .await
 .unwrap();

 match resp.feerate_sat_per_kw {
 Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
 None => 50000,
 }
 };

 fees.get(&ConfirmationTarget::MaximumFeeEstimate)
 .unwrap()
 .store(very_high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::UrgentOnChainSweep)
 .unwrap()
 .store(high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::MinAllowedAnchorChannelRemoteFee)
Expand All@@ -195,6 +217,9 @@ impl BitcoindClient {
 fees.get(&ConfirmationTarget::ChannelCloseMinimum)
 .unwrap()
 .store(background_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::OutputSpendingFee)
 .unwrap()
 .store(background_estimate, Ordering::Release);

 tokio::time::sleep(Duration::from_secs(60)).await;
 }
Expand DownExpand Up@@ -289,32 +314,42 @@ impl FeeEstimator for BitcoindClient {

impl BroadcasterInterface for BitcoindClient {
	fn broadcast_transactions(&self, txs: &[&Transaction]) {
 // TODO: Rather than calling `sendrawtransaction` in a a loop, we should probably use
 // `submitpackage` once it becomes available.
 for tx in txs {
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let tx_serialized = encode::serialize_hex(tx);
 let tx_json = serde_json::json!(tx_serialized);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match bitcoind_rpc_client
 .call_method::<Txid>("sendrawtransaction", &vec![tx_json])
 // As of Bitcoin Core 28, using `submitpackage` allows us to broadcast multiple
 // transactions at once and have them propagate through the network as a whole, avoiding
 // some pitfalls with anchor channels where the first transaction doesn't make it into the
 // mempool at all. Several older versions of Bitcoin Core also support `submitpackage`,
 // however, so we just use it unconditionally here.
 // Sadly, Bitcoin Core has an arbitrary restriction on `submitpackage` - it must actually
 // contain a package (see https://github.com/bitcoin/bitcoin/issues/31085).
 let txn = txs.iter().map(|tx| encode::serialize_hex(tx)).collect::<Vec<_>>();
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 let res = if txn.len() == 1 {
 let tx_json = serde_json::json!(txn[0]);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("sendrawtransaction", &[tx_json])
 .await
 {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransaction: {}",
 err_str,
 tx_serialized);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
 }
 } else {
 let tx_json = serde_json::json!(txn);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("submitpackage", &[tx_json])
 .await
 };
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match res {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransactions: {:?}",
 err_str,
 txn);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
	}
}

Expand All@@ -335,24 +370,26 @@ impl WalletSource for BitcoindClient {
 .into_iter()
 .filter_map(|utxo| {
 let outpoint = OutPoint { txid: utxo.txid, vout: utxo.vout };
 match utxo.address.payload.clone() {
 Payload::WitnessProgram(wp) => match wp.version() {
 WitnessVersion::V0 => WPubkeyHash::from_slice(wp.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, utxo.amount, &wpkh))
 .ok(),
 let value = bitcoin::Amount::from_sat(utxo.amount);
 match utxo.address.witness_program() {
 Some(prog) if prog.is_p2wpkh() => {
 WPubkeyHash::from_slice(prog.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, value, &wpkh))
 .ok()
 },
 Some(prog) if prog.is_p2tr() => {
 // TODO: Add `Utxo::new_v1_p2tr` upstream.
WitnessVersion::V1 => XOnlyPublicKey::from_slice(wp.program().as_bytes())
 XOnlyPublicKey::from_slice(prog.program().as_bytes())
 .map(|_| Utxo {
 outpoint,
 output: TxOut {
 value: utxo.amount,
 script_pubkey: ScriptBuf::new_witness_program(&wp),
 value,
 script_pubkey: utxo.address.script_pubkey(),
 },
 satisfaction_weight: 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 +
 1 /* witness items */ + 1 /* schnorr sig len */ + 64, /* schnorr sig */
 })
 .ok(),
 _ => None,
 .ok()
 },
 _ => None,
 }
Expand All@@ -366,7 +403,7 @@ impl WalletSource for BitcoindClient {
 })
	}

	fn sign_psbt(&self, tx: PartiallySignedTransaction) -> Result<Transaction, ()> {
	fn sign_psbt(&self, tx: Psbt) -> Result<Transaction, ()> {
 let mut tx_bytes = Vec::new();
 let _ = tx.unsigned_tx.consensus_encode(&mut tx_bytes).map_err(|_| ());
 let tx_hex = hex_utils::hex_str(&tx_bytes);
Expand Down
Loading

, '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('^' + ".*" + '
Upgrade to LDK 0.0.125 by TheBlueMatt · Pull Request #136 · lightningdevkit/ldk-sample · GitHub
Skip to content

This repository was archived by the owner on Aug 3, 2026. It is now read-only.

Upgrade to LDK 0.0.125#136
 Merged

tnull
merged 5 commits into

from

Oct 28, 2024
 Merged


Upgrade to LDK 0.0.125
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6d171e0

Drop `sendonionmessage` custom message sending command


TheBlueMatt Oct 14, 2024
d8ab0a6

Upgrade to LDK 0.0.125/rust-bitcoin 0.32


TheBlueMatt Oct 14, 2024
cfcd28b

Use `Balance`s to calculate balances instead of `ChannelDetails`


TheBlueMatt Oct 14, 2024
c52bf5b

Print network graph statistics in nodeinfo


TheBlueMatt Oct 14, 2024
7ca1088

Switch to `submitpackage` for broadcasting transactions


TheBlueMatt Oct 14, 2024

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


16 changes: 8 additions & 8 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,16 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
lightning = { version = "0.0.123", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.123", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.31.0" }
lightning-net-tokio = { version = "0.0.123" }
lightning-persister = { version = "0.0.123" }
lightning-background-processor = { version = "0.0.123", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.123" }
lightning = { version = "0.0.125", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.125", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.32.0" }
lightning-net-tokio = { version = "0.0.125" }
lightning-persister = { version = "0.0.125" }
lightning-background-processor = { version = "0.0.125", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.125" }

base64 = "0.13.0"
bitcoin = "0.30.2"
bitcoin = "0.32"
bitcoin-bech32 = "0.12"
bech32 = "0.8"
libc = "0.2"
Expand Down

2 changes: 1 addition & 1 deletion
src/args.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
use crate::cli::LdkUserInfo;
use bitcoin::network::constants::Network;
use bitcoin::network::Network;
use lightning::ln::msgs::SocketAddress;
use std::collections::HashMap;
use std::env;
Expand Down

117 changes: 77 additions & 40 deletions
src/bitcoind_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ use crate::convert::{
use crate::disk::FilesystemLogger;
use crate::hex_utils;
use base64;
use bitcoin::address::{Address, Payload, WitnessVersion};
use bitcoin::address::Address;
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::consensus::{encode, Decodable, Encodable};
use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::Hash;
use bitcoin::key::XOnlyPublicKey;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::psbt::Psbt;
use bitcoin::{Network, OutPoint, TxOut, WPubkeyHash};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::events::bump_transaction::{Utxo, WalletSource};
Expand DownExpand Up@@ -80,7 +80,8 @@ impl BitcoindClient {
 "Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
 })?;
 let mut fees: HashMap<ConfirmationTarget, AtomicU32> = HashMap::new();
 fees.insert(ConfirmationTarget::OnChainSweep, AtomicU32::new(5000));
 fees.insert(ConfirmationTarget::MaximumFeeEstimate, AtomicU32::new(50000));
 fees.insert(ConfirmationTarget::UrgentOnChainSweep, AtomicU32::new(5000));
 fees.insert(
 ConfirmationTarget::MinAllowedAnchorChannelRemoteFee,
 AtomicU32::new(MIN_FEERATE),
Expand All@@ -92,6 +93,7 @@ impl BitcoindClient {
 fees.insert(ConfirmationTarget::AnchorChannelFee, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::NonAnchorChannelFee, AtomicU32::new(2000));
 fees.insert(ConfirmationTarget::ChannelCloseMinimum, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::OutputSpendingFee, AtomicU32::new(MIN_FEERATE));

 let client = Self {
 bitcoind_rpc_client: Arc::new(bitcoind_rpc_client),
Expand DownExpand Up@@ -177,7 +179,27 @@ impl BitcoindClient {
 }
 };

 fees.get(&ConfirmationTarget::OnChainSweep)
 let very_high_prio_estimate = {
 let high_prio_conf_target = serde_json::json!(2);
 let high_prio_estimate_mode = serde_json::json!("CONSERVATIVE");
 let resp = rpc_client
 .call_method::<FeeResponse>(
 "estimatesmartfee",
 &vec![high_prio_conf_target, high_prio_estimate_mode],
 )
 .await
 .unwrap();

 match resp.feerate_sat_per_kw {
 Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
 None => 50000,
 }
 };

 fees.get(&ConfirmationTarget::MaximumFeeEstimate)
 .unwrap()
 .store(very_high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::UrgentOnChainSweep)
 .unwrap()
 .store(high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::MinAllowedAnchorChannelRemoteFee)
Expand All@@ -195,6 +217,9 @@ impl BitcoindClient {
 fees.get(&ConfirmationTarget::ChannelCloseMinimum)
 .unwrap()
 .store(background_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::OutputSpendingFee)
 .unwrap()
 .store(background_estimate, Ordering::Release);

 tokio::time::sleep(Duration::from_secs(60)).await;
 }
Expand DownExpand Up@@ -289,32 +314,42 @@ impl FeeEstimator for BitcoindClient {

impl BroadcasterInterface for BitcoindClient {
	fn broadcast_transactions(&self, txs: &[&Transaction]) {
 // TODO: Rather than calling `sendrawtransaction` in a a loop, we should probably use
 // `submitpackage` once it becomes available.
 for tx in txs {
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let tx_serialized = encode::serialize_hex(tx);
 let tx_json = serde_json::json!(tx_serialized);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match bitcoind_rpc_client
 .call_method::<Txid>("sendrawtransaction", &vec![tx_json])
 // As of Bitcoin Core 28, using `submitpackage` allows us to broadcast multiple
 // transactions at once and have them propagate through the network as a whole, avoiding
 // some pitfalls with anchor channels where the first transaction doesn't make it into the
 // mempool at all. Several older versions of Bitcoin Core also support `submitpackage`,
 // however, so we just use it unconditionally here.
 // Sadly, Bitcoin Core has an arbitrary restriction on `submitpackage` - it must actually
 // contain a package (see https://github.com/bitcoin/bitcoin/issues/31085).
 let txn = txs.iter().map(|tx| encode::serialize_hex(tx)).collect::<Vec<_>>();
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 let res = if txn.len() == 1 {
 let tx_json = serde_json::json!(txn[0]);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("sendrawtransaction", &[tx_json])
 .await
 {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransaction: {}",
 err_str,
 tx_serialized);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
 }
 } else {
 let tx_json = serde_json::json!(txn);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("submitpackage", &[tx_json])
 .await
 };
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match res {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransactions: {:?}",
 err_str,
 txn);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
	}
}

Expand All@@ -335,24 +370,26 @@ impl WalletSource for BitcoindClient {
 .into_iter()
 .filter_map(|utxo| {
 let outpoint = OutPoint { txid: utxo.txid, vout: utxo.vout };
 match utxo.address.payload.clone() {
 Payload::WitnessProgram(wp) => match wp.version() {
 WitnessVersion::V0 => WPubkeyHash::from_slice(wp.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, utxo.amount, &wpkh))
 .ok(),
 let value = bitcoin::Amount::from_sat(utxo.amount);
 match utxo.address.witness_program() {
 Some(prog) if prog.is_p2wpkh() => {
 WPubkeyHash::from_slice(prog.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, value, &wpkh))
 .ok()
 },
 Some(prog) if prog.is_p2tr() => {
 // TODO: Add `Utxo::new_v1_p2tr` upstream.
WitnessVersion::V1 => XOnlyPublicKey::from_slice(wp.program().as_bytes())
 XOnlyPublicKey::from_slice(prog.program().as_bytes())
 .map(|_| Utxo {
 outpoint,
 output: TxOut {
 value: utxo.amount,
 script_pubkey: ScriptBuf::new_witness_program(&wp),
 value,
 script_pubkey: utxo.address.script_pubkey(),
 },
 satisfaction_weight: 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 +
 1 /* witness items */ + 1 /* schnorr sig len */ + 64, /* schnorr sig */
 })
 .ok(),
 _ => None,
 .ok()
 },
 _ => None,
 }
Expand All@@ -366,7 +403,7 @@ impl WalletSource for BitcoindClient {
 })
	}

	fn sign_psbt(&self, tx: PartiallySignedTransaction) -> Result<Transaction, ()> {
	fn sign_psbt(&self, tx: Psbt) -> Result<Transaction, ()> {
 let mut tx_bytes = Vec::new();
 let _ = tx.unsigned_tx.consensus_encode(&mut tx_bytes).map_err(|_| ());
 let tx_hex = hex_utils::hex_str(&tx_bytes);
Expand Down
Loading

, '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('^' + ".*" + '
Upgrade to LDK 0.0.125 by TheBlueMatt · Pull Request #136 · lightningdevkit/ldk-sample · GitHub
Skip to content

This repository was archived by the owner on Aug 3, 2026. It is now read-only.

Upgrade to LDK 0.0.125#136
 Merged

tnull
merged 5 commits into

from

Oct 28, 2024
 Merged


Upgrade to LDK 0.0.125
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6d171e0

Drop `sendonionmessage` custom message sending command


TheBlueMatt Oct 14, 2024
d8ab0a6

Upgrade to LDK 0.0.125/rust-bitcoin 0.32


TheBlueMatt Oct 14, 2024
cfcd28b

Use `Balance`s to calculate balances instead of `ChannelDetails`


TheBlueMatt Oct 14, 2024
c52bf5b

Print network graph statistics in nodeinfo


TheBlueMatt Oct 14, 2024
7ca1088

Switch to `submitpackage` for broadcasting transactions


TheBlueMatt Oct 14, 2024

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


16 changes: 8 additions & 8 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,16 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
lightning = { version = "0.0.123", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.123", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.31.0" }
lightning-net-tokio = { version = "0.0.123" }
lightning-persister = { version = "0.0.123" }
lightning-background-processor = { version = "0.0.123", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.123" }
lightning = { version = "0.0.125", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.125", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.32.0" }
lightning-net-tokio = { version = "0.0.125" }
lightning-persister = { version = "0.0.125" }
lightning-background-processor = { version = "0.0.125", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.125" }

base64 = "0.13.0"
bitcoin = "0.30.2"
bitcoin = "0.32"
bitcoin-bech32 = "0.12"
bech32 = "0.8"
libc = "0.2"
Expand Down

2 changes: 1 addition & 1 deletion
src/args.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
use crate::cli::LdkUserInfo;
use bitcoin::network::constants::Network;
use bitcoin::network::Network;
use lightning::ln::msgs::SocketAddress;
use std::collections::HashMap;
use std::env;
Expand Down

117 changes: 77 additions & 40 deletions
src/bitcoind_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ use crate::convert::{
use crate::disk::FilesystemLogger;
use crate::hex_utils;
use base64;
use bitcoin::address::{Address, Payload, WitnessVersion};
use bitcoin::address::Address;
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::consensus::{encode, Decodable, Encodable};
use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::Hash;
use bitcoin::key::XOnlyPublicKey;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::psbt::Psbt;
use bitcoin::{Network, OutPoint, TxOut, WPubkeyHash};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::events::bump_transaction::{Utxo, WalletSource};
Expand DownExpand Up@@ -80,7 +80,8 @@ impl BitcoindClient {
 "Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
 })?;
 let mut fees: HashMap<ConfirmationTarget, AtomicU32> = HashMap::new();
 fees.insert(ConfirmationTarget::OnChainSweep, AtomicU32::new(5000));
 fees.insert(ConfirmationTarget::MaximumFeeEstimate, AtomicU32::new(50000));
 fees.insert(ConfirmationTarget::UrgentOnChainSweep, AtomicU32::new(5000));
 fees.insert(
 ConfirmationTarget::MinAllowedAnchorChannelRemoteFee,
 AtomicU32::new(MIN_FEERATE),
Expand All@@ -92,6 +93,7 @@ impl BitcoindClient {
 fees.insert(ConfirmationTarget::AnchorChannelFee, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::NonAnchorChannelFee, AtomicU32::new(2000));
 fees.insert(ConfirmationTarget::ChannelCloseMinimum, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::OutputSpendingFee, AtomicU32::new(MIN_FEERATE));

 let client = Self {
 bitcoind_rpc_client: Arc::new(bitcoind_rpc_client),
Expand DownExpand Up@@ -177,7 +179,27 @@ impl BitcoindClient {
 }
 };

 fees.get(&ConfirmationTarget::OnChainSweep)
 let very_high_prio_estimate = {
 let high_prio_conf_target = serde_json::json!(2);
 let high_prio_estimate_mode = serde_json::json!("CONSERVATIVE");
 let resp = rpc_client
 .call_method::<FeeResponse>(
 "estimatesmartfee",
 &vec![high_prio_conf_target, high_prio_estimate_mode],
 )
 .await
 .unwrap();

 match resp.feerate_sat_per_kw {
 Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
 None => 50000,
 }
 };

 fees.get(&ConfirmationTarget::MaximumFeeEstimate)
 .unwrap()
 .store(very_high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::UrgentOnChainSweep)
 .unwrap()
 .store(high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::MinAllowedAnchorChannelRemoteFee)
Expand All@@ -195,6 +217,9 @@ impl BitcoindClient {
 fees.get(&ConfirmationTarget::ChannelCloseMinimum)
 .unwrap()
 .store(background_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::OutputSpendingFee)
 .unwrap()
 .store(background_estimate, Ordering::Release);

 tokio::time::sleep(Duration::from_secs(60)).await;
 }
Expand DownExpand Up@@ -289,32 +314,42 @@ impl FeeEstimator for BitcoindClient {

impl BroadcasterInterface for BitcoindClient {
	fn broadcast_transactions(&self, txs: &[&Transaction]) {
 // TODO: Rather than calling `sendrawtransaction` in a a loop, we should probably use
 // `submitpackage` once it becomes available.
 for tx in txs {
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let tx_serialized = encode::serialize_hex(tx);
 let tx_json = serde_json::json!(tx_serialized);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match bitcoind_rpc_client
 .call_method::<Txid>("sendrawtransaction", &vec![tx_json])
 // As of Bitcoin Core 28, using `submitpackage` allows us to broadcast multiple
 // transactions at once and have them propagate through the network as a whole, avoiding
 // some pitfalls with anchor channels where the first transaction doesn't make it into the
 // mempool at all. Several older versions of Bitcoin Core also support `submitpackage`,
 // however, so we just use it unconditionally here.
 // Sadly, Bitcoin Core has an arbitrary restriction on `submitpackage` - it must actually
 // contain a package (see https://github.com/bitcoin/bitcoin/issues/31085).
 let txn = txs.iter().map(|tx| encode::serialize_hex(tx)).collect::<Vec<_>>();
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 let res = if txn.len() == 1 {
 let tx_json = serde_json::json!(txn[0]);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("sendrawtransaction", &[tx_json])
 .await
 {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransaction: {}",
 err_str,
 tx_serialized);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
 }
 } else {
 let tx_json = serde_json::json!(txn);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("submitpackage", &[tx_json])
 .await
 };
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match res {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransactions: {:?}",
 err_str,
 txn);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
	}
}

Expand All@@ -335,24 +370,26 @@ impl WalletSource for BitcoindClient {
 .into_iter()
 .filter_map(|utxo| {
 let outpoint = OutPoint { txid: utxo.txid, vout: utxo.vout };
 match utxo.address.payload.clone() {
 Payload::WitnessProgram(wp) => match wp.version() {
 WitnessVersion::V0 => WPubkeyHash::from_slice(wp.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, utxo.amount, &wpkh))
 .ok(),
 let value = bitcoin::Amount::from_sat(utxo.amount);
 match utxo.address.witness_program() {
 Some(prog) if prog.is_p2wpkh() => {
 WPubkeyHash::from_slice(prog.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, value, &wpkh))
 .ok()
 },
 Some(prog) if prog.is_p2tr() => {
 // TODO: Add `Utxo::new_v1_p2tr` upstream.
WitnessVersion::V1 => XOnlyPublicKey::from_slice(wp.program().as_bytes())
 XOnlyPublicKey::from_slice(prog.program().as_bytes())
 .map(|_| Utxo {
 outpoint,
 output: TxOut {
 value: utxo.amount,
 script_pubkey: ScriptBuf::new_witness_program(&wp),
 value,
 script_pubkey: utxo.address.script_pubkey(),
 },
 satisfaction_weight: 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 +
 1 /* witness items */ + 1 /* schnorr sig len */ + 64, /* schnorr sig */
 })
 .ok(),
 _ => None,
 .ok()
 },
 _ => None,
 }
Expand All@@ -366,7 +403,7 @@ impl WalletSource for BitcoindClient {
 })
	}

	fn sign_psbt(&self, tx: PartiallySignedTransaction) -> Result<Transaction, ()> {
	fn sign_psbt(&self, tx: Psbt) -> Result<Transaction, ()> {
 let mut tx_bytes = Vec::new();
 let _ = tx.unsigned_tx.consensus_encode(&mut tx_bytes).map_err(|_| ());
 let tx_hex = hex_utils::hex_str(&tx_bytes);
Expand Down
Loading

, '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" + '
Upgrade to LDK 0.0.125 by TheBlueMatt · Pull Request #136 · lightningdevkit/ldk-sample · GitHub
Skip to content

This repository was archived by the owner on Aug 3, 2026. It is now read-only.

Upgrade to LDK 0.0.125#136
 Merged

tnull
merged 5 commits into

from

Oct 28, 2024
 Merged


Upgrade to LDK 0.0.125
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6d171e0

Drop `sendonionmessage` custom message sending command


TheBlueMatt Oct 14, 2024
d8ab0a6

Upgrade to LDK 0.0.125/rust-bitcoin 0.32


TheBlueMatt Oct 14, 2024
cfcd28b

Use `Balance`s to calculate balances instead of `ChannelDetails`


TheBlueMatt Oct 14, 2024
c52bf5b

Print network graph statistics in nodeinfo


TheBlueMatt Oct 14, 2024
7ca1088

Switch to `submitpackage` for broadcasting transactions


TheBlueMatt Oct 14, 2024

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


16 changes: 8 additions & 8 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,16 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
lightning = { version = "0.0.123", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.123", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.31.0" }
lightning-net-tokio = { version = "0.0.123" }
lightning-persister = { version = "0.0.123" }
lightning-background-processor = { version = "0.0.123", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.123" }
lightning = { version = "0.0.125", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.125", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.32.0" }
lightning-net-tokio = { version = "0.0.125" }
lightning-persister = { version = "0.0.125" }
lightning-background-processor = { version = "0.0.125", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.125" }

base64 = "0.13.0"
bitcoin = "0.30.2"
bitcoin = "0.32"
bitcoin-bech32 = "0.12"
bech32 = "0.8"
libc = "0.2"
Expand Down

2 changes: 1 addition & 1 deletion
src/args.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
use crate::cli::LdkUserInfo;
use bitcoin::network::constants::Network;
use bitcoin::network::Network;
use lightning::ln::msgs::SocketAddress;
use std::collections::HashMap;
use std::env;
Expand Down

117 changes: 77 additions & 40 deletions
src/bitcoind_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ use crate::convert::{
use crate::disk::FilesystemLogger;
use crate::hex_utils;
use base64;
use bitcoin::address::{Address, Payload, WitnessVersion};
use bitcoin::address::Address;
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::consensus::{encode, Decodable, Encodable};
use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::Hash;
use bitcoin::key::XOnlyPublicKey;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::psbt::Psbt;
use bitcoin::{Network, OutPoint, TxOut, WPubkeyHash};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::events::bump_transaction::{Utxo, WalletSource};
Expand DownExpand Up@@ -80,7 +80,8 @@ impl BitcoindClient {
 "Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
 })?;
 let mut fees: HashMap<ConfirmationTarget, AtomicU32> = HashMap::new();
 fees.insert(ConfirmationTarget::OnChainSweep, AtomicU32::new(5000));
 fees.insert(ConfirmationTarget::MaximumFeeEstimate, AtomicU32::new(50000));
 fees.insert(ConfirmationTarget::UrgentOnChainSweep, AtomicU32::new(5000));
 fees.insert(
 ConfirmationTarget::MinAllowedAnchorChannelRemoteFee,
 AtomicU32::new(MIN_FEERATE),
Expand All@@ -92,6 +93,7 @@ impl BitcoindClient {
 fees.insert(ConfirmationTarget::AnchorChannelFee, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::NonAnchorChannelFee, AtomicU32::new(2000));
 fees.insert(ConfirmationTarget::ChannelCloseMinimum, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::OutputSpendingFee, AtomicU32::new(MIN_FEERATE));

 let client = Self {
 bitcoind_rpc_client: Arc::new(bitcoind_rpc_client),
Expand DownExpand Up@@ -177,7 +179,27 @@ impl BitcoindClient {
 }
 };

 fees.get(&ConfirmationTarget::OnChainSweep)
 let very_high_prio_estimate = {
 let high_prio_conf_target = serde_json::json!(2);
 let high_prio_estimate_mode = serde_json::json!("CONSERVATIVE");
 let resp = rpc_client
 .call_method::<FeeResponse>(
 "estimatesmartfee",
 &vec![high_prio_conf_target, high_prio_estimate_mode],
 )
 .await
 .unwrap();

 match resp.feerate_sat_per_kw {
 Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
 None => 50000,
 }
 };

 fees.get(&ConfirmationTarget::MaximumFeeEstimate)
 .unwrap()
 .store(very_high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::UrgentOnChainSweep)
 .unwrap()
 .store(high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::MinAllowedAnchorChannelRemoteFee)
Expand All@@ -195,6 +217,9 @@ impl BitcoindClient {
 fees.get(&ConfirmationTarget::ChannelCloseMinimum)
 .unwrap()
 .store(background_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::OutputSpendingFee)
 .unwrap()
 .store(background_estimate, Ordering::Release);

 tokio::time::sleep(Duration::from_secs(60)).await;
 }
Expand DownExpand Up@@ -289,32 +314,42 @@ impl FeeEstimator for BitcoindClient {

impl BroadcasterInterface for BitcoindClient {
	fn broadcast_transactions(&self, txs: &[&Transaction]) {
 // TODO: Rather than calling `sendrawtransaction` in a a loop, we should probably use
 // `submitpackage` once it becomes available.
 for tx in txs {
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let tx_serialized = encode::serialize_hex(tx);
 let tx_json = serde_json::json!(tx_serialized);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match bitcoind_rpc_client
 .call_method::<Txid>("sendrawtransaction", &vec![tx_json])
 // As of Bitcoin Core 28, using `submitpackage` allows us to broadcast multiple
 // transactions at once and have them propagate through the network as a whole, avoiding
 // some pitfalls with anchor channels where the first transaction doesn't make it into the
 // mempool at all. Several older versions of Bitcoin Core also support `submitpackage`,
 // however, so we just use it unconditionally here.
 // Sadly, Bitcoin Core has an arbitrary restriction on `submitpackage` - it must actually
 // contain a package (see https://github.com/bitcoin/bitcoin/issues/31085).
 let txn = txs.iter().map(|tx| encode::serialize_hex(tx)).collect::<Vec<_>>();
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 let res = if txn.len() == 1 {
 let tx_json = serde_json::json!(txn[0]);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("sendrawtransaction", &[tx_json])
 .await
 {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransaction: {}",
 err_str,
 tx_serialized);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
 }
 } else {
 let tx_json = serde_json::json!(txn);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("submitpackage", &[tx_json])
 .await
 };
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match res {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransactions: {:?}",
 err_str,
 txn);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
	}
}

Expand All@@ -335,24 +370,26 @@ impl WalletSource for BitcoindClient {
 .into_iter()
 .filter_map(|utxo| {
 let outpoint = OutPoint { txid: utxo.txid, vout: utxo.vout };
 match utxo.address.payload.clone() {
 Payload::WitnessProgram(wp) => match wp.version() {
 WitnessVersion::V0 => WPubkeyHash::from_slice(wp.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, utxo.amount, &wpkh))
 .ok(),
 let value = bitcoin::Amount::from_sat(utxo.amount);
 match utxo.address.witness_program() {
 Some(prog) if prog.is_p2wpkh() => {
 WPubkeyHash::from_slice(prog.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, value, &wpkh))
 .ok()
 },
 Some(prog) if prog.is_p2tr() => {
 // TODO: Add `Utxo::new_v1_p2tr` upstream.
WitnessVersion::V1 => XOnlyPublicKey::from_slice(wp.program().as_bytes())
 XOnlyPublicKey::from_slice(prog.program().as_bytes())
 .map(|_| Utxo {
 outpoint,
 output: TxOut {
 value: utxo.amount,
 script_pubkey: ScriptBuf::new_witness_program(&wp),
 value,
 script_pubkey: utxo.address.script_pubkey(),
 },
 satisfaction_weight: 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 +
 1 /* witness items */ + 1 /* schnorr sig len */ + 64, /* schnorr sig */
 })
 .ok(),
 _ => None,
 .ok()
 },
 _ => None,
 }
Expand All@@ -366,7 +403,7 @@ impl WalletSource for BitcoindClient {
 })
	}

	fn sign_psbt(&self, tx: PartiallySignedTransaction) -> Result<Transaction, ()> {
	fn sign_psbt(&self, tx: Psbt) -> Result<Transaction, ()> {
 let mut tx_bytes = Vec::new();
 let _ = tx.unsigned_tx.consensus_encode(&mut tx_bytes).map_err(|_| ());
 let tx_hex = hex_utils::hex_str(&tx_bytes);
Expand Down
Loading

, '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('^' + ".*" + '
Upgrade to LDK 0.0.125 by TheBlueMatt · Pull Request #136 · lightningdevkit/ldk-sample · GitHub
Skip to content

This repository was archived by the owner on Aug 3, 2026. It is now read-only.

Upgrade to LDK 0.0.125#136
 Merged

tnull
merged 5 commits into

from

Oct 28, 2024
 Merged


Upgrade to LDK 0.0.125
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6d171e0

Drop `sendonionmessage` custom message sending command


TheBlueMatt Oct 14, 2024
d8ab0a6

Upgrade to LDK 0.0.125/rust-bitcoin 0.32


TheBlueMatt Oct 14, 2024
cfcd28b

Use `Balance`s to calculate balances instead of `ChannelDetails`


TheBlueMatt Oct 14, 2024
c52bf5b

Print network graph statistics in nodeinfo


TheBlueMatt Oct 14, 2024
7ca1088

Switch to `submitpackage` for broadcasting transactions


TheBlueMatt Oct 14, 2024

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


16 changes: 8 additions & 8 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,16 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
lightning = { version = "0.0.123", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.123", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.31.0" }
lightning-net-tokio = { version = "0.0.123" }
lightning-persister = { version = "0.0.123" }
lightning-background-processor = { version = "0.0.123", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.123" }
lightning = { version = "0.0.125", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.125", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.32.0" }
lightning-net-tokio = { version = "0.0.125" }
lightning-persister = { version = "0.0.125" }
lightning-background-processor = { version = "0.0.125", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.125" }

base64 = "0.13.0"
bitcoin = "0.30.2"
bitcoin = "0.32"
bitcoin-bech32 = "0.12"
bech32 = "0.8"
libc = "0.2"
Expand Down

2 changes: 1 addition & 1 deletion
src/args.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
use crate::cli::LdkUserInfo;
use bitcoin::network::constants::Network;
use bitcoin::network::Network;
use lightning::ln::msgs::SocketAddress;
use std::collections::HashMap;
use std::env;
Expand Down

117 changes: 77 additions & 40 deletions
src/bitcoind_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ use crate::convert::{
use crate::disk::FilesystemLogger;
use crate::hex_utils;
use base64;
use bitcoin::address::{Address, Payload, WitnessVersion};
use bitcoin::address::Address;
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::consensus::{encode, Decodable, Encodable};
use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::Hash;
use bitcoin::key::XOnlyPublicKey;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::psbt::Psbt;
use bitcoin::{Network, OutPoint, TxOut, WPubkeyHash};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::events::bump_transaction::{Utxo, WalletSource};
Expand DownExpand Up@@ -80,7 +80,8 @@ impl BitcoindClient {
 "Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
 })?;
 let mut fees: HashMap<ConfirmationTarget, AtomicU32> = HashMap::new();
 fees.insert(ConfirmationTarget::OnChainSweep, AtomicU32::new(5000));
 fees.insert(ConfirmationTarget::MaximumFeeEstimate, AtomicU32::new(50000));
 fees.insert(ConfirmationTarget::UrgentOnChainSweep, AtomicU32::new(5000));
 fees.insert(
 ConfirmationTarget::MinAllowedAnchorChannelRemoteFee,
 AtomicU32::new(MIN_FEERATE),
Expand All@@ -92,6 +93,7 @@ impl BitcoindClient {
 fees.insert(ConfirmationTarget::AnchorChannelFee, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::NonAnchorChannelFee, AtomicU32::new(2000));
 fees.insert(ConfirmationTarget::ChannelCloseMinimum, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::OutputSpendingFee, AtomicU32::new(MIN_FEERATE));

 let client = Self {
 bitcoind_rpc_client: Arc::new(bitcoind_rpc_client),
Expand DownExpand Up@@ -177,7 +179,27 @@ impl BitcoindClient {
 }
 };

 fees.get(&ConfirmationTarget::OnChainSweep)
 let very_high_prio_estimate = {
 let high_prio_conf_target = serde_json::json!(2);
 let high_prio_estimate_mode = serde_json::json!("CONSERVATIVE");
 let resp = rpc_client
 .call_method::<FeeResponse>(
 "estimatesmartfee",
 &vec![high_prio_conf_target, high_prio_estimate_mode],
 )
 .await
 .unwrap();

 match resp.feerate_sat_per_kw {
 Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
 None => 50000,
 }
 };

 fees.get(&ConfirmationTarget::MaximumFeeEstimate)
 .unwrap()
 .store(very_high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::UrgentOnChainSweep)
 .unwrap()
 .store(high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::MinAllowedAnchorChannelRemoteFee)
Expand All@@ -195,6 +217,9 @@ impl BitcoindClient {
 fees.get(&ConfirmationTarget::ChannelCloseMinimum)
 .unwrap()
 .store(background_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::OutputSpendingFee)
 .unwrap()
 .store(background_estimate, Ordering::Release);

 tokio::time::sleep(Duration::from_secs(60)).await;
 }
Expand DownExpand Up@@ -289,32 +314,42 @@ impl FeeEstimator for BitcoindClient {

impl BroadcasterInterface for BitcoindClient {
	fn broadcast_transactions(&self, txs: &[&Transaction]) {
 // TODO: Rather than calling `sendrawtransaction` in a a loop, we should probably use
 // `submitpackage` once it becomes available.
 for tx in txs {
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let tx_serialized = encode::serialize_hex(tx);
 let tx_json = serde_json::json!(tx_serialized);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match bitcoind_rpc_client
 .call_method::<Txid>("sendrawtransaction", &vec![tx_json])
 // As of Bitcoin Core 28, using `submitpackage` allows us to broadcast multiple
 // transactions at once and have them propagate through the network as a whole, avoiding
 // some pitfalls with anchor channels where the first transaction doesn't make it into the
 // mempool at all. Several older versions of Bitcoin Core also support `submitpackage`,
 // however, so we just use it unconditionally here.
 // Sadly, Bitcoin Core has an arbitrary restriction on `submitpackage` - it must actually
 // contain a package (see https://github.com/bitcoin/bitcoin/issues/31085).
 let txn = txs.iter().map(|tx| encode::serialize_hex(tx)).collect::<Vec<_>>();
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 let res = if txn.len() == 1 {
 let tx_json = serde_json::json!(txn[0]);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("sendrawtransaction", &[tx_json])
 .await
 {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransaction: {}",
 err_str,
 tx_serialized);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
 }
 } else {
 let tx_json = serde_json::json!(txn);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("submitpackage", &[tx_json])
 .await
 };
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match res {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransactions: {:?}",
 err_str,
 txn);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
	}
}

Expand All@@ -335,24 +370,26 @@ impl WalletSource for BitcoindClient {
 .into_iter()
 .filter_map(|utxo| {
 let outpoint = OutPoint { txid: utxo.txid, vout: utxo.vout };
 match utxo.address.payload.clone() {
 Payload::WitnessProgram(wp) => match wp.version() {
 WitnessVersion::V0 => WPubkeyHash::from_slice(wp.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, utxo.amount, &wpkh))
 .ok(),
 let value = bitcoin::Amount::from_sat(utxo.amount);
 match utxo.address.witness_program() {
 Some(prog) if prog.is_p2wpkh() => {
 WPubkeyHash::from_slice(prog.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, value, &wpkh))
 .ok()
 },
 Some(prog) if prog.is_p2tr() => {
 // TODO: Add `Utxo::new_v1_p2tr` upstream.
WitnessVersion::V1 => XOnlyPublicKey::from_slice(wp.program().as_bytes())
 XOnlyPublicKey::from_slice(prog.program().as_bytes())
 .map(|_| Utxo {
 outpoint,
 output: TxOut {
 value: utxo.amount,
 script_pubkey: ScriptBuf::new_witness_program(&wp),
 value,
 script_pubkey: utxo.address.script_pubkey(),
 },
 satisfaction_weight: 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 +
 1 /* witness items */ + 1 /* schnorr sig len */ + 64, /* schnorr sig */
 })
 .ok(),
 _ => None,
 .ok()
 },
 _ => None,
 }
Expand All@@ -366,7 +403,7 @@ impl WalletSource for BitcoindClient {
 })
	}

	fn sign_psbt(&self, tx: PartiallySignedTransaction) -> Result<Transaction, ()> {
	fn sign_psbt(&self, tx: Psbt) -> Result<Transaction, ()> {
 let mut tx_bytes = Vec::new();
 let _ = tx.unsigned_tx.consensus_encode(&mut tx_bytes).map_err(|_| ());
 let tx_hex = hex_utils::hex_str(&tx_bytes);
Expand Down
Loading

, '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('^' + ".*" + '
Upgrade to LDK 0.0.125 by TheBlueMatt · Pull Request #136 · lightningdevkit/ldk-sample · GitHub
Skip to content

This repository was archived by the owner on Aug 3, 2026. It is now read-only.

Upgrade to LDK 0.0.125#136
 Merged

tnull
merged 5 commits into

from

Oct 28, 2024
 Merged


Upgrade to LDK 0.0.125
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6d171e0

Drop `sendonionmessage` custom message sending command


TheBlueMatt Oct 14, 2024
d8ab0a6

Upgrade to LDK 0.0.125/rust-bitcoin 0.32


TheBlueMatt Oct 14, 2024
cfcd28b

Use `Balance`s to calculate balances instead of `ChannelDetails`


TheBlueMatt Oct 14, 2024
c52bf5b

Print network graph statistics in nodeinfo


TheBlueMatt Oct 14, 2024
7ca1088

Switch to `submitpackage` for broadcasting transactions


TheBlueMatt Oct 14, 2024

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


16 changes: 8 additions & 8 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,16 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
lightning = { version = "0.0.123", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.123", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.31.0" }
lightning-net-tokio = { version = "0.0.123" }
lightning-persister = { version = "0.0.123" }
lightning-background-processor = { version = "0.0.123", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.123" }
lightning = { version = "0.0.125", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.125", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.32.0" }
lightning-net-tokio = { version = "0.0.125" }
lightning-persister = { version = "0.0.125" }
lightning-background-processor = { version = "0.0.125", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.125" }

base64 = "0.13.0"
bitcoin = "0.30.2"
bitcoin = "0.32"
bitcoin-bech32 = "0.12"
bech32 = "0.8"
libc = "0.2"
Expand Down

2 changes: 1 addition & 1 deletion
src/args.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
use crate::cli::LdkUserInfo;
use bitcoin::network::constants::Network;
use bitcoin::network::Network;
use lightning::ln::msgs::SocketAddress;
use std::collections::HashMap;
use std::env;
Expand Down

117 changes: 77 additions & 40 deletions
src/bitcoind_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ use crate::convert::{
use crate::disk::FilesystemLogger;
use crate::hex_utils;
use base64;
use bitcoin::address::{Address, Payload, WitnessVersion};
use bitcoin::address::Address;
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::consensus::{encode, Decodable, Encodable};
use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::Hash;
use bitcoin::key::XOnlyPublicKey;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::psbt::Psbt;
use bitcoin::{Network, OutPoint, TxOut, WPubkeyHash};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::events::bump_transaction::{Utxo, WalletSource};
Expand DownExpand Up@@ -80,7 +80,8 @@ impl BitcoindClient {
 "Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
 })?;
 let mut fees: HashMap<ConfirmationTarget, AtomicU32> = HashMap::new();
 fees.insert(ConfirmationTarget::OnChainSweep, AtomicU32::new(5000));
 fees.insert(ConfirmationTarget::MaximumFeeEstimate, AtomicU32::new(50000));
 fees.insert(ConfirmationTarget::UrgentOnChainSweep, AtomicU32::new(5000));
 fees.insert(
 ConfirmationTarget::MinAllowedAnchorChannelRemoteFee,
 AtomicU32::new(MIN_FEERATE),
Expand All@@ -92,6 +93,7 @@ impl BitcoindClient {
 fees.insert(ConfirmationTarget::AnchorChannelFee, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::NonAnchorChannelFee, AtomicU32::new(2000));
 fees.insert(ConfirmationTarget::ChannelCloseMinimum, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::OutputSpendingFee, AtomicU32::new(MIN_FEERATE));

 let client = Self {
 bitcoind_rpc_client: Arc::new(bitcoind_rpc_client),
Expand DownExpand Up@@ -177,7 +179,27 @@ impl BitcoindClient {
 }
 };

 fees.get(&ConfirmationTarget::OnChainSweep)
 let very_high_prio_estimate = {
 let high_prio_conf_target = serde_json::json!(2);
 let high_prio_estimate_mode = serde_json::json!("CONSERVATIVE");
 let resp = rpc_client
 .call_method::<FeeResponse>(
 "estimatesmartfee",
 &vec![high_prio_conf_target, high_prio_estimate_mode],
 )
 .await
 .unwrap();

 match resp.feerate_sat_per_kw {
 Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
 None => 50000,
 }
 };

 fees.get(&ConfirmationTarget::MaximumFeeEstimate)
 .unwrap()
 .store(very_high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::UrgentOnChainSweep)
 .unwrap()
 .store(high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::MinAllowedAnchorChannelRemoteFee)
Expand All@@ -195,6 +217,9 @@ impl BitcoindClient {
 fees.get(&ConfirmationTarget::ChannelCloseMinimum)
 .unwrap()
 .store(background_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::OutputSpendingFee)
 .unwrap()
 .store(background_estimate, Ordering::Release);

 tokio::time::sleep(Duration::from_secs(60)).await;
 }
Expand DownExpand Up@@ -289,32 +314,42 @@ impl FeeEstimator for BitcoindClient {

impl BroadcasterInterface for BitcoindClient {
	fn broadcast_transactions(&self, txs: &[&Transaction]) {
 // TODO: Rather than calling `sendrawtransaction` in a a loop, we should probably use
 // `submitpackage` once it becomes available.
 for tx in txs {
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let tx_serialized = encode::serialize_hex(tx);
 let tx_json = serde_json::json!(tx_serialized);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match bitcoind_rpc_client
 .call_method::<Txid>("sendrawtransaction", &vec![tx_json])
 // As of Bitcoin Core 28, using `submitpackage` allows us to broadcast multiple
 // transactions at once and have them propagate through the network as a whole, avoiding
 // some pitfalls with anchor channels where the first transaction doesn't make it into the
 // mempool at all. Several older versions of Bitcoin Core also support `submitpackage`,
 // however, so we just use it unconditionally here.
 // Sadly, Bitcoin Core has an arbitrary restriction on `submitpackage` - it must actually
 // contain a package (see https://github.com/bitcoin/bitcoin/issues/31085).
 let txn = txs.iter().map(|tx| encode::serialize_hex(tx)).collect::<Vec<_>>();
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 let res = if txn.len() == 1 {
 let tx_json = serde_json::json!(txn[0]);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("sendrawtransaction", &[tx_json])
 .await
 {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransaction: {}",
 err_str,
 tx_serialized);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
 }
 } else {
 let tx_json = serde_json::json!(txn);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("submitpackage", &[tx_json])
 .await
 };
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match res {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransactions: {:?}",
 err_str,
 txn);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
	}
}

Expand All@@ -335,24 +370,26 @@ impl WalletSource for BitcoindClient {
 .into_iter()
 .filter_map(|utxo| {
 let outpoint = OutPoint { txid: utxo.txid, vout: utxo.vout };
 match utxo.address.payload.clone() {
 Payload::WitnessProgram(wp) => match wp.version() {
 WitnessVersion::V0 => WPubkeyHash::from_slice(wp.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, utxo.amount, &wpkh))
 .ok(),
 let value = bitcoin::Amount::from_sat(utxo.amount);
 match utxo.address.witness_program() {
 Some(prog) if prog.is_p2wpkh() => {
 WPubkeyHash::from_slice(prog.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, value, &wpkh))
 .ok()
 },
 Some(prog) if prog.is_p2tr() => {
 // TODO: Add `Utxo::new_v1_p2tr` upstream.
WitnessVersion::V1 => XOnlyPublicKey::from_slice(wp.program().as_bytes())
 XOnlyPublicKey::from_slice(prog.program().as_bytes())
 .map(|_| Utxo {
 outpoint,
 output: TxOut {
 value: utxo.amount,
 script_pubkey: ScriptBuf::new_witness_program(&wp),
 value,
 script_pubkey: utxo.address.script_pubkey(),
 },
 satisfaction_weight: 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 +
 1 /* witness items */ + 1 /* schnorr sig len */ + 64, /* schnorr sig */
 })
 .ok(),
 _ => None,
 .ok()
 },
 _ => None,
 }
Expand All@@ -366,7 +403,7 @@ impl WalletSource for BitcoindClient {
 })
	}

	fn sign_psbt(&self, tx: PartiallySignedTransaction) -> Result<Transaction, ()> {
	fn sign_psbt(&self, tx: Psbt) -> Result<Transaction, ()> {
 let mut tx_bytes = Vec::new();
 let _ = tx.unsigned_tx.consensus_encode(&mut tx_bytes).map_err(|_| ());
 let tx_hex = hex_utils::hex_str(&tx_bytes);
Expand Down
Loading

, '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); }
})();
})();
Upgrade to LDK 0.0.125 by TheBlueMatt · Pull Request #136 · lightningdevkit/ldk-sample · GitHub
Skip to content

This repository was archived by the owner on Aug 3, 2026. It is now read-only.

Upgrade to LDK 0.0.125#136
 Merged

tnull
merged 5 commits into

from

Oct 28, 2024
 Merged


Upgrade to LDK 0.0.125
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
6d171e0

Drop `sendonionmessage` custom message sending command


TheBlueMatt Oct 14, 2024
d8ab0a6

Upgrade to LDK 0.0.125/rust-bitcoin 0.32


TheBlueMatt Oct 14, 2024
cfcd28b

Use `Balance`s to calculate balances instead of `ChannelDetails`


TheBlueMatt Oct 14, 2024
c52bf5b

Print network graph statistics in nodeinfo


TheBlueMatt Oct 14, 2024
7ca1088

Switch to `submitpackage` for broadcasting transactions


TheBlueMatt Oct 14, 2024

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


16 changes: 8 additions & 8 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,16 +8,16 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
lightning = { version = "0.0.123", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.123", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.31.0" }
lightning-net-tokio = { version = "0.0.123" }
lightning-persister = { version = "0.0.123" }
lightning-background-processor = { version = "0.0.123", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.123" }
lightning = { version = "0.0.125", features = ["max_level_trace"] }
lightning-block-sync = { version = "0.0.125", features = [ "rpc-client", "tokio" ] }
lightning-invoice = { version = "0.32.0" }
lightning-net-tokio = { version = "0.0.125" }
lightning-persister = { version = "0.0.125" }
lightning-background-processor = { version = "0.0.125", features = [ "futures" ] }
lightning-rapid-gossip-sync = { version = "0.0.125" }

base64 = "0.13.0"
bitcoin = "0.30.2"
bitcoin = "0.32"
bitcoin-bech32 = "0.12"
bech32 = "0.8"
libc = "0.2"
Expand Down

2 changes: 1 addition & 1 deletion
src/args.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
use crate::cli::LdkUserInfo;
use bitcoin::network::constants::Network;
use bitcoin::network::Network;
use lightning::ln::msgs::SocketAddress;
use std::collections::HashMap;
use std::env;
Expand Down

117 changes: 77 additions & 40 deletions
src/bitcoind_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ use crate::convert::{
use crate::disk::FilesystemLogger;
use crate::hex_utils;
use base64;
use bitcoin::address::{Address, Payload, WitnessVersion};
use bitcoin::address::Address;
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
use bitcoin::blockdata::script::ScriptBuf;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::consensus::{encode, Decodable, Encodable};
use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::Hash;
use bitcoin::key::XOnlyPublicKey;
use bitcoin::psbt::PartiallySignedTransaction;
use bitcoin::psbt::Psbt;
use bitcoin::{Network, OutPoint, TxOut, WPubkeyHash};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::events::bump_transaction::{Utxo, WalletSource};
Expand DownExpand Up@@ -80,7 +80,8 @@ impl BitcoindClient {
 "Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
 })?;
 let mut fees: HashMap<ConfirmationTarget, AtomicU32> = HashMap::new();
 fees.insert(ConfirmationTarget::OnChainSweep, AtomicU32::new(5000));
 fees.insert(ConfirmationTarget::MaximumFeeEstimate, AtomicU32::new(50000));
 fees.insert(ConfirmationTarget::UrgentOnChainSweep, AtomicU32::new(5000));
 fees.insert(
 ConfirmationTarget::MinAllowedAnchorChannelRemoteFee,
 AtomicU32::new(MIN_FEERATE),
Expand All@@ -92,6 +93,7 @@ impl BitcoindClient {
 fees.insert(ConfirmationTarget::AnchorChannelFee, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::NonAnchorChannelFee, AtomicU32::new(2000));
 fees.insert(ConfirmationTarget::ChannelCloseMinimum, AtomicU32::new(MIN_FEERATE));
 fees.insert(ConfirmationTarget::OutputSpendingFee, AtomicU32::new(MIN_FEERATE));

 let client = Self {
 bitcoind_rpc_client: Arc::new(bitcoind_rpc_client),
Expand DownExpand Up@@ -177,7 +179,27 @@ impl BitcoindClient {
 }
 };

 fees.get(&ConfirmationTarget::OnChainSweep)
 let very_high_prio_estimate = {
 let high_prio_conf_target = serde_json::json!(2);
 let high_prio_estimate_mode = serde_json::json!("CONSERVATIVE");
 let resp = rpc_client
 .call_method::<FeeResponse>(
 "estimatesmartfee",
 &vec![high_prio_conf_target, high_prio_estimate_mode],
 )
 .await
 .unwrap();

 match resp.feerate_sat_per_kw {
 Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
 None => 50000,
 }
 };

 fees.get(&ConfirmationTarget::MaximumFeeEstimate)
 .unwrap()
 .store(very_high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::UrgentOnChainSweep)
 .unwrap()
 .store(high_prio_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::MinAllowedAnchorChannelRemoteFee)
Expand All@@ -195,6 +217,9 @@ impl BitcoindClient {
 fees.get(&ConfirmationTarget::ChannelCloseMinimum)
 .unwrap()
 .store(background_estimate, Ordering::Release);
 fees.get(&ConfirmationTarget::OutputSpendingFee)
 .unwrap()
 .store(background_estimate, Ordering::Release);

 tokio::time::sleep(Duration::from_secs(60)).await;
 }
Expand DownExpand Up@@ -289,32 +314,42 @@ impl FeeEstimator for BitcoindClient {

impl BroadcasterInterface for BitcoindClient {
	fn broadcast_transactions(&self, txs: &[&Transaction]) {
 // TODO: Rather than calling `sendrawtransaction` in a a loop, we should probably use
 // `submitpackage` once it becomes available.
 for tx in txs {
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let tx_serialized = encode::serialize_hex(tx);
 let tx_json = serde_json::json!(tx_serialized);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match bitcoind_rpc_client
 .call_method::<Txid>("sendrawtransaction", &vec![tx_json])
 // As of Bitcoin Core 28, using `submitpackage` allows us to broadcast multiple
 // transactions at once and have them propagate through the network as a whole, avoiding
 // some pitfalls with anchor channels where the first transaction doesn't make it into the
 // mempool at all. Several older versions of Bitcoin Core also support `submitpackage`,
 // however, so we just use it unconditionally here.
 // Sadly, Bitcoin Core has an arbitrary restriction on `submitpackage` - it must actually
 // contain a package (see https://github.com/bitcoin/bitcoin/issues/31085).
 let txn = txs.iter().map(|tx| encode::serialize_hex(tx)).collect::<Vec<_>>();
 let bitcoind_rpc_client = Arc::clone(&self.bitcoind_rpc_client);
 let logger = Arc::clone(&self.logger);
 self.handle.spawn(async move {
 let res = if txn.len() == 1 {
 let tx_json = serde_json::json!(txn[0]);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("sendrawtransaction", &[tx_json])
 .await
 {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransaction: {}",
 err_str,
 tx_serialized);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
 }
 } else {
 let tx_json = serde_json::json!(txn);
 bitcoind_rpc_client
 .call_method::<serde_json::Value>("submitpackage", &[tx_json])
 .await
 };
 // This may error due to RL calling `broadcast_transactions` with the same transaction
 // multiple times, but the error is safe to ignore.
 match res {
 Ok(_) => {}
 Err(e) => {
 let err_str = e.get_ref().unwrap().to_string();
 log_error!(logger,
 "Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\nTransactions: {:?}",
 err_str,
 txn);
 print!("Warning, failed to broadcast a transaction, this is likely okay but may indicate an error: {}\n> ", err_str);
 }
 }
 });
	}
}

Expand All@@ -335,24 +370,26 @@ impl WalletSource for BitcoindClient {
 .into_iter()
 .filter_map(|utxo| {
 let outpoint = OutPoint { txid: utxo.txid, vout: utxo.vout };
 match utxo.address.payload.clone() {
 Payload::WitnessProgram(wp) => match wp.version() {
 WitnessVersion::V0 => WPubkeyHash::from_slice(wp.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, utxo.amount, &wpkh))
 .ok(),
 let value = bitcoin::Amount::from_sat(utxo.amount);
 match utxo.address.witness_program() {
 Some(prog) if prog.is_p2wpkh() => {
 WPubkeyHash::from_slice(prog.program().as_bytes())
 .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, value, &wpkh))
 .ok()
 },
 Some(prog) if prog.is_p2tr() => {
 // TODO: Add `Utxo::new_v1_p2tr` upstream.
WitnessVersion::V1 => XOnlyPublicKey::from_slice(wp.program().as_bytes())
 XOnlyPublicKey::from_slice(prog.program().as_bytes())
 .map(|_| Utxo {
 outpoint,
 output: TxOut {
 value: utxo.amount,
 script_pubkey: ScriptBuf::new_witness_program(&wp),
 value,
 script_pubkey: utxo.address.script_pubkey(),
 },
 satisfaction_weight: 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 +
 1 /* witness items */ + 1 /* schnorr sig len */ + 64, /* schnorr sig */
 })
 .ok(),
 _ => None,
 .ok()
 },
 _ => None,
 }
Expand All@@ -366,7 +403,7 @@ impl WalletSource for BitcoindClient {
 })
	}

	fn sign_psbt(&self, tx: PartiallySignedTransaction) -> Result<Transaction, ()> {
	fn sign_psbt(&self, tx: Psbt) -> Result<Transaction, ()> {
 let mut tx_bytes = Vec::new();
 let _ = tx.unsigned_tx.consensus_encode(&mut tx_bytes).map_err(|_| ());
 let tx_hex = hex_utils::hex_str(&tx_bytes);
Expand Down
Loading