Skip to content

Update full_stack_target to take an arbitrary config object#2810

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 9 commits into from
Feb 5, 2024
Merged

Update full_stack_target to take an arbitrary config object #2810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c725842
Disable fuzzing-reachable debug assertion
TheBlueMatt Dec 24, 2023
248e2f5
Disable fuzzing-reachable debug assertions in `ChannelMonitor`s
TheBlueMatt Dec 25, 2023
f62a96e
Use arbitrary config object in full_stack_target fuzzer
TheBlueMatt Dec 23, 2023
76ed917
Update fuzz CI job to use our MSRV rather than 1.58
TheBlueMatt Jan 18, 2024
3e0d55b
Use utility methods to construct `HashMap`s and `HashSet`s
TheBlueMatt Jan 1, 2024
efbaa41
Stop relying on `Hash{Set,Map}::from_iter` directly
TheBlueMatt Jan 18, 2024
dedc830
Bump `hashbrown` dependency to 0.13
TheBlueMatt Jan 18, 2024
c9e4410
Fix test variable typos
TheBlueMatt Jan 11, 2024
7377cc9
[fuzz] Fix slice copy in `peer_crypt_target`
TheBlueMatt Jan 31, 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
8 changes: 6 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ jobs:
run: |
cd lightning
RUSTFLAGS="--cfg=require_route_graph_test" cargo test
RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown
RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown,ahash
cd ..
- name: Run benchmarks on Rust ${{ matrix.toolchain }}
run: |
Expand DownExpand Up@@ -176,7 +176,7 @@ jobs:
fuzz:
runs-on: ubuntu-latest
env:
TOOLCHAIN: 1.58
TOOLCHAIN: 1.63
steps:
- name: Checkout source code
uses: actions/checkout@v3
Expand All@@ -188,6 +188,10 @@ jobs:
run: |
sudo apt-get update
sudo apt-get -y install build-essential binutils-dev libunwind-dev
- name: Pin the regex dependency
run: |
cd fuzz && cargo update -p regex --precise "1.9.6" --verbose && cd ..
cd lightning-invoice/fuzz && cargo update -p regex --precise "1.9.6" --verbose
- name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
run: cd fuzz && RUSTFLAGS="--cfg=fuzzing" cargo test --verbose --color always
- name: Run fuzzers
Expand Down
2 changes: 1 addition & 1 deletion bench/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ name = "bench"
harness = false

[features]
hashbrown = ["lightning/hashbrown"]
hashbrown = ["lightning/hashbrown", "lightning/ahash"]

[dependencies]
lightning = { path = "../lightning", features = ["_test_utils", "criterion"] }
Expand Down
2 changes: 2 additions & 0 deletions ci/check-cfg-flags.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ def check_feature(feature):
pass
elif feature == "no-std":
pass
elif feature == "ahash":
pass
elif feature == "hashbrown":
pass
elif feature == "backtrace":
Expand Down
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_ut
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.30.2", features = ["secp-lowmemory"] }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
hashbrown = "0.8"
hashbrown = "0.13"

afl = { version = "0.12", optional = true }
honggfuzz = { version = "0.5", optional = true, default-features = false }
Expand Down
47 changes: 17 additions & 30 deletions fuzz/src/full_stack.rs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fuzz/src/peer_crypt.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ pub fn do_test(data: &[u8]) {
Ok(len) => len,
Err(_) => return,
};
buf.copy_from_slice(&get_slice!(len as usize + 16));
buf[..len as usize + 16].copy_from_slice(&get_slice!(len as usize + 16));

@arik-soarik-soFeb 5, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

+ 16 might benefit from a comment?

@TheBlueMattTheBlueMattFeb 5, 2024

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Meh, its a fuzzer, it'll complain if its wrong :)

match crypter.decrypt_message(&mut buf[..len as usize + 16]) {
Ok(_) => {},
Err(_) => return,
Expand Down
2 changes: 1 addition & 1 deletion lightning-invoice/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ bech32 = { version = "0.9.0", default-features = false }
lightning = { version = "0.0.121", path = "../lightning", default-features = false }
secp256k1 = { version = "0.27.0", default-features = false, features = ["recovery", "alloc"] }
num-traits = { version = "0.2.8", default-features = false }
hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.30.2", default-features = false }

Expand Down
15 changes: 13 additions & 2 deletions lightning/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ unsafe_revoked_tx_signing = []
# Override signing to not include randomness when generating signatures for test vectors.
_test_vectors = []

no-std = ["hashbrown", "bitcoin/no-std", "core2/alloc", "libm"]
no-std = ["hashbrown", "ahash", "bitcoin/no-std", "core2/alloc", "libm"]
std = ["bitcoin/std"]

# Generates low-r bitcoin signatures, which saves 1 byte in 50% of the cases
Expand All@@ -42,14 +42,25 @@ default = ["std", "grind_signatures"]
[dependencies]
bitcoin = { version = "0.30.2", default-features = false, features = ["secp-recovery"] }

hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
ahash = { version = "0.8", optional = true, default-features = false }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
regex = { version = "1.5.6", optional = true }
backtrace = { version = "0.3", optional = true }

core2 = { version = "0.3.0", optional = true, default-features = false }
libm = { version = "0.2", optional = true, default-features = false }

# Because ahash no longer (kinda poorly) does it for us, (roughly) list out the targets that
# getrandom supports and turn on ahash's `runtime-rng` feature for them.
[target.'cfg(not(any(target_os = "unknown", target_os = "none")))'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

# Not sure what target_os gets set to for sgx, so to be safe always enable runtime-rng for x86_64
# platforms (assuming LDK isn't being used on embedded x86-64 running directly on metal).
[target.'cfg(target_arch = "x86_64")'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

[dev-dependencies]
regex = "1.5.6"

Expand Down
9 changes: 4 additions & 5 deletions lightning/src/chain/chainmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ use crate::ln::channelmanager::ChannelDetails;

use crate::prelude::*;
use crate::sync::{RwLock, RwLockReadGuard, Mutex, MutexGuard};
use core::iter::FromIterator;
use core::ops::Deref;
use core::sync::atomic::{AtomicUsize, Ordering};
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -318,7 +317,7 @@ where C::Target: chain::Filter,
FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs>
{
let err_str = "ChannelMonitor[Update] persistence failed unrecoverably. This indicates we cannot continue normal operation and must shut down.";
let funding_outpoints: HashSet<OutPoint> = HashSet::from_iter(self.monitors.read().unwrap().keys().cloned());
let funding_outpoints = hash_set_from_iter(self.monitors.read().unwrap().keys().cloned());
for funding_outpoint in funding_outpoints.iter() {
let monitor_lock = self.monitors.read().unwrap();
if let Some(monitor_state) = monitor_lock.get(funding_outpoint) {
Expand DownExpand Up@@ -420,7 +419,7 @@ where C::Target: chain::Filter,
/// transactions relevant to the watched channels.
pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
Self {
monitors: RwLock::new(HashMap::new()),
monitors: RwLock::new(new_hash_map()),
sync_persistence_id: AtomicCounter::new(),
chain_source,
broadcaster,
Expand DownExpand Up@@ -486,9 +485,9 @@ where C::Target: chain::Filter,
#[cfg(not(c_bindings))]
/// Lists the pending updates for each [`ChannelMonitor`] (by `OutPoint` being monitored).
pub fn list_pending_monitor_updates(&self) -> HashMap<OutPoint, Vec<MonitorUpdateId>> {
self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
hash_map_from_iter(self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
(*outpoint, holder.pending_monitor_updates.lock().unwrap().clone())
}).collect()
}))
}

#[cfg(c_bindings)]
Expand Down
37 changes: 21 additions & 16 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1235,7 +1235,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
channel_parameters.clone(), initial_holder_commitment_tx, secp_ctx
);

let mut outputs_to_watch = HashMap::new();
let mut outputs_to_watch = new_hash_map();
outputs_to_watch.insert(funding_info.0.txid, vec![(funding_info.0.index as u32, funding_info.1.clone())]);

Self::from_impl(ChannelMonitorImpl {
Expand All@@ -1262,17 +1262,17 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
on_holder_tx_csv: counterparty_channel_parameters.selected_contest_delay,

commitment_secrets: CounterpartyCommitmentSecrets::new(),
counterparty_claimable_outpoints: HashMap::new(),
counterparty_commitment_txn_on_chain: HashMap::new(),
counterparty_hash_commitment_number: HashMap::new(),
counterparty_fulfilled_htlcs: HashMap::new(),
counterparty_claimable_outpoints: new_hash_map(),
counterparty_commitment_txn_on_chain: new_hash_map(),
counterparty_hash_commitment_number: new_hash_map(),
counterparty_fulfilled_htlcs: new_hash_map(),

prev_holder_signed_commitment_tx: None,
current_holder_commitment_tx: holder_commitment_tx,
current_counterparty_commitment_number: 1 << 48,
current_holder_commitment_number,

payment_preimages: HashMap::new(),
payment_preimages: new_hash_map(),
pending_monitor_events: Vec::new(),
pending_events: Vec::new(),
is_processing_pending_events: false,
Expand DownExpand Up@@ -2174,7 +2174,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
/// HTLCs which were resolved on-chain (i.e. where the final HTLC resolution was done by an
/// event from this `ChannelMonitor`).
pub(crate) fn get_all_current_outbound_htlcs(&self) -> HashMap<HTLCSource, (HTLCOutputInCommitment, Option<PaymentPreimage>)> {
let mut res = HashMap::new();
let mut res = new_hash_map();
// Just examine the available counterparty commitment transactions. See docs on
// `fail_unbroadcast_htlcs`, below, for justification.
let us = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2226,7 +2226,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
return self.get_all_current_outbound_htlcs();
}

let mut res = HashMap::new();
let mut res = new_hash_map();
macro_rules! walk_htlcs {
($holder_commitment: expr, $htlc_iter: expr) => {
for (htlc, source) in $htlc_iter {
Expand DownExpand Up@@ -3172,7 +3172,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
(htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
), logger);
} else {
debug_assert!(false, "We should have per-commitment option for any recognized old commitment txn");
// Our fuzzers aren't contrained by pesky things like valid signatures, so can

@arik-soarik-soFeb 5, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: constrained

// spend our funding output with a transaction which doesn't match our past
// commitment transactions. Thus, we can only debug-assert here when not
// fuzzing.
debug_assert!(cfg!(fuzzing), "We should have per-commitment option for any recognized old commitment txn");
fail_unbroadcast_htlcs!(self, "revoked counterparty", commitment_txid, tx, height,
block_hash, [].iter().map(|reference| *reference), logger);
}
Expand DownExpand Up@@ -3679,6 +3683,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
claimable_outpoints.append(&mut new_outpoints);
if new_outpoints.is_empty() {
if let Some((mut new_outpoints, new_outputs)) = self.check_spend_holder_transaction(&tx, height, &block_hash, &logger) {
#[cfg(not(fuzzing))]
debug_assert!(commitment_tx_to_counterparty_output.is_none(),
"A commitment transaction matched as both a counterparty and local commitment tx?");
if !new_outputs.1.is_empty() {
Expand DownExpand Up@@ -3935,7 +3940,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
/// Filters a block's `txdata` for transactions spending watched outputs or for any child
/// transactions thereof.
fn filter_block<'a>(&self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
let mut matched_txn = HashSet::new();
let mut matched_txn = new_hash_set();
txdata.iter().filter(|&&(_, tx)| {
let mut matches = self.spends_watched_output(tx);
for input in tx.input.iter() {
Expand DownExpand Up@@ -4450,7 +4455,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
}

let counterparty_claimable_outpoints_len: u64 = Readable::read(reader)?;
let mut counterparty_claimable_outpoints = HashMap::with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
let mut counterparty_claimable_outpoints = hash_map_with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
for _ in 0..counterparty_claimable_outpoints_len {
let txid: Txid = Readable::read(reader)?;
let htlcs_count: u64 = Readable::read(reader)?;
Expand All@@ -4464,7 +4469,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
}

let counterparty_commitment_txn_on_chain_len: u64 = Readable::read(reader)?;
let mut counterparty_commitment_txn_on_chain = HashMap::with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
let mut counterparty_commitment_txn_on_chain = hash_map_with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
for _ in 0..counterparty_commitment_txn_on_chain_len {
let txid: Txid = Readable::read(reader)?;
let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4474,7 +4479,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
}

let counterparty_hash_commitment_number_len: u64 = Readable::read(reader)?;
let mut counterparty_hash_commitment_number = HashMap::with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
let mut counterparty_hash_commitment_number = hash_map_with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
for _ in 0..counterparty_hash_commitment_number_len {
let payment_hash: PaymentHash = Readable::read(reader)?;
let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4497,7 +4502,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
let current_holder_commitment_number = <U48 as Readable>::read(reader)?.0;

let payment_preimages_len: u64 = Readable::read(reader)?;
let mut payment_preimages = HashMap::with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
let mut payment_preimages = hash_map_with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
for _ in 0..payment_preimages_len {
let preimage: PaymentPreimage = Readable::read(reader)?;
let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
Expand DownExpand Up@@ -4537,7 +4542,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
}

let outputs_to_watch_len: u64 = Readable::read(reader)?;
let mut outputs_to_watch = HashMap::with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
let mut outputs_to_watch = hash_map_with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
for _ in 0..outputs_to_watch_len {
let txid = Readable::read(reader)?;
let outputs_len: u64 = Readable::read(reader)?;
Expand DownExpand Up@@ -4579,7 +4584,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
let mut counterparty_node_id = None;
let mut confirmed_commitment_tx_counterparty_output = None;
let mut spendable_txids_confirmed = Some(Vec::new());
let mut counterparty_fulfilled_htlcs = Some(HashMap::new());
let mut counterparty_fulfilled_htlcs = Some(new_hash_map());
let mut initial_counterparty_commitment_info = None;
let mut channel_id = None;
read_tlv_fields!(reader, {
Expand Down
18 changes: 10 additions & 8 deletions lightning/src/chain/onchaintx.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -374,13 +374,13 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
signer.provide_channel_parameters(&channel_parameters);

let pending_claim_requests_len: u64 = Readable::read(reader)?;
let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
for _ in 0..pending_claim_requests_len {
pending_claim_requests.insert(Readable::read(reader)?, Readable::read(reader)?);
}

let claimable_outpoints_len: u64 = Readable::read(reader)?;
let mut claimable_outpoints = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
let mut claimable_outpoints = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
for _ in 0..claimable_outpoints_len {
let outpoint = Readable::read(reader)?;
let ancestor_claim_txid = Readable::read(reader)?;
Expand DownExpand Up@@ -445,8 +445,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
prev_holder_commitment: None,
signer,
channel_transaction_parameters: channel_parameters,
pending_claim_requests: HashMap::new(),
claimable_outpoints: HashMap::new(),
pending_claim_requests: new_hash_map(),
claimable_outpoints: new_hash_map(),
locktimed_packages: BTreeMap::new(),
onchain_events_awaiting_threshold_conf: Vec::new(),
pending_claim_events: Vec::new(),
Expand DownExpand Up@@ -686,7 +686,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
if let Some(claim_id) = claim_id {
if let Some(claim) = self.pending_claim_requests.remove(&claim_id) {
for outpoint in claim.outpoints() {
self.claimable_outpoints.remove(&outpoint);
self.claimable_outpoints.remove(outpoint);
}
}
} else {
Expand DownExpand Up@@ -806,7 +806,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
claim_id
},
};
debug_assert!(self.pending_claim_requests.get(&claim_id).is_none());
// Because fuzzing can cause hash collisions, we can end up with conflicting claim
// ids here, so we only assert when not fuzzing.
debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
for k in req.outpoints() {
log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Expand All@@ -832,7 +834,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
F::Target: FeeEstimator,
{
log_debug!(logger, "Updating claims view at height {} with {} matched transactions in block {}", cur_height, txn_matched.len(), conf_height);
let mut bump_candidates = HashMap::new();
let mut bump_candidates = new_hash_map();
for tx in txn_matched {
// Scan all input to verify is one of the outpoint spent is of interest for us
let mut claimed_outputs_material = Vec::new();
Expand DownExpand Up@@ -1018,7 +1020,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
where B::Target: BroadcasterInterface,
F::Target: FeeEstimator,
{
let mut bump_candidates = HashMap::new();
let mut bump_candidates = new_hash_map();
let onchain_events_awaiting_threshold_conf =
self.onchain_events_awaiting_threshold_conf.drain(..).collect::<Vec<_>>();
for entry in onchain_events_awaiting_threshold_conf {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/events/bump_transaction.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ where
/// Returns a new instance backed by the given [`WalletSource`] that serves as an implementation
/// of [`CoinSelectionSource`].
pub fn new(source: W, logger: L) -> Self {
Self { source, logger, locked_utxos: Mutex::new(HashMap::new()) }
Self { source, logger, locked_utxos: Mutex::new(new_hash_map()) }
}

/// Performs coin selection on the set of UTXOs obtained from
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" + '
Update `full_stack_target` to take an arbitrary config object by TheBlueMatt · Pull Request #2810 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update full_stack_target to take an arbitrary config object#2810

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 9 commits into

from

Feb 5, 2024
 Merged


Update full_stack_target to take an arbitrary config object
#2810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
c725842

Disable fuzzing-reachable debug assertion


TheBlueMatt Dec 24, 2023
248e2f5

Disable fuzzing-reachable debug assertions in `ChannelMonitor`s


TheBlueMatt Dec 25, 2023
f62a96e

Use arbitrary config object in full_stack_target fuzzer


TheBlueMatt Dec 23, 2023
76ed917

Update fuzz CI job to use our MSRV rather than 1.58


TheBlueMatt Jan 18, 2024
3e0d55b

Use utility methods to construct `HashMap`s and `HashSet`s


TheBlueMatt Jan 1, 2024
efbaa41

Stop relying on `Hash{Set,Map}::from_iter` directly


TheBlueMatt Jan 18, 2024
dedc830

Bump `hashbrown` dependency to 0.13


TheBlueMatt Jan 18, 2024
c9e4410

Fix test variable typos


TheBlueMatt Jan 11, 2024
7377cc9

[fuzz] Fix slice copy in `peer_crypt_target`


TheBlueMatt Jan 31, 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


8 changes: 6 additions & 2 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ jobs:
 run: |
 cd lightning
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown,ahash
 cd ..
 - name: Run benchmarks on Rust ${{ matrix.toolchain }}
 run: |
Expand DownExpand Up@@ -176,7 +176,7 @@ jobs:
 fuzz:
 runs-on: ubuntu-latest
 env:
 TOOLCHAIN: 1.58
 TOOLCHAIN: 1.63
 steps:
 - name: Checkout source code
 uses: actions/checkout@v3
Expand All@@ -188,6 +188,10 @@ jobs:
 run: |
 sudo apt-get update
 sudo apt-get -y install build-essential binutils-dev libunwind-dev
 - name: Pin the regex dependency
 run: |
 cd fuzz && cargo update -p regex --precise "1.9.6" --verbose && cd ..
 cd lightning-invoice/fuzz && cargo update -p regex --precise "1.9.6" --verbose
 - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
 run: cd fuzz && RUSTFLAGS="--cfg=fuzzing" cargo test --verbose --color always
 - name: Run fuzzers
Expand Down

2 changes: 1 addition & 1 deletion
bench/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ name = "bench"
harness = false

[features]
hashbrown = ["lightning/hashbrown"]
hashbrown = ["lightning/hashbrown", "lightning/ahash"]

[dependencies]
lightning = { path = "../lightning", features = ["_test_utils", "criterion"] }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ def check_feature(feature):
 pass
 elif feature == "no-std":
 pass
 elif feature == "ahash":
 pass
 elif feature == "hashbrown":
 pass
 elif feature == "backtrace":
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_ut
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.30.2", features = ["secp-lowmemory"] }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
hashbrown = "0.8"
hashbrown = "0.13"

afl = { version = "0.12", optional = true }
honggfuzz = { version = "0.5", optional = true, default-features = false }
Expand Down

47 changes: 17 additions & 30 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
fuzz/src/peer_crypt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ pub fn do_test(data: &[u8]) {
 Ok(len) => len,
 Err(_) => return,
 };
 buf.copy_from_slice(&get_slice!(len as usize + 16));
 buf[..len as usize + 16].copy_from_slice(&get_slice!(len as usize + 16));
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+ 16 might benefit from a comment?
@TheBlueMattTheBlueMattFeb 5, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Meh, its a fuzzer, it'll complain if its wrong :)
 match crypter.decrypt_message(&mut buf[..len as usize + 16]) {
 Ok(_) => {},
 Err(_) => return,
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ bech32 = { version = "0.9.0", default-features = false }
lightning = { version = "0.0.121", path = "../lightning", default-features = false }
secp256k1 = { version = "0.27.0", default-features = false, features = ["recovery", "alloc"] }
num-traits = { version = "0.2.8", default-features = false }
hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.30.2", default-features = false }

Expand Down

15 changes: 13 additions & 2 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ unsafe_revoked_tx_signing = []
# Override signing to not include randomness when generating signatures for test vectors.
_test_vectors = []

no-std = ["hashbrown", "bitcoin/no-std", "core2/alloc", "libm"]
no-std = ["hashbrown", "ahash", "bitcoin/no-std", "core2/alloc", "libm"]
std = ["bitcoin/std"]

# Generates low-r bitcoin signatures, which saves 1 byte in 50% of the cases
Expand All@@ -42,14 +42,25 @@ default = ["std", "grind_signatures"]
[dependencies]
bitcoin = { version = "0.30.2", default-features = false, features = ["secp-recovery"] }

hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
ahash = { version = "0.8", optional = true, default-features = false }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
regex = { version = "1.5.6", optional = true }
backtrace = { version = "0.3", optional = true }

core2 = { version = "0.3.0", optional = true, default-features = false }
libm = { version = "0.2", optional = true, default-features = false }

# Because ahash no longer (kinda poorly) does it for us, (roughly) list out the targets that
# getrandom supports and turn on ahash's `runtime-rng` feature for them.
[target.'cfg(not(any(target_os = "unknown", target_os = "none")))'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

# Not sure what target_os gets set to for sgx, so to be safe always enable runtime-rng for x86_64
# platforms (assuming LDK isn't being used on embedded x86-64 running directly on metal).
[target.'cfg(target_arch = "x86_64")'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

[dev-dependencies]
regex = "1.5.6"

Expand Down

9 changes: 4 additions & 5 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ use crate::ln::channelmanager::ChannelDetails;

use crate::prelude::*;
use crate::sync::{RwLock, RwLockReadGuard, Mutex, MutexGuard};
use core::iter::FromIterator;
use core::ops::Deref;
use core::sync::atomic::{AtomicUsize, Ordering};
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -318,7 +317,7 @@ where C::Target: chain::Filter,
 FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs>
	{
 let err_str = "ChannelMonitor[Update] persistence failed unrecoverably. This indicates we cannot continue normal operation and must shut down.";
 let funding_outpoints: HashSet<OutPoint> = HashSet::from_iter(self.monitors.read().unwrap().keys().cloned());
 let funding_outpoints = hash_set_from_iter(self.monitors.read().unwrap().keys().cloned());
 for funding_outpoint in funding_outpoints.iter() {
 let monitor_lock = self.monitors.read().unwrap();
 if let Some(monitor_state) = monitor_lock.get(funding_outpoint) {
Expand DownExpand Up@@ -420,7 +419,7 @@ where C::Target: chain::Filter,
	/// transactions relevant to the watched channels.
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: RwLock::new(HashMap::new()),
 monitors: RwLock::new(new_hash_map()),
 sync_persistence_id: AtomicCounter::new(),
 chain_source,
 broadcaster,
Expand DownExpand Up@@ -486,9 +485,9 @@ where C::Target: chain::Filter,
	#[cfg(not(c_bindings))]
	/// Lists the pending updates for each [`ChannelMonitor`] (by `OutPoint` being monitored).
	pub fn list_pending_monitor_updates(&self) -> HashMap<OutPoint, Vec<MonitorUpdateId>> {
 self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
hash_map_from_iter(self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
 (*outpoint, holder.pending_monitor_updates.lock().unwrap().clone())
 }).collect()
 }))
	}

	#[cfg(c_bindings)]
Expand Down

37 changes: 21 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1235,7 +1235,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 channel_parameters.clone(), initial_holder_commitment_tx, secp_ctx
 );

 let mut outputs_to_watch = HashMap::new();
 let mut outputs_to_watch = new_hash_map();
 outputs_to_watch.insert(funding_info.0.txid, vec![(funding_info.0.index as u32, funding_info.1.clone())]);

 Self::from_impl(ChannelMonitorImpl {
Expand All@@ -1262,17 +1262,17 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 on_holder_tx_csv: counterparty_channel_parameters.selected_contest_delay,

 commitment_secrets: CounterpartyCommitmentSecrets::new(),
 counterparty_claimable_outpoints: HashMap::new(),
 counterparty_commitment_txn_on_chain: HashMap::new(),
 counterparty_hash_commitment_number: HashMap::new(),
 counterparty_fulfilled_htlcs: HashMap::new(),
 counterparty_claimable_outpoints: new_hash_map(),
 counterparty_commitment_txn_on_chain: new_hash_map(),
 counterparty_hash_commitment_number: new_hash_map(),
 counterparty_fulfilled_htlcs: new_hash_map(),

 prev_holder_signed_commitment_tx: None,
 current_holder_commitment_tx: holder_commitment_tx,
 current_counterparty_commitment_number: 1 << 48,
 current_holder_commitment_number,

 payment_preimages: HashMap::new(),
 payment_preimages: new_hash_map(),
 pending_monitor_events: Vec::new(),
 pending_events: Vec::new(),
 is_processing_pending_events: false,
Expand DownExpand Up@@ -2174,7 +2174,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// HTLCs which were resolved on-chain (i.e. where the final HTLC resolution was done by an
	/// event from this `ChannelMonitor`).
	pub(crate) fn get_all_current_outbound_htlcs(&self) -> HashMap<HTLCSource, (HTLCOutputInCommitment, Option<PaymentPreimage>)> {
 let mut res = HashMap::new();
 let mut res = new_hash_map();
 // Just examine the available counterparty commitment transactions. See docs on
 // `fail_unbroadcast_htlcs`, below, for justification.
 let us = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2226,7 +2226,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 return self.get_all_current_outbound_htlcs();
 }

 let mut res = HashMap::new();
 let mut res = new_hash_map();
 macro_rules! walk_htlcs {
 ($holder_commitment: expr, $htlc_iter: expr) => {
 for (htlc, source) in $htlc_iter {
Expand DownExpand Up@@ -3172,7 +3172,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 } else {
 debug_assert!(false, "We should have per-commitment option for any recognized old commitment txn");
 // Our fuzzers aren't contrained by pesky things like valid signatures, so can
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

nit: constrained
 // spend our funding output with a transaction which doesn't match our past
 // commitment transactions. Thus, we can only debug-assert here when not
 // fuzzing.
 debug_assert!(cfg!(fuzzing), "We should have per-commitment option for any recognized old commitment txn");
 fail_unbroadcast_htlcs!(self, "revoked counterparty", commitment_txid, tx, height,
 block_hash, [].iter().map(|reference| *reference), logger);
 }
Expand DownExpand Up@@ -3679,6 +3683,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 claimable_outpoints.append(&mut new_outpoints);
 if new_outpoints.is_empty() {
 if let Some((mut new_outpoints, new_outputs)) = self.check_spend_holder_transaction(&tx, height, &block_hash, &logger) {
 #[cfg(not(fuzzing))]
 debug_assert!(commitment_tx_to_counterparty_output.is_none(),
 "A commitment transaction matched as both a counterparty and local commitment tx?");
 if !new_outputs.1.is_empty() {
Expand DownExpand Up@@ -3935,7 +3940,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Filters a block's `txdata` for transactions spending watched outputs or for any child
	/// transactions thereof.
	fn filter_block<'a>(&self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
 let mut matched_txn = HashSet::new();
 let mut matched_txn = new_hash_set();
 txdata.iter().filter(|&&(_, tx)| {
 let mut matches = self.spends_watched_output(tx);
 for input in tx.input.iter() {
Expand DownExpand Up@@ -4450,7 +4455,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut counterparty_claimable_outpoints = HashMap::with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 let mut counterparty_claimable_outpoints = hash_map_with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 for _ in 0..counterparty_claimable_outpoints_len {
 let txid: Txid = Readable::read(reader)?;
 let htlcs_count: u64 = Readable::read(reader)?;
Expand All@@ -4464,7 +4469,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_commitment_txn_on_chain_len: u64 = Readable::read(reader)?;
 let mut counterparty_commitment_txn_on_chain = HashMap::with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_commitment_txn_on_chain = hash_map_with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_commitment_txn_on_chain_len {
 let txid: Txid = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4474,7 +4479,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_hash_commitment_number_len: u64 = Readable::read(reader)?;
 let mut counterparty_hash_commitment_number = HashMap::with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_hash_commitment_number = hash_map_with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_hash_commitment_number_len {
 let payment_hash: PaymentHash = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4497,7 +4502,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let current_holder_commitment_number = <U48 as Readable>::read(reader)?.0;

 let payment_preimages_len: u64 = Readable::read(reader)?;
 let mut payment_preimages = HashMap::with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 let mut payment_preimages = hash_map_with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..payment_preimages_len {
 let preimage: PaymentPreimage = Readable::read(reader)?;
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
Expand DownExpand Up@@ -4537,7 +4542,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let outputs_to_watch_len: u64 = Readable::read(reader)?;
 let mut outputs_to_watch = HashMap::with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 let mut outputs_to_watch = hash_map_with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 for _ in 0..outputs_to_watch_len {
 let txid = Readable::read(reader)?;
 let outputs_len: u64 = Readable::read(reader)?;
Expand DownExpand Up@@ -4579,7 +4584,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut counterparty_node_id = None;
 let mut confirmed_commitment_tx_counterparty_output = None;
 let mut spendable_txids_confirmed = Some(Vec::new());
 let mut counterparty_fulfilled_htlcs = Some(HashMap::new());
 let mut counterparty_fulfilled_htlcs = Some(new_hash_map());
 let mut initial_counterparty_commitment_info = None;
 let mut channel_id = None;
 read_tlv_fields!(reader, {
Expand Down

18 changes: 10 additions & 8 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374,13 +374,13 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 signer.provide_channel_parameters(&channel_parameters);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..pending_claim_requests_len {
 pending_claim_requests.insert(Readable::read(reader)?, Readable::read(reader)?);
 }

 let claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut claimable_outpoints = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut claimable_outpoints = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..claimable_outpoints_len {
 let outpoint = Readable::read(reader)?;
 let ancestor_claim_txid = Readable::read(reader)?;
Expand DownExpand Up@@ -445,8 +445,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 prev_holder_commitment: None,
 signer,
 channel_transaction_parameters: channel_parameters,
 pending_claim_requests: HashMap::new(),
 claimable_outpoints: HashMap::new(),
 pending_claim_requests: new_hash_map(),
 claimable_outpoints: new_hash_map(),
 locktimed_packages: BTreeMap::new(),
 onchain_events_awaiting_threshold_conf: Vec::new(),
 pending_claim_events: Vec::new(),
Expand DownExpand Up@@ -686,7 +686,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 if let Some(claim_id) = claim_id {
 if let Some(claim) = self.pending_claim_requests.remove(&claim_id) {
 for outpoint in claim.outpoints() {
 self.claimable_outpoints.remove(&outpoint);
 self.claimable_outpoints.remove(outpoint);
 }
 }
 } else {
Expand DownExpand Up@@ -806,7 +806,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 claim_id
 },
 };
 debug_assert!(self.pending_claim_requests.get(&claim_id).is_none());
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Expand All@@ -832,7 +834,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 F::Target: FeeEstimator,
	{
 log_debug!(logger, "Updating claims view at height {} with {} matched transactions in block {}", cur_height, txn_matched.len(), conf_height);
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 for tx in txn_matched {
 // Scan all input to verify is one of the outpoint spent is of interest for us
 let mut claimed_outputs_material = Vec::new();
Expand DownExpand Up@@ -1018,7 +1020,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
	{
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 let onchain_events_awaiting_threshold_conf =
 self.onchain_events_awaiting_threshold_conf.drain(..).collect::<Vec<_>>();
 for entry in onchain_events_awaiting_threshold_conf {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ where
	/// Returns a new instance backed by the given [`WalletSource`] that serves as an implementation
	/// of [`CoinSelectionSource`].
	pub fn new(source: W, logger: L) -> Self {
 Self { source, logger, locked_utxos: Mutex::new(HashMap::new()) }
 Self { source, logger, locked_utxos: Mutex::new(new_hash_map()) }
	}

	/// Performs coin selection on the set of UTXOs obtained from
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('^' + ".*" + '
Update `full_stack_target` to take an arbitrary config object by TheBlueMatt · Pull Request #2810 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update full_stack_target to take an arbitrary config object#2810

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 9 commits into

from

Feb 5, 2024
 Merged


Update full_stack_target to take an arbitrary config object
#2810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
c725842

Disable fuzzing-reachable debug assertion


TheBlueMatt Dec 24, 2023
248e2f5

Disable fuzzing-reachable debug assertions in `ChannelMonitor`s


TheBlueMatt Dec 25, 2023
f62a96e

Use arbitrary config object in full_stack_target fuzzer


TheBlueMatt Dec 23, 2023
76ed917

Update fuzz CI job to use our MSRV rather than 1.58


TheBlueMatt Jan 18, 2024
3e0d55b

Use utility methods to construct `HashMap`s and `HashSet`s


TheBlueMatt Jan 1, 2024
efbaa41

Stop relying on `Hash{Set,Map}::from_iter` directly


TheBlueMatt Jan 18, 2024
dedc830

Bump `hashbrown` dependency to 0.13


TheBlueMatt Jan 18, 2024
c9e4410

Fix test variable typos


TheBlueMatt Jan 11, 2024
7377cc9

[fuzz] Fix slice copy in `peer_crypt_target`


TheBlueMatt Jan 31, 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


8 changes: 6 additions & 2 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ jobs:
 run: |
 cd lightning
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown,ahash
 cd ..
 - name: Run benchmarks on Rust ${{ matrix.toolchain }}
 run: |
Expand DownExpand Up@@ -176,7 +176,7 @@ jobs:
 fuzz:
 runs-on: ubuntu-latest
 env:
 TOOLCHAIN: 1.58
 TOOLCHAIN: 1.63
 steps:
 - name: Checkout source code
 uses: actions/checkout@v3
Expand All@@ -188,6 +188,10 @@ jobs:
 run: |
 sudo apt-get update
 sudo apt-get -y install build-essential binutils-dev libunwind-dev
 - name: Pin the regex dependency
 run: |
 cd fuzz && cargo update -p regex --precise "1.9.6" --verbose && cd ..
 cd lightning-invoice/fuzz && cargo update -p regex --precise "1.9.6" --verbose
 - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
 run: cd fuzz && RUSTFLAGS="--cfg=fuzzing" cargo test --verbose --color always
 - name: Run fuzzers
Expand Down

2 changes: 1 addition & 1 deletion
bench/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ name = "bench"
harness = false

[features]
hashbrown = ["lightning/hashbrown"]
hashbrown = ["lightning/hashbrown", "lightning/ahash"]

[dependencies]
lightning = { path = "../lightning", features = ["_test_utils", "criterion"] }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ def check_feature(feature):
 pass
 elif feature == "no-std":
 pass
 elif feature == "ahash":
 pass
 elif feature == "hashbrown":
 pass
 elif feature == "backtrace":
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_ut
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.30.2", features = ["secp-lowmemory"] }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
hashbrown = "0.8"
hashbrown = "0.13"

afl = { version = "0.12", optional = true }
honggfuzz = { version = "0.5", optional = true, default-features = false }
Expand Down

47 changes: 17 additions & 30 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
fuzz/src/peer_crypt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ pub fn do_test(data: &[u8]) {
 Ok(len) => len,
 Err(_) => return,
 };
 buf.copy_from_slice(&get_slice!(len as usize + 16));
 buf[..len as usize + 16].copy_from_slice(&get_slice!(len as usize + 16));
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+ 16 might benefit from a comment?
@TheBlueMattTheBlueMattFeb 5, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Meh, its a fuzzer, it'll complain if its wrong :)
 match crypter.decrypt_message(&mut buf[..len as usize + 16]) {
 Ok(_) => {},
 Err(_) => return,
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ bech32 = { version = "0.9.0", default-features = false }
lightning = { version = "0.0.121", path = "../lightning", default-features = false }
secp256k1 = { version = "0.27.0", default-features = false, features = ["recovery", "alloc"] }
num-traits = { version = "0.2.8", default-features = false }
hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.30.2", default-features = false }

Expand Down

15 changes: 13 additions & 2 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ unsafe_revoked_tx_signing = []
# Override signing to not include randomness when generating signatures for test vectors.
_test_vectors = []

no-std = ["hashbrown", "bitcoin/no-std", "core2/alloc", "libm"]
no-std = ["hashbrown", "ahash", "bitcoin/no-std", "core2/alloc", "libm"]
std = ["bitcoin/std"]

# Generates low-r bitcoin signatures, which saves 1 byte in 50% of the cases
Expand All@@ -42,14 +42,25 @@ default = ["std", "grind_signatures"]
[dependencies]
bitcoin = { version = "0.30.2", default-features = false, features = ["secp-recovery"] }

hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
ahash = { version = "0.8", optional = true, default-features = false }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
regex = { version = "1.5.6", optional = true }
backtrace = { version = "0.3", optional = true }

core2 = { version = "0.3.0", optional = true, default-features = false }
libm = { version = "0.2", optional = true, default-features = false }

# Because ahash no longer (kinda poorly) does it for us, (roughly) list out the targets that
# getrandom supports and turn on ahash's `runtime-rng` feature for them.
[target.'cfg(not(any(target_os = "unknown", target_os = "none")))'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

# Not sure what target_os gets set to for sgx, so to be safe always enable runtime-rng for x86_64
# platforms (assuming LDK isn't being used on embedded x86-64 running directly on metal).
[target.'cfg(target_arch = "x86_64")'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

[dev-dependencies]
regex = "1.5.6"

Expand Down

9 changes: 4 additions & 5 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ use crate::ln::channelmanager::ChannelDetails;

use crate::prelude::*;
use crate::sync::{RwLock, RwLockReadGuard, Mutex, MutexGuard};
use core::iter::FromIterator;
use core::ops::Deref;
use core::sync::atomic::{AtomicUsize, Ordering};
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -318,7 +317,7 @@ where C::Target: chain::Filter,
 FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs>
	{
 let err_str = "ChannelMonitor[Update] persistence failed unrecoverably. This indicates we cannot continue normal operation and must shut down.";
 let funding_outpoints: HashSet<OutPoint> = HashSet::from_iter(self.monitors.read().unwrap().keys().cloned());
 let funding_outpoints = hash_set_from_iter(self.monitors.read().unwrap().keys().cloned());
 for funding_outpoint in funding_outpoints.iter() {
 let monitor_lock = self.monitors.read().unwrap();
 if let Some(monitor_state) = monitor_lock.get(funding_outpoint) {
Expand DownExpand Up@@ -420,7 +419,7 @@ where C::Target: chain::Filter,
	/// transactions relevant to the watched channels.
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: RwLock::new(HashMap::new()),
 monitors: RwLock::new(new_hash_map()),
 sync_persistence_id: AtomicCounter::new(),
 chain_source,
 broadcaster,
Expand DownExpand Up@@ -486,9 +485,9 @@ where C::Target: chain::Filter,
	#[cfg(not(c_bindings))]
	/// Lists the pending updates for each [`ChannelMonitor`] (by `OutPoint` being monitored).
	pub fn list_pending_monitor_updates(&self) -> HashMap<OutPoint, Vec<MonitorUpdateId>> {
 self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
hash_map_from_iter(self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
 (*outpoint, holder.pending_monitor_updates.lock().unwrap().clone())
 }).collect()
 }))
	}

	#[cfg(c_bindings)]
Expand Down

37 changes: 21 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1235,7 +1235,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 channel_parameters.clone(), initial_holder_commitment_tx, secp_ctx
 );

 let mut outputs_to_watch = HashMap::new();
 let mut outputs_to_watch = new_hash_map();
 outputs_to_watch.insert(funding_info.0.txid, vec![(funding_info.0.index as u32, funding_info.1.clone())]);

 Self::from_impl(ChannelMonitorImpl {
Expand All@@ -1262,17 +1262,17 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 on_holder_tx_csv: counterparty_channel_parameters.selected_contest_delay,

 commitment_secrets: CounterpartyCommitmentSecrets::new(),
 counterparty_claimable_outpoints: HashMap::new(),
 counterparty_commitment_txn_on_chain: HashMap::new(),
 counterparty_hash_commitment_number: HashMap::new(),
 counterparty_fulfilled_htlcs: HashMap::new(),
 counterparty_claimable_outpoints: new_hash_map(),
 counterparty_commitment_txn_on_chain: new_hash_map(),
 counterparty_hash_commitment_number: new_hash_map(),
 counterparty_fulfilled_htlcs: new_hash_map(),

 prev_holder_signed_commitment_tx: None,
 current_holder_commitment_tx: holder_commitment_tx,
 current_counterparty_commitment_number: 1 << 48,
 current_holder_commitment_number,

 payment_preimages: HashMap::new(),
 payment_preimages: new_hash_map(),
 pending_monitor_events: Vec::new(),
 pending_events: Vec::new(),
 is_processing_pending_events: false,
Expand DownExpand Up@@ -2174,7 +2174,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// HTLCs which were resolved on-chain (i.e. where the final HTLC resolution was done by an
	/// event from this `ChannelMonitor`).
	pub(crate) fn get_all_current_outbound_htlcs(&self) -> HashMap<HTLCSource, (HTLCOutputInCommitment, Option<PaymentPreimage>)> {
 let mut res = HashMap::new();
 let mut res = new_hash_map();
 // Just examine the available counterparty commitment transactions. See docs on
 // `fail_unbroadcast_htlcs`, below, for justification.
 let us = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2226,7 +2226,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 return self.get_all_current_outbound_htlcs();
 }

 let mut res = HashMap::new();
 let mut res = new_hash_map();
 macro_rules! walk_htlcs {
 ($holder_commitment: expr, $htlc_iter: expr) => {
 for (htlc, source) in $htlc_iter {
Expand DownExpand Up@@ -3172,7 +3172,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 } else {
 debug_assert!(false, "We should have per-commitment option for any recognized old commitment txn");
 // Our fuzzers aren't contrained by pesky things like valid signatures, so can
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

nit: constrained
 // spend our funding output with a transaction which doesn't match our past
 // commitment transactions. Thus, we can only debug-assert here when not
 // fuzzing.
 debug_assert!(cfg!(fuzzing), "We should have per-commitment option for any recognized old commitment txn");
 fail_unbroadcast_htlcs!(self, "revoked counterparty", commitment_txid, tx, height,
 block_hash, [].iter().map(|reference| *reference), logger);
 }
Expand DownExpand Up@@ -3679,6 +3683,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 claimable_outpoints.append(&mut new_outpoints);
 if new_outpoints.is_empty() {
 if let Some((mut new_outpoints, new_outputs)) = self.check_spend_holder_transaction(&tx, height, &block_hash, &logger) {
 #[cfg(not(fuzzing))]
 debug_assert!(commitment_tx_to_counterparty_output.is_none(),
 "A commitment transaction matched as both a counterparty and local commitment tx?");
 if !new_outputs.1.is_empty() {
Expand DownExpand Up@@ -3935,7 +3940,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Filters a block's `txdata` for transactions spending watched outputs or for any child
	/// transactions thereof.
	fn filter_block<'a>(&self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
 let mut matched_txn = HashSet::new();
 let mut matched_txn = new_hash_set();
 txdata.iter().filter(|&&(_, tx)| {
 let mut matches = self.spends_watched_output(tx);
 for input in tx.input.iter() {
Expand DownExpand Up@@ -4450,7 +4455,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut counterparty_claimable_outpoints = HashMap::with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 let mut counterparty_claimable_outpoints = hash_map_with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 for _ in 0..counterparty_claimable_outpoints_len {
 let txid: Txid = Readable::read(reader)?;
 let htlcs_count: u64 = Readable::read(reader)?;
Expand All@@ -4464,7 +4469,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_commitment_txn_on_chain_len: u64 = Readable::read(reader)?;
 let mut counterparty_commitment_txn_on_chain = HashMap::with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_commitment_txn_on_chain = hash_map_with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_commitment_txn_on_chain_len {
 let txid: Txid = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4474,7 +4479,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_hash_commitment_number_len: u64 = Readable::read(reader)?;
 let mut counterparty_hash_commitment_number = HashMap::with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_hash_commitment_number = hash_map_with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_hash_commitment_number_len {
 let payment_hash: PaymentHash = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4497,7 +4502,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let current_holder_commitment_number = <U48 as Readable>::read(reader)?.0;

 let payment_preimages_len: u64 = Readable::read(reader)?;
 let mut payment_preimages = HashMap::with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 let mut payment_preimages = hash_map_with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..payment_preimages_len {
 let preimage: PaymentPreimage = Readable::read(reader)?;
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
Expand DownExpand Up@@ -4537,7 +4542,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let outputs_to_watch_len: u64 = Readable::read(reader)?;
 let mut outputs_to_watch = HashMap::with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 let mut outputs_to_watch = hash_map_with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 for _ in 0..outputs_to_watch_len {
 let txid = Readable::read(reader)?;
 let outputs_len: u64 = Readable::read(reader)?;
Expand DownExpand Up@@ -4579,7 +4584,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut counterparty_node_id = None;
 let mut confirmed_commitment_tx_counterparty_output = None;
 let mut spendable_txids_confirmed = Some(Vec::new());
 let mut counterparty_fulfilled_htlcs = Some(HashMap::new());
 let mut counterparty_fulfilled_htlcs = Some(new_hash_map());
 let mut initial_counterparty_commitment_info = None;
 let mut channel_id = None;
 read_tlv_fields!(reader, {
Expand Down

18 changes: 10 additions & 8 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374,13 +374,13 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 signer.provide_channel_parameters(&channel_parameters);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..pending_claim_requests_len {
 pending_claim_requests.insert(Readable::read(reader)?, Readable::read(reader)?);
 }

 let claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut claimable_outpoints = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut claimable_outpoints = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..claimable_outpoints_len {
 let outpoint = Readable::read(reader)?;
 let ancestor_claim_txid = Readable::read(reader)?;
Expand DownExpand Up@@ -445,8 +445,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 prev_holder_commitment: None,
 signer,
 channel_transaction_parameters: channel_parameters,
 pending_claim_requests: HashMap::new(),
 claimable_outpoints: HashMap::new(),
 pending_claim_requests: new_hash_map(),
 claimable_outpoints: new_hash_map(),
 locktimed_packages: BTreeMap::new(),
 onchain_events_awaiting_threshold_conf: Vec::new(),
 pending_claim_events: Vec::new(),
Expand DownExpand Up@@ -686,7 +686,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 if let Some(claim_id) = claim_id {
 if let Some(claim) = self.pending_claim_requests.remove(&claim_id) {
 for outpoint in claim.outpoints() {
 self.claimable_outpoints.remove(&outpoint);
 self.claimable_outpoints.remove(outpoint);
 }
 }
 } else {
Expand DownExpand Up@@ -806,7 +806,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 claim_id
 },
 };
 debug_assert!(self.pending_claim_requests.get(&claim_id).is_none());
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Expand All@@ -832,7 +834,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 F::Target: FeeEstimator,
	{
 log_debug!(logger, "Updating claims view at height {} with {} matched transactions in block {}", cur_height, txn_matched.len(), conf_height);
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 for tx in txn_matched {
 // Scan all input to verify is one of the outpoint spent is of interest for us
 let mut claimed_outputs_material = Vec::new();
Expand DownExpand Up@@ -1018,7 +1020,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
	{
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 let onchain_events_awaiting_threshold_conf =
 self.onchain_events_awaiting_threshold_conf.drain(..).collect::<Vec<_>>();
 for entry in onchain_events_awaiting_threshold_conf {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ where
	/// Returns a new instance backed by the given [`WalletSource`] that serves as an implementation
	/// of [`CoinSelectionSource`].
	pub fn new(source: W, logger: L) -> Self {
 Self { source, logger, locked_utxos: Mutex::new(HashMap::new()) }
 Self { source, logger, locked_utxos: Mutex::new(new_hash_map()) }
	}

	/// Performs coin selection on the set of UTXOs obtained from
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('^' + ".*" + '
Update `full_stack_target` to take an arbitrary config object by TheBlueMatt · Pull Request #2810 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update full_stack_target to take an arbitrary config object#2810

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 9 commits into

from

Feb 5, 2024
 Merged


Update full_stack_target to take an arbitrary config object
#2810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
c725842

Disable fuzzing-reachable debug assertion


TheBlueMatt Dec 24, 2023
248e2f5

Disable fuzzing-reachable debug assertions in `ChannelMonitor`s


TheBlueMatt Dec 25, 2023
f62a96e

Use arbitrary config object in full_stack_target fuzzer


TheBlueMatt Dec 23, 2023
76ed917

Update fuzz CI job to use our MSRV rather than 1.58


TheBlueMatt Jan 18, 2024
3e0d55b

Use utility methods to construct `HashMap`s and `HashSet`s


TheBlueMatt Jan 1, 2024
efbaa41

Stop relying on `Hash{Set,Map}::from_iter` directly


TheBlueMatt Jan 18, 2024
dedc830

Bump `hashbrown` dependency to 0.13


TheBlueMatt Jan 18, 2024
c9e4410

Fix test variable typos


TheBlueMatt Jan 11, 2024
7377cc9

[fuzz] Fix slice copy in `peer_crypt_target`


TheBlueMatt Jan 31, 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


8 changes: 6 additions & 2 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ jobs:
 run: |
 cd lightning
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown,ahash
 cd ..
 - name: Run benchmarks on Rust ${{ matrix.toolchain }}
 run: |
Expand DownExpand Up@@ -176,7 +176,7 @@ jobs:
 fuzz:
 runs-on: ubuntu-latest
 env:
 TOOLCHAIN: 1.58
 TOOLCHAIN: 1.63
 steps:
 - name: Checkout source code
 uses: actions/checkout@v3
Expand All@@ -188,6 +188,10 @@ jobs:
 run: |
 sudo apt-get update
 sudo apt-get -y install build-essential binutils-dev libunwind-dev
 - name: Pin the regex dependency
 run: |
 cd fuzz && cargo update -p regex --precise "1.9.6" --verbose && cd ..
 cd lightning-invoice/fuzz && cargo update -p regex --precise "1.9.6" --verbose
 - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
 run: cd fuzz && RUSTFLAGS="--cfg=fuzzing" cargo test --verbose --color always
 - name: Run fuzzers
Expand Down

2 changes: 1 addition & 1 deletion
bench/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ name = "bench"
harness = false

[features]
hashbrown = ["lightning/hashbrown"]
hashbrown = ["lightning/hashbrown", "lightning/ahash"]

[dependencies]
lightning = { path = "../lightning", features = ["_test_utils", "criterion"] }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ def check_feature(feature):
 pass
 elif feature == "no-std":
 pass
 elif feature == "ahash":
 pass
 elif feature == "hashbrown":
 pass
 elif feature == "backtrace":
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_ut
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.30.2", features = ["secp-lowmemory"] }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
hashbrown = "0.8"
hashbrown = "0.13"

afl = { version = "0.12", optional = true }
honggfuzz = { version = "0.5", optional = true, default-features = false }
Expand Down

47 changes: 17 additions & 30 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
fuzz/src/peer_crypt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ pub fn do_test(data: &[u8]) {
 Ok(len) => len,
 Err(_) => return,
 };
 buf.copy_from_slice(&get_slice!(len as usize + 16));
 buf[..len as usize + 16].copy_from_slice(&get_slice!(len as usize + 16));
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+ 16 might benefit from a comment?
@TheBlueMattTheBlueMattFeb 5, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Meh, its a fuzzer, it'll complain if its wrong :)
 match crypter.decrypt_message(&mut buf[..len as usize + 16]) {
 Ok(_) => {},
 Err(_) => return,
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ bech32 = { version = "0.9.0", default-features = false }
lightning = { version = "0.0.121", path = "../lightning", default-features = false }
secp256k1 = { version = "0.27.0", default-features = false, features = ["recovery", "alloc"] }
num-traits = { version = "0.2.8", default-features = false }
hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.30.2", default-features = false }

Expand Down

15 changes: 13 additions & 2 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ unsafe_revoked_tx_signing = []
# Override signing to not include randomness when generating signatures for test vectors.
_test_vectors = []

no-std = ["hashbrown", "bitcoin/no-std", "core2/alloc", "libm"]
no-std = ["hashbrown", "ahash", "bitcoin/no-std", "core2/alloc", "libm"]
std = ["bitcoin/std"]

# Generates low-r bitcoin signatures, which saves 1 byte in 50% of the cases
Expand All@@ -42,14 +42,25 @@ default = ["std", "grind_signatures"]
[dependencies]
bitcoin = { version = "0.30.2", default-features = false, features = ["secp-recovery"] }

hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
ahash = { version = "0.8", optional = true, default-features = false }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
regex = { version = "1.5.6", optional = true }
backtrace = { version = "0.3", optional = true }

core2 = { version = "0.3.0", optional = true, default-features = false }
libm = { version = "0.2", optional = true, default-features = false }

# Because ahash no longer (kinda poorly) does it for us, (roughly) list out the targets that
# getrandom supports and turn on ahash's `runtime-rng` feature for them.
[target.'cfg(not(any(target_os = "unknown", target_os = "none")))'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

# Not sure what target_os gets set to for sgx, so to be safe always enable runtime-rng for x86_64
# platforms (assuming LDK isn't being used on embedded x86-64 running directly on metal).
[target.'cfg(target_arch = "x86_64")'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

[dev-dependencies]
regex = "1.5.6"

Expand Down

9 changes: 4 additions & 5 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ use crate::ln::channelmanager::ChannelDetails;

use crate::prelude::*;
use crate::sync::{RwLock, RwLockReadGuard, Mutex, MutexGuard};
use core::iter::FromIterator;
use core::ops::Deref;
use core::sync::atomic::{AtomicUsize, Ordering};
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -318,7 +317,7 @@ where C::Target: chain::Filter,
 FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs>
	{
 let err_str = "ChannelMonitor[Update] persistence failed unrecoverably. This indicates we cannot continue normal operation and must shut down.";
 let funding_outpoints: HashSet<OutPoint> = HashSet::from_iter(self.monitors.read().unwrap().keys().cloned());
 let funding_outpoints = hash_set_from_iter(self.monitors.read().unwrap().keys().cloned());
 for funding_outpoint in funding_outpoints.iter() {
 let monitor_lock = self.monitors.read().unwrap();
 if let Some(monitor_state) = monitor_lock.get(funding_outpoint) {
Expand DownExpand Up@@ -420,7 +419,7 @@ where C::Target: chain::Filter,
	/// transactions relevant to the watched channels.
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: RwLock::new(HashMap::new()),
 monitors: RwLock::new(new_hash_map()),
 sync_persistence_id: AtomicCounter::new(),
 chain_source,
 broadcaster,
Expand DownExpand Up@@ -486,9 +485,9 @@ where C::Target: chain::Filter,
	#[cfg(not(c_bindings))]
	/// Lists the pending updates for each [`ChannelMonitor`] (by `OutPoint` being monitored).
	pub fn list_pending_monitor_updates(&self) -> HashMap<OutPoint, Vec<MonitorUpdateId>> {
 self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
hash_map_from_iter(self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
 (*outpoint, holder.pending_monitor_updates.lock().unwrap().clone())
 }).collect()
 }))
	}

	#[cfg(c_bindings)]
Expand Down

37 changes: 21 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1235,7 +1235,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 channel_parameters.clone(), initial_holder_commitment_tx, secp_ctx
 );

 let mut outputs_to_watch = HashMap::new();
 let mut outputs_to_watch = new_hash_map();
 outputs_to_watch.insert(funding_info.0.txid, vec![(funding_info.0.index as u32, funding_info.1.clone())]);

 Self::from_impl(ChannelMonitorImpl {
Expand All@@ -1262,17 +1262,17 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 on_holder_tx_csv: counterparty_channel_parameters.selected_contest_delay,

 commitment_secrets: CounterpartyCommitmentSecrets::new(),
 counterparty_claimable_outpoints: HashMap::new(),
 counterparty_commitment_txn_on_chain: HashMap::new(),
 counterparty_hash_commitment_number: HashMap::new(),
 counterparty_fulfilled_htlcs: HashMap::new(),
 counterparty_claimable_outpoints: new_hash_map(),
 counterparty_commitment_txn_on_chain: new_hash_map(),
 counterparty_hash_commitment_number: new_hash_map(),
 counterparty_fulfilled_htlcs: new_hash_map(),

 prev_holder_signed_commitment_tx: None,
 current_holder_commitment_tx: holder_commitment_tx,
 current_counterparty_commitment_number: 1 << 48,
 current_holder_commitment_number,

 payment_preimages: HashMap::new(),
 payment_preimages: new_hash_map(),
 pending_monitor_events: Vec::new(),
 pending_events: Vec::new(),
 is_processing_pending_events: false,
Expand DownExpand Up@@ -2174,7 +2174,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// HTLCs which were resolved on-chain (i.e. where the final HTLC resolution was done by an
	/// event from this `ChannelMonitor`).
	pub(crate) fn get_all_current_outbound_htlcs(&self) -> HashMap<HTLCSource, (HTLCOutputInCommitment, Option<PaymentPreimage>)> {
 let mut res = HashMap::new();
 let mut res = new_hash_map();
 // Just examine the available counterparty commitment transactions. See docs on
 // `fail_unbroadcast_htlcs`, below, for justification.
 let us = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2226,7 +2226,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 return self.get_all_current_outbound_htlcs();
 }

 let mut res = HashMap::new();
 let mut res = new_hash_map();
 macro_rules! walk_htlcs {
 ($holder_commitment: expr, $htlc_iter: expr) => {
 for (htlc, source) in $htlc_iter {
Expand DownExpand Up@@ -3172,7 +3172,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 } else {
 debug_assert!(false, "We should have per-commitment option for any recognized old commitment txn");
 // Our fuzzers aren't contrained by pesky things like valid signatures, so can
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

nit: constrained
 // spend our funding output with a transaction which doesn't match our past
 // commitment transactions. Thus, we can only debug-assert here when not
 // fuzzing.
 debug_assert!(cfg!(fuzzing), "We should have per-commitment option for any recognized old commitment txn");
 fail_unbroadcast_htlcs!(self, "revoked counterparty", commitment_txid, tx, height,
 block_hash, [].iter().map(|reference| *reference), logger);
 }
Expand DownExpand Up@@ -3679,6 +3683,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 claimable_outpoints.append(&mut new_outpoints);
 if new_outpoints.is_empty() {
 if let Some((mut new_outpoints, new_outputs)) = self.check_spend_holder_transaction(&tx, height, &block_hash, &logger) {
 #[cfg(not(fuzzing))]
 debug_assert!(commitment_tx_to_counterparty_output.is_none(),
 "A commitment transaction matched as both a counterparty and local commitment tx?");
 if !new_outputs.1.is_empty() {
Expand DownExpand Up@@ -3935,7 +3940,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Filters a block's `txdata` for transactions spending watched outputs or for any child
	/// transactions thereof.
	fn filter_block<'a>(&self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
 let mut matched_txn = HashSet::new();
 let mut matched_txn = new_hash_set();
 txdata.iter().filter(|&&(_, tx)| {
 let mut matches = self.spends_watched_output(tx);
 for input in tx.input.iter() {
Expand DownExpand Up@@ -4450,7 +4455,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut counterparty_claimable_outpoints = HashMap::with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 let mut counterparty_claimable_outpoints = hash_map_with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 for _ in 0..counterparty_claimable_outpoints_len {
 let txid: Txid = Readable::read(reader)?;
 let htlcs_count: u64 = Readable::read(reader)?;
Expand All@@ -4464,7 +4469,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_commitment_txn_on_chain_len: u64 = Readable::read(reader)?;
 let mut counterparty_commitment_txn_on_chain = HashMap::with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_commitment_txn_on_chain = hash_map_with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_commitment_txn_on_chain_len {
 let txid: Txid = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4474,7 +4479,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_hash_commitment_number_len: u64 = Readable::read(reader)?;
 let mut counterparty_hash_commitment_number = HashMap::with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_hash_commitment_number = hash_map_with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_hash_commitment_number_len {
 let payment_hash: PaymentHash = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4497,7 +4502,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let current_holder_commitment_number = <U48 as Readable>::read(reader)?.0;

 let payment_preimages_len: u64 = Readable::read(reader)?;
 let mut payment_preimages = HashMap::with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 let mut payment_preimages = hash_map_with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..payment_preimages_len {
 let preimage: PaymentPreimage = Readable::read(reader)?;
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
Expand DownExpand Up@@ -4537,7 +4542,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let outputs_to_watch_len: u64 = Readable::read(reader)?;
 let mut outputs_to_watch = HashMap::with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 let mut outputs_to_watch = hash_map_with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 for _ in 0..outputs_to_watch_len {
 let txid = Readable::read(reader)?;
 let outputs_len: u64 = Readable::read(reader)?;
Expand DownExpand Up@@ -4579,7 +4584,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut counterparty_node_id = None;
 let mut confirmed_commitment_tx_counterparty_output = None;
 let mut spendable_txids_confirmed = Some(Vec::new());
 let mut counterparty_fulfilled_htlcs = Some(HashMap::new());
 let mut counterparty_fulfilled_htlcs = Some(new_hash_map());
 let mut initial_counterparty_commitment_info = None;
 let mut channel_id = None;
 read_tlv_fields!(reader, {
Expand Down

18 changes: 10 additions & 8 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374,13 +374,13 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 signer.provide_channel_parameters(&channel_parameters);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..pending_claim_requests_len {
 pending_claim_requests.insert(Readable::read(reader)?, Readable::read(reader)?);
 }

 let claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut claimable_outpoints = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut claimable_outpoints = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..claimable_outpoints_len {
 let outpoint = Readable::read(reader)?;
 let ancestor_claim_txid = Readable::read(reader)?;
Expand DownExpand Up@@ -445,8 +445,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 prev_holder_commitment: None,
 signer,
 channel_transaction_parameters: channel_parameters,
 pending_claim_requests: HashMap::new(),
 claimable_outpoints: HashMap::new(),
 pending_claim_requests: new_hash_map(),
 claimable_outpoints: new_hash_map(),
 locktimed_packages: BTreeMap::new(),
 onchain_events_awaiting_threshold_conf: Vec::new(),
 pending_claim_events: Vec::new(),
Expand DownExpand Up@@ -686,7 +686,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 if let Some(claim_id) = claim_id {
 if let Some(claim) = self.pending_claim_requests.remove(&claim_id) {
 for outpoint in claim.outpoints() {
 self.claimable_outpoints.remove(&outpoint);
 self.claimable_outpoints.remove(outpoint);
 }
 }
 } else {
Expand DownExpand Up@@ -806,7 +806,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 claim_id
 },
 };
 debug_assert!(self.pending_claim_requests.get(&claim_id).is_none());
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Expand All@@ -832,7 +834,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 F::Target: FeeEstimator,
	{
 log_debug!(logger, "Updating claims view at height {} with {} matched transactions in block {}", cur_height, txn_matched.len(), conf_height);
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 for tx in txn_matched {
 // Scan all input to verify is one of the outpoint spent is of interest for us
 let mut claimed_outputs_material = Vec::new();
Expand DownExpand Up@@ -1018,7 +1020,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
	{
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 let onchain_events_awaiting_threshold_conf =
 self.onchain_events_awaiting_threshold_conf.drain(..).collect::<Vec<_>>();
 for entry in onchain_events_awaiting_threshold_conf {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ where
	/// Returns a new instance backed by the given [`WalletSource`] that serves as an implementation
	/// of [`CoinSelectionSource`].
	pub fn new(source: W, logger: L) -> Self {
 Self { source, logger, locked_utxos: Mutex::new(HashMap::new()) }
 Self { source, logger, locked_utxos: Mutex::new(new_hash_map()) }
	}

	/// Performs coin selection on the set of UTXOs obtained from
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" + '
Update `full_stack_target` to take an arbitrary config object by TheBlueMatt · Pull Request #2810 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update full_stack_target to take an arbitrary config object#2810

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 9 commits into

from

Feb 5, 2024
 Merged


Update full_stack_target to take an arbitrary config object
#2810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
c725842

Disable fuzzing-reachable debug assertion


TheBlueMatt Dec 24, 2023
248e2f5

Disable fuzzing-reachable debug assertions in `ChannelMonitor`s


TheBlueMatt Dec 25, 2023
f62a96e

Use arbitrary config object in full_stack_target fuzzer


TheBlueMatt Dec 23, 2023
76ed917

Update fuzz CI job to use our MSRV rather than 1.58


TheBlueMatt Jan 18, 2024
3e0d55b

Use utility methods to construct `HashMap`s and `HashSet`s


TheBlueMatt Jan 1, 2024
efbaa41

Stop relying on `Hash{Set,Map}::from_iter` directly


TheBlueMatt Jan 18, 2024
dedc830

Bump `hashbrown` dependency to 0.13


TheBlueMatt Jan 18, 2024
c9e4410

Fix test variable typos


TheBlueMatt Jan 11, 2024
7377cc9

[fuzz] Fix slice copy in `peer_crypt_target`


TheBlueMatt Jan 31, 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


8 changes: 6 additions & 2 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ jobs:
 run: |
 cd lightning
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown,ahash
 cd ..
 - name: Run benchmarks on Rust ${{ matrix.toolchain }}
 run: |
Expand DownExpand Up@@ -176,7 +176,7 @@ jobs:
 fuzz:
 runs-on: ubuntu-latest
 env:
 TOOLCHAIN: 1.58
 TOOLCHAIN: 1.63
 steps:
 - name: Checkout source code
 uses: actions/checkout@v3
Expand All@@ -188,6 +188,10 @@ jobs:
 run: |
 sudo apt-get update
 sudo apt-get -y install build-essential binutils-dev libunwind-dev
 - name: Pin the regex dependency
 run: |
 cd fuzz && cargo update -p regex --precise "1.9.6" --verbose && cd ..
 cd lightning-invoice/fuzz && cargo update -p regex --precise "1.9.6" --verbose
 - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
 run: cd fuzz && RUSTFLAGS="--cfg=fuzzing" cargo test --verbose --color always
 - name: Run fuzzers
Expand Down

2 changes: 1 addition & 1 deletion
bench/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ name = "bench"
harness = false

[features]
hashbrown = ["lightning/hashbrown"]
hashbrown = ["lightning/hashbrown", "lightning/ahash"]

[dependencies]
lightning = { path = "../lightning", features = ["_test_utils", "criterion"] }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ def check_feature(feature):
 pass
 elif feature == "no-std":
 pass
 elif feature == "ahash":
 pass
 elif feature == "hashbrown":
 pass
 elif feature == "backtrace":
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_ut
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.30.2", features = ["secp-lowmemory"] }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
hashbrown = "0.8"
hashbrown = "0.13"

afl = { version = "0.12", optional = true }
honggfuzz = { version = "0.5", optional = true, default-features = false }
Expand Down

47 changes: 17 additions & 30 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
fuzz/src/peer_crypt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ pub fn do_test(data: &[u8]) {
 Ok(len) => len,
 Err(_) => return,
 };
 buf.copy_from_slice(&get_slice!(len as usize + 16));
 buf[..len as usize + 16].copy_from_slice(&get_slice!(len as usize + 16));
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+ 16 might benefit from a comment?
@TheBlueMattTheBlueMattFeb 5, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Meh, its a fuzzer, it'll complain if its wrong :)
 match crypter.decrypt_message(&mut buf[..len as usize + 16]) {
 Ok(_) => {},
 Err(_) => return,
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ bech32 = { version = "0.9.0", default-features = false }
lightning = { version = "0.0.121", path = "../lightning", default-features = false }
secp256k1 = { version = "0.27.0", default-features = false, features = ["recovery", "alloc"] }
num-traits = { version = "0.2.8", default-features = false }
hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.30.2", default-features = false }

Expand Down

15 changes: 13 additions & 2 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ unsafe_revoked_tx_signing = []
# Override signing to not include randomness when generating signatures for test vectors.
_test_vectors = []

no-std = ["hashbrown", "bitcoin/no-std", "core2/alloc", "libm"]
no-std = ["hashbrown", "ahash", "bitcoin/no-std", "core2/alloc", "libm"]
std = ["bitcoin/std"]

# Generates low-r bitcoin signatures, which saves 1 byte in 50% of the cases
Expand All@@ -42,14 +42,25 @@ default = ["std", "grind_signatures"]
[dependencies]
bitcoin = { version = "0.30.2", default-features = false, features = ["secp-recovery"] }

hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
ahash = { version = "0.8", optional = true, default-features = false }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
regex = { version = "1.5.6", optional = true }
backtrace = { version = "0.3", optional = true }

core2 = { version = "0.3.0", optional = true, default-features = false }
libm = { version = "0.2", optional = true, default-features = false }

# Because ahash no longer (kinda poorly) does it for us, (roughly) list out the targets that
# getrandom supports and turn on ahash's `runtime-rng` feature for them.
[target.'cfg(not(any(target_os = "unknown", target_os = "none")))'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

# Not sure what target_os gets set to for sgx, so to be safe always enable runtime-rng for x86_64
# platforms (assuming LDK isn't being used on embedded x86-64 running directly on metal).
[target.'cfg(target_arch = "x86_64")'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

[dev-dependencies]
regex = "1.5.6"

Expand Down

9 changes: 4 additions & 5 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ use crate::ln::channelmanager::ChannelDetails;

use crate::prelude::*;
use crate::sync::{RwLock, RwLockReadGuard, Mutex, MutexGuard};
use core::iter::FromIterator;
use core::ops::Deref;
use core::sync::atomic::{AtomicUsize, Ordering};
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -318,7 +317,7 @@ where C::Target: chain::Filter,
 FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs>
	{
 let err_str = "ChannelMonitor[Update] persistence failed unrecoverably. This indicates we cannot continue normal operation and must shut down.";
 let funding_outpoints: HashSet<OutPoint> = HashSet::from_iter(self.monitors.read().unwrap().keys().cloned());
 let funding_outpoints = hash_set_from_iter(self.monitors.read().unwrap().keys().cloned());
 for funding_outpoint in funding_outpoints.iter() {
 let monitor_lock = self.monitors.read().unwrap();
 if let Some(monitor_state) = monitor_lock.get(funding_outpoint) {
Expand DownExpand Up@@ -420,7 +419,7 @@ where C::Target: chain::Filter,
	/// transactions relevant to the watched channels.
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: RwLock::new(HashMap::new()),
 monitors: RwLock::new(new_hash_map()),
 sync_persistence_id: AtomicCounter::new(),
 chain_source,
 broadcaster,
Expand DownExpand Up@@ -486,9 +485,9 @@ where C::Target: chain::Filter,
	#[cfg(not(c_bindings))]
	/// Lists the pending updates for each [`ChannelMonitor`] (by `OutPoint` being monitored).
	pub fn list_pending_monitor_updates(&self) -> HashMap<OutPoint, Vec<MonitorUpdateId>> {
 self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
hash_map_from_iter(self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
 (*outpoint, holder.pending_monitor_updates.lock().unwrap().clone())
 }).collect()
 }))
	}

	#[cfg(c_bindings)]
Expand Down

37 changes: 21 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1235,7 +1235,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 channel_parameters.clone(), initial_holder_commitment_tx, secp_ctx
 );

 let mut outputs_to_watch = HashMap::new();
 let mut outputs_to_watch = new_hash_map();
 outputs_to_watch.insert(funding_info.0.txid, vec![(funding_info.0.index as u32, funding_info.1.clone())]);

 Self::from_impl(ChannelMonitorImpl {
Expand All@@ -1262,17 +1262,17 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 on_holder_tx_csv: counterparty_channel_parameters.selected_contest_delay,

 commitment_secrets: CounterpartyCommitmentSecrets::new(),
 counterparty_claimable_outpoints: HashMap::new(),
 counterparty_commitment_txn_on_chain: HashMap::new(),
 counterparty_hash_commitment_number: HashMap::new(),
 counterparty_fulfilled_htlcs: HashMap::new(),
 counterparty_claimable_outpoints: new_hash_map(),
 counterparty_commitment_txn_on_chain: new_hash_map(),
 counterparty_hash_commitment_number: new_hash_map(),
 counterparty_fulfilled_htlcs: new_hash_map(),

 prev_holder_signed_commitment_tx: None,
 current_holder_commitment_tx: holder_commitment_tx,
 current_counterparty_commitment_number: 1 << 48,
 current_holder_commitment_number,

 payment_preimages: HashMap::new(),
 payment_preimages: new_hash_map(),
 pending_monitor_events: Vec::new(),
 pending_events: Vec::new(),
 is_processing_pending_events: false,
Expand DownExpand Up@@ -2174,7 +2174,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// HTLCs which were resolved on-chain (i.e. where the final HTLC resolution was done by an
	/// event from this `ChannelMonitor`).
	pub(crate) fn get_all_current_outbound_htlcs(&self) -> HashMap<HTLCSource, (HTLCOutputInCommitment, Option<PaymentPreimage>)> {
 let mut res = HashMap::new();
 let mut res = new_hash_map();
 // Just examine the available counterparty commitment transactions. See docs on
 // `fail_unbroadcast_htlcs`, below, for justification.
 let us = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2226,7 +2226,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 return self.get_all_current_outbound_htlcs();
 }

 let mut res = HashMap::new();
 let mut res = new_hash_map();
 macro_rules! walk_htlcs {
 ($holder_commitment: expr, $htlc_iter: expr) => {
 for (htlc, source) in $htlc_iter {
Expand DownExpand Up@@ -3172,7 +3172,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 } else {
 debug_assert!(false, "We should have per-commitment option for any recognized old commitment txn");
 // Our fuzzers aren't contrained by pesky things like valid signatures, so can
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

nit: constrained
 // spend our funding output with a transaction which doesn't match our past
 // commitment transactions. Thus, we can only debug-assert here when not
 // fuzzing.
 debug_assert!(cfg!(fuzzing), "We should have per-commitment option for any recognized old commitment txn");
 fail_unbroadcast_htlcs!(self, "revoked counterparty", commitment_txid, tx, height,
 block_hash, [].iter().map(|reference| *reference), logger);
 }
Expand DownExpand Up@@ -3679,6 +3683,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 claimable_outpoints.append(&mut new_outpoints);
 if new_outpoints.is_empty() {
 if let Some((mut new_outpoints, new_outputs)) = self.check_spend_holder_transaction(&tx, height, &block_hash, &logger) {
 #[cfg(not(fuzzing))]
 debug_assert!(commitment_tx_to_counterparty_output.is_none(),
 "A commitment transaction matched as both a counterparty and local commitment tx?");
 if !new_outputs.1.is_empty() {
Expand DownExpand Up@@ -3935,7 +3940,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Filters a block's `txdata` for transactions spending watched outputs or for any child
	/// transactions thereof.
	fn filter_block<'a>(&self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
 let mut matched_txn = HashSet::new();
 let mut matched_txn = new_hash_set();
 txdata.iter().filter(|&&(_, tx)| {
 let mut matches = self.spends_watched_output(tx);
 for input in tx.input.iter() {
Expand DownExpand Up@@ -4450,7 +4455,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut counterparty_claimable_outpoints = HashMap::with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 let mut counterparty_claimable_outpoints = hash_map_with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 for _ in 0..counterparty_claimable_outpoints_len {
 let txid: Txid = Readable::read(reader)?;
 let htlcs_count: u64 = Readable::read(reader)?;
Expand All@@ -4464,7 +4469,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_commitment_txn_on_chain_len: u64 = Readable::read(reader)?;
 let mut counterparty_commitment_txn_on_chain = HashMap::with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_commitment_txn_on_chain = hash_map_with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_commitment_txn_on_chain_len {
 let txid: Txid = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4474,7 +4479,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_hash_commitment_number_len: u64 = Readable::read(reader)?;
 let mut counterparty_hash_commitment_number = HashMap::with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_hash_commitment_number = hash_map_with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_hash_commitment_number_len {
 let payment_hash: PaymentHash = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4497,7 +4502,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let current_holder_commitment_number = <U48 as Readable>::read(reader)?.0;

 let payment_preimages_len: u64 = Readable::read(reader)?;
 let mut payment_preimages = HashMap::with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 let mut payment_preimages = hash_map_with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..payment_preimages_len {
 let preimage: PaymentPreimage = Readable::read(reader)?;
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
Expand DownExpand Up@@ -4537,7 +4542,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let outputs_to_watch_len: u64 = Readable::read(reader)?;
 let mut outputs_to_watch = HashMap::with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 let mut outputs_to_watch = hash_map_with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 for _ in 0..outputs_to_watch_len {
 let txid = Readable::read(reader)?;
 let outputs_len: u64 = Readable::read(reader)?;
Expand DownExpand Up@@ -4579,7 +4584,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut counterparty_node_id = None;
 let mut confirmed_commitment_tx_counterparty_output = None;
 let mut spendable_txids_confirmed = Some(Vec::new());
 let mut counterparty_fulfilled_htlcs = Some(HashMap::new());
 let mut counterparty_fulfilled_htlcs = Some(new_hash_map());
 let mut initial_counterparty_commitment_info = None;
 let mut channel_id = None;
 read_tlv_fields!(reader, {
Expand Down

18 changes: 10 additions & 8 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374,13 +374,13 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 signer.provide_channel_parameters(&channel_parameters);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..pending_claim_requests_len {
 pending_claim_requests.insert(Readable::read(reader)?, Readable::read(reader)?);
 }

 let claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut claimable_outpoints = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut claimable_outpoints = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..claimable_outpoints_len {
 let outpoint = Readable::read(reader)?;
 let ancestor_claim_txid = Readable::read(reader)?;
Expand DownExpand Up@@ -445,8 +445,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 prev_holder_commitment: None,
 signer,
 channel_transaction_parameters: channel_parameters,
 pending_claim_requests: HashMap::new(),
 claimable_outpoints: HashMap::new(),
 pending_claim_requests: new_hash_map(),
 claimable_outpoints: new_hash_map(),
 locktimed_packages: BTreeMap::new(),
 onchain_events_awaiting_threshold_conf: Vec::new(),
 pending_claim_events: Vec::new(),
Expand DownExpand Up@@ -686,7 +686,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 if let Some(claim_id) = claim_id {
 if let Some(claim) = self.pending_claim_requests.remove(&claim_id) {
 for outpoint in claim.outpoints() {
 self.claimable_outpoints.remove(&outpoint);
 self.claimable_outpoints.remove(outpoint);
 }
 }
 } else {
Expand DownExpand Up@@ -806,7 +806,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 claim_id
 },
 };
 debug_assert!(self.pending_claim_requests.get(&claim_id).is_none());
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Expand All@@ -832,7 +834,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 F::Target: FeeEstimator,
	{
 log_debug!(logger, "Updating claims view at height {} with {} matched transactions in block {}", cur_height, txn_matched.len(), conf_height);
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 for tx in txn_matched {
 // Scan all input to verify is one of the outpoint spent is of interest for us
 let mut claimed_outputs_material = Vec::new();
Expand DownExpand Up@@ -1018,7 +1020,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
	{
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 let onchain_events_awaiting_threshold_conf =
 self.onchain_events_awaiting_threshold_conf.drain(..).collect::<Vec<_>>();
 for entry in onchain_events_awaiting_threshold_conf {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ where
	/// Returns a new instance backed by the given [`WalletSource`] that serves as an implementation
	/// of [`CoinSelectionSource`].
	pub fn new(source: W, logger: L) -> Self {
 Self { source, logger, locked_utxos: Mutex::new(HashMap::new()) }
 Self { source, logger, locked_utxos: Mutex::new(new_hash_map()) }
	}

	/// Performs coin selection on the set of UTXOs obtained from
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('^' + ".*" + '
Update `full_stack_target` to take an arbitrary config object by TheBlueMatt · Pull Request #2810 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update full_stack_target to take an arbitrary config object#2810

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 9 commits into

from

Feb 5, 2024
 Merged


Update full_stack_target to take an arbitrary config object
#2810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
c725842

Disable fuzzing-reachable debug assertion


TheBlueMatt Dec 24, 2023
248e2f5

Disable fuzzing-reachable debug assertions in `ChannelMonitor`s


TheBlueMatt Dec 25, 2023
f62a96e

Use arbitrary config object in full_stack_target fuzzer


TheBlueMatt Dec 23, 2023
76ed917

Update fuzz CI job to use our MSRV rather than 1.58


TheBlueMatt Jan 18, 2024
3e0d55b

Use utility methods to construct `HashMap`s and `HashSet`s


TheBlueMatt Jan 1, 2024
efbaa41

Stop relying on `Hash{Set,Map}::from_iter` directly


TheBlueMatt Jan 18, 2024
dedc830

Bump `hashbrown` dependency to 0.13


TheBlueMatt Jan 18, 2024
c9e4410

Fix test variable typos


TheBlueMatt Jan 11, 2024
7377cc9

[fuzz] Fix slice copy in `peer_crypt_target`


TheBlueMatt Jan 31, 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


8 changes: 6 additions & 2 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ jobs:
 run: |
 cd lightning
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown,ahash
 cd ..
 - name: Run benchmarks on Rust ${{ matrix.toolchain }}
 run: |
Expand DownExpand Up@@ -176,7 +176,7 @@ jobs:
 fuzz:
 runs-on: ubuntu-latest
 env:
 TOOLCHAIN: 1.58
 TOOLCHAIN: 1.63
 steps:
 - name: Checkout source code
 uses: actions/checkout@v3
Expand All@@ -188,6 +188,10 @@ jobs:
 run: |
 sudo apt-get update
 sudo apt-get -y install build-essential binutils-dev libunwind-dev
 - name: Pin the regex dependency
 run: |
 cd fuzz && cargo update -p regex --precise "1.9.6" --verbose && cd ..
 cd lightning-invoice/fuzz && cargo update -p regex --precise "1.9.6" --verbose
 - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
 run: cd fuzz && RUSTFLAGS="--cfg=fuzzing" cargo test --verbose --color always
 - name: Run fuzzers
Expand Down

2 changes: 1 addition & 1 deletion
bench/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ name = "bench"
harness = false

[features]
hashbrown = ["lightning/hashbrown"]
hashbrown = ["lightning/hashbrown", "lightning/ahash"]

[dependencies]
lightning = { path = "../lightning", features = ["_test_utils", "criterion"] }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ def check_feature(feature):
 pass
 elif feature == "no-std":
 pass
 elif feature == "ahash":
 pass
 elif feature == "hashbrown":
 pass
 elif feature == "backtrace":
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_ut
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.30.2", features = ["secp-lowmemory"] }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
hashbrown = "0.8"
hashbrown = "0.13"

afl = { version = "0.12", optional = true }
honggfuzz = { version = "0.5", optional = true, default-features = false }
Expand Down

47 changes: 17 additions & 30 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
fuzz/src/peer_crypt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ pub fn do_test(data: &[u8]) {
 Ok(len) => len,
 Err(_) => return,
 };
 buf.copy_from_slice(&get_slice!(len as usize + 16));
 buf[..len as usize + 16].copy_from_slice(&get_slice!(len as usize + 16));
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+ 16 might benefit from a comment?
@TheBlueMattTheBlueMattFeb 5, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Meh, its a fuzzer, it'll complain if its wrong :)
 match crypter.decrypt_message(&mut buf[..len as usize + 16]) {
 Ok(_) => {},
 Err(_) => return,
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ bech32 = { version = "0.9.0", default-features = false }
lightning = { version = "0.0.121", path = "../lightning", default-features = false }
secp256k1 = { version = "0.27.0", default-features = false, features = ["recovery", "alloc"] }
num-traits = { version = "0.2.8", default-features = false }
hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.30.2", default-features = false }

Expand Down

15 changes: 13 additions & 2 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ unsafe_revoked_tx_signing = []
# Override signing to not include randomness when generating signatures for test vectors.
_test_vectors = []

no-std = ["hashbrown", "bitcoin/no-std", "core2/alloc", "libm"]
no-std = ["hashbrown", "ahash", "bitcoin/no-std", "core2/alloc", "libm"]
std = ["bitcoin/std"]

# Generates low-r bitcoin signatures, which saves 1 byte in 50% of the cases
Expand All@@ -42,14 +42,25 @@ default = ["std", "grind_signatures"]
[dependencies]
bitcoin = { version = "0.30.2", default-features = false, features = ["secp-recovery"] }

hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
ahash = { version = "0.8", optional = true, default-features = false }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
regex = { version = "1.5.6", optional = true }
backtrace = { version = "0.3", optional = true }

core2 = { version = "0.3.0", optional = true, default-features = false }
libm = { version = "0.2", optional = true, default-features = false }

# Because ahash no longer (kinda poorly) does it for us, (roughly) list out the targets that
# getrandom supports and turn on ahash's `runtime-rng` feature for them.
[target.'cfg(not(any(target_os = "unknown", target_os = "none")))'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

# Not sure what target_os gets set to for sgx, so to be safe always enable runtime-rng for x86_64
# platforms (assuming LDK isn't being used on embedded x86-64 running directly on metal).
[target.'cfg(target_arch = "x86_64")'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

[dev-dependencies]
regex = "1.5.6"

Expand Down

9 changes: 4 additions & 5 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ use crate::ln::channelmanager::ChannelDetails;

use crate::prelude::*;
use crate::sync::{RwLock, RwLockReadGuard, Mutex, MutexGuard};
use core::iter::FromIterator;
use core::ops::Deref;
use core::sync::atomic::{AtomicUsize, Ordering};
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -318,7 +317,7 @@ where C::Target: chain::Filter,
 FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs>
	{
 let err_str = "ChannelMonitor[Update] persistence failed unrecoverably. This indicates we cannot continue normal operation and must shut down.";
 let funding_outpoints: HashSet<OutPoint> = HashSet::from_iter(self.monitors.read().unwrap().keys().cloned());
 let funding_outpoints = hash_set_from_iter(self.monitors.read().unwrap().keys().cloned());
 for funding_outpoint in funding_outpoints.iter() {
 let monitor_lock = self.monitors.read().unwrap();
 if let Some(monitor_state) = monitor_lock.get(funding_outpoint) {
Expand DownExpand Up@@ -420,7 +419,7 @@ where C::Target: chain::Filter,
	/// transactions relevant to the watched channels.
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: RwLock::new(HashMap::new()),
 monitors: RwLock::new(new_hash_map()),
 sync_persistence_id: AtomicCounter::new(),
 chain_source,
 broadcaster,
Expand DownExpand Up@@ -486,9 +485,9 @@ where C::Target: chain::Filter,
	#[cfg(not(c_bindings))]
	/// Lists the pending updates for each [`ChannelMonitor`] (by `OutPoint` being monitored).
	pub fn list_pending_monitor_updates(&self) -> HashMap<OutPoint, Vec<MonitorUpdateId>> {
 self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
hash_map_from_iter(self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
 (*outpoint, holder.pending_monitor_updates.lock().unwrap().clone())
 }).collect()
 }))
	}

	#[cfg(c_bindings)]
Expand Down

37 changes: 21 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1235,7 +1235,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 channel_parameters.clone(), initial_holder_commitment_tx, secp_ctx
 );

 let mut outputs_to_watch = HashMap::new();
 let mut outputs_to_watch = new_hash_map();
 outputs_to_watch.insert(funding_info.0.txid, vec![(funding_info.0.index as u32, funding_info.1.clone())]);

 Self::from_impl(ChannelMonitorImpl {
Expand All@@ -1262,17 +1262,17 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 on_holder_tx_csv: counterparty_channel_parameters.selected_contest_delay,

 commitment_secrets: CounterpartyCommitmentSecrets::new(),
 counterparty_claimable_outpoints: HashMap::new(),
 counterparty_commitment_txn_on_chain: HashMap::new(),
 counterparty_hash_commitment_number: HashMap::new(),
 counterparty_fulfilled_htlcs: HashMap::new(),
 counterparty_claimable_outpoints: new_hash_map(),
 counterparty_commitment_txn_on_chain: new_hash_map(),
 counterparty_hash_commitment_number: new_hash_map(),
 counterparty_fulfilled_htlcs: new_hash_map(),

 prev_holder_signed_commitment_tx: None,
 current_holder_commitment_tx: holder_commitment_tx,
 current_counterparty_commitment_number: 1 << 48,
 current_holder_commitment_number,

 payment_preimages: HashMap::new(),
 payment_preimages: new_hash_map(),
 pending_monitor_events: Vec::new(),
 pending_events: Vec::new(),
 is_processing_pending_events: false,
Expand DownExpand Up@@ -2174,7 +2174,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// HTLCs which were resolved on-chain (i.e. where the final HTLC resolution was done by an
	/// event from this `ChannelMonitor`).
	pub(crate) fn get_all_current_outbound_htlcs(&self) -> HashMap<HTLCSource, (HTLCOutputInCommitment, Option<PaymentPreimage>)> {
 let mut res = HashMap::new();
 let mut res = new_hash_map();
 // Just examine the available counterparty commitment transactions. See docs on
 // `fail_unbroadcast_htlcs`, below, for justification.
 let us = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2226,7 +2226,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 return self.get_all_current_outbound_htlcs();
 }

 let mut res = HashMap::new();
 let mut res = new_hash_map();
 macro_rules! walk_htlcs {
 ($holder_commitment: expr, $htlc_iter: expr) => {
 for (htlc, source) in $htlc_iter {
Expand DownExpand Up@@ -3172,7 +3172,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 } else {
 debug_assert!(false, "We should have per-commitment option for any recognized old commitment txn");
 // Our fuzzers aren't contrained by pesky things like valid signatures, so can
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

nit: constrained
 // spend our funding output with a transaction which doesn't match our past
 // commitment transactions. Thus, we can only debug-assert here when not
 // fuzzing.
 debug_assert!(cfg!(fuzzing), "We should have per-commitment option for any recognized old commitment txn");
 fail_unbroadcast_htlcs!(self, "revoked counterparty", commitment_txid, tx, height,
 block_hash, [].iter().map(|reference| *reference), logger);
 }
Expand DownExpand Up@@ -3679,6 +3683,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 claimable_outpoints.append(&mut new_outpoints);
 if new_outpoints.is_empty() {
 if let Some((mut new_outpoints, new_outputs)) = self.check_spend_holder_transaction(&tx, height, &block_hash, &logger) {
 #[cfg(not(fuzzing))]
 debug_assert!(commitment_tx_to_counterparty_output.is_none(),
 "A commitment transaction matched as both a counterparty and local commitment tx?");
 if !new_outputs.1.is_empty() {
Expand DownExpand Up@@ -3935,7 +3940,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Filters a block's `txdata` for transactions spending watched outputs or for any child
	/// transactions thereof.
	fn filter_block<'a>(&self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
 let mut matched_txn = HashSet::new();
 let mut matched_txn = new_hash_set();
 txdata.iter().filter(|&&(_, tx)| {
 let mut matches = self.spends_watched_output(tx);
 for input in tx.input.iter() {
Expand DownExpand Up@@ -4450,7 +4455,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut counterparty_claimable_outpoints = HashMap::with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 let mut counterparty_claimable_outpoints = hash_map_with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 for _ in 0..counterparty_claimable_outpoints_len {
 let txid: Txid = Readable::read(reader)?;
 let htlcs_count: u64 = Readable::read(reader)?;
Expand All@@ -4464,7 +4469,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_commitment_txn_on_chain_len: u64 = Readable::read(reader)?;
 let mut counterparty_commitment_txn_on_chain = HashMap::with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_commitment_txn_on_chain = hash_map_with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_commitment_txn_on_chain_len {
 let txid: Txid = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4474,7 +4479,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_hash_commitment_number_len: u64 = Readable::read(reader)?;
 let mut counterparty_hash_commitment_number = HashMap::with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_hash_commitment_number = hash_map_with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_hash_commitment_number_len {
 let payment_hash: PaymentHash = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4497,7 +4502,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let current_holder_commitment_number = <U48 as Readable>::read(reader)?.0;

 let payment_preimages_len: u64 = Readable::read(reader)?;
 let mut payment_preimages = HashMap::with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 let mut payment_preimages = hash_map_with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..payment_preimages_len {
 let preimage: PaymentPreimage = Readable::read(reader)?;
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
Expand DownExpand Up@@ -4537,7 +4542,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let outputs_to_watch_len: u64 = Readable::read(reader)?;
 let mut outputs_to_watch = HashMap::with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 let mut outputs_to_watch = hash_map_with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 for _ in 0..outputs_to_watch_len {
 let txid = Readable::read(reader)?;
 let outputs_len: u64 = Readable::read(reader)?;
Expand DownExpand Up@@ -4579,7 +4584,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut counterparty_node_id = None;
 let mut confirmed_commitment_tx_counterparty_output = None;
 let mut spendable_txids_confirmed = Some(Vec::new());
 let mut counterparty_fulfilled_htlcs = Some(HashMap::new());
 let mut counterparty_fulfilled_htlcs = Some(new_hash_map());
 let mut initial_counterparty_commitment_info = None;
 let mut channel_id = None;
 read_tlv_fields!(reader, {
Expand Down

18 changes: 10 additions & 8 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374,13 +374,13 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 signer.provide_channel_parameters(&channel_parameters);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..pending_claim_requests_len {
 pending_claim_requests.insert(Readable::read(reader)?, Readable::read(reader)?);
 }

 let claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut claimable_outpoints = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut claimable_outpoints = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..claimable_outpoints_len {
 let outpoint = Readable::read(reader)?;
 let ancestor_claim_txid = Readable::read(reader)?;
Expand DownExpand Up@@ -445,8 +445,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 prev_holder_commitment: None,
 signer,
 channel_transaction_parameters: channel_parameters,
 pending_claim_requests: HashMap::new(),
 claimable_outpoints: HashMap::new(),
 pending_claim_requests: new_hash_map(),
 claimable_outpoints: new_hash_map(),
 locktimed_packages: BTreeMap::new(),
 onchain_events_awaiting_threshold_conf: Vec::new(),
 pending_claim_events: Vec::new(),
Expand DownExpand Up@@ -686,7 +686,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 if let Some(claim_id) = claim_id {
 if let Some(claim) = self.pending_claim_requests.remove(&claim_id) {
 for outpoint in claim.outpoints() {
 self.claimable_outpoints.remove(&outpoint);
 self.claimable_outpoints.remove(outpoint);
 }
 }
 } else {
Expand DownExpand Up@@ -806,7 +806,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 claim_id
 },
 };
 debug_assert!(self.pending_claim_requests.get(&claim_id).is_none());
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Expand All@@ -832,7 +834,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 F::Target: FeeEstimator,
	{
 log_debug!(logger, "Updating claims view at height {} with {} matched transactions in block {}", cur_height, txn_matched.len(), conf_height);
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 for tx in txn_matched {
 // Scan all input to verify is one of the outpoint spent is of interest for us
 let mut claimed_outputs_material = Vec::new();
Expand DownExpand Up@@ -1018,7 +1020,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
	{
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 let onchain_events_awaiting_threshold_conf =
 self.onchain_events_awaiting_threshold_conf.drain(..).collect::<Vec<_>>();
 for entry in onchain_events_awaiting_threshold_conf {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ where
	/// Returns a new instance backed by the given [`WalletSource`] that serves as an implementation
	/// of [`CoinSelectionSource`].
	pub fn new(source: W, logger: L) -> Self {
 Self { source, logger, locked_utxos: Mutex::new(HashMap::new()) }
 Self { source, logger, locked_utxos: Mutex::new(new_hash_map()) }
	}

	/// Performs coin selection on the set of UTXOs obtained from
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('^' + ".*" + '
Update `full_stack_target` to take an arbitrary config object by TheBlueMatt · Pull Request #2810 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update full_stack_target to take an arbitrary config object#2810

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 9 commits into

from

Feb 5, 2024
 Merged


Update full_stack_target to take an arbitrary config object
#2810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
c725842

Disable fuzzing-reachable debug assertion


TheBlueMatt Dec 24, 2023
248e2f5

Disable fuzzing-reachable debug assertions in `ChannelMonitor`s


TheBlueMatt Dec 25, 2023
f62a96e

Use arbitrary config object in full_stack_target fuzzer


TheBlueMatt Dec 23, 2023
76ed917

Update fuzz CI job to use our MSRV rather than 1.58


TheBlueMatt Jan 18, 2024
3e0d55b

Use utility methods to construct `HashMap`s and `HashSet`s


TheBlueMatt Jan 1, 2024
efbaa41

Stop relying on `Hash{Set,Map}::from_iter` directly


TheBlueMatt Jan 18, 2024
dedc830

Bump `hashbrown` dependency to 0.13


TheBlueMatt Jan 18, 2024
c9e4410

Fix test variable typos


TheBlueMatt Jan 11, 2024
7377cc9

[fuzz] Fix slice copy in `peer_crypt_target`


TheBlueMatt Jan 31, 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


8 changes: 6 additions & 2 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ jobs:
 run: |
 cd lightning
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown,ahash
 cd ..
 - name: Run benchmarks on Rust ${{ matrix.toolchain }}
 run: |
Expand DownExpand Up@@ -176,7 +176,7 @@ jobs:
 fuzz:
 runs-on: ubuntu-latest
 env:
 TOOLCHAIN: 1.58
 TOOLCHAIN: 1.63
 steps:
 - name: Checkout source code
 uses: actions/checkout@v3
Expand All@@ -188,6 +188,10 @@ jobs:
 run: |
 sudo apt-get update
 sudo apt-get -y install build-essential binutils-dev libunwind-dev
 - name: Pin the regex dependency
 run: |
 cd fuzz && cargo update -p regex --precise "1.9.6" --verbose && cd ..
 cd lightning-invoice/fuzz && cargo update -p regex --precise "1.9.6" --verbose
 - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
 run: cd fuzz && RUSTFLAGS="--cfg=fuzzing" cargo test --verbose --color always
 - name: Run fuzzers
Expand Down

2 changes: 1 addition & 1 deletion
bench/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ name = "bench"
harness = false

[features]
hashbrown = ["lightning/hashbrown"]
hashbrown = ["lightning/hashbrown", "lightning/ahash"]

[dependencies]
lightning = { path = "../lightning", features = ["_test_utils", "criterion"] }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ def check_feature(feature):
 pass
 elif feature == "no-std":
 pass
 elif feature == "ahash":
 pass
 elif feature == "hashbrown":
 pass
 elif feature == "backtrace":
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_ut
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.30.2", features = ["secp-lowmemory"] }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
hashbrown = "0.8"
hashbrown = "0.13"

afl = { version = "0.12", optional = true }
honggfuzz = { version = "0.5", optional = true, default-features = false }
Expand Down

47 changes: 17 additions & 30 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
fuzz/src/peer_crypt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ pub fn do_test(data: &[u8]) {
 Ok(len) => len,
 Err(_) => return,
 };
 buf.copy_from_slice(&get_slice!(len as usize + 16));
 buf[..len as usize + 16].copy_from_slice(&get_slice!(len as usize + 16));
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+ 16 might benefit from a comment?
@TheBlueMattTheBlueMattFeb 5, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Meh, its a fuzzer, it'll complain if its wrong :)
 match crypter.decrypt_message(&mut buf[..len as usize + 16]) {
 Ok(_) => {},
 Err(_) => return,
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ bech32 = { version = "0.9.0", default-features = false }
lightning = { version = "0.0.121", path = "../lightning", default-features = false }
secp256k1 = { version = "0.27.0", default-features = false, features = ["recovery", "alloc"] }
num-traits = { version = "0.2.8", default-features = false }
hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.30.2", default-features = false }

Expand Down

15 changes: 13 additions & 2 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ unsafe_revoked_tx_signing = []
# Override signing to not include randomness when generating signatures for test vectors.
_test_vectors = []

no-std = ["hashbrown", "bitcoin/no-std", "core2/alloc", "libm"]
no-std = ["hashbrown", "ahash", "bitcoin/no-std", "core2/alloc", "libm"]
std = ["bitcoin/std"]

# Generates low-r bitcoin signatures, which saves 1 byte in 50% of the cases
Expand All@@ -42,14 +42,25 @@ default = ["std", "grind_signatures"]
[dependencies]
bitcoin = { version = "0.30.2", default-features = false, features = ["secp-recovery"] }

hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
ahash = { version = "0.8", optional = true, default-features = false }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
regex = { version = "1.5.6", optional = true }
backtrace = { version = "0.3", optional = true }

core2 = { version = "0.3.0", optional = true, default-features = false }
libm = { version = "0.2", optional = true, default-features = false }

# Because ahash no longer (kinda poorly) does it for us, (roughly) list out the targets that
# getrandom supports and turn on ahash's `runtime-rng` feature for them.
[target.'cfg(not(any(target_os = "unknown", target_os = "none")))'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

# Not sure what target_os gets set to for sgx, so to be safe always enable runtime-rng for x86_64
# platforms (assuming LDK isn't being used on embedded x86-64 running directly on metal).
[target.'cfg(target_arch = "x86_64")'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

[dev-dependencies]
regex = "1.5.6"

Expand Down

9 changes: 4 additions & 5 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ use crate::ln::channelmanager::ChannelDetails;

use crate::prelude::*;
use crate::sync::{RwLock, RwLockReadGuard, Mutex, MutexGuard};
use core::iter::FromIterator;
use core::ops::Deref;
use core::sync::atomic::{AtomicUsize, Ordering};
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -318,7 +317,7 @@ where C::Target: chain::Filter,
 FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs>
	{
 let err_str = "ChannelMonitor[Update] persistence failed unrecoverably. This indicates we cannot continue normal operation and must shut down.";
 let funding_outpoints: HashSet<OutPoint> = HashSet::from_iter(self.monitors.read().unwrap().keys().cloned());
 let funding_outpoints = hash_set_from_iter(self.monitors.read().unwrap().keys().cloned());
 for funding_outpoint in funding_outpoints.iter() {
 let monitor_lock = self.monitors.read().unwrap();
 if let Some(monitor_state) = monitor_lock.get(funding_outpoint) {
Expand DownExpand Up@@ -420,7 +419,7 @@ where C::Target: chain::Filter,
	/// transactions relevant to the watched channels.
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: RwLock::new(HashMap::new()),
 monitors: RwLock::new(new_hash_map()),
 sync_persistence_id: AtomicCounter::new(),
 chain_source,
 broadcaster,
Expand DownExpand Up@@ -486,9 +485,9 @@ where C::Target: chain::Filter,
	#[cfg(not(c_bindings))]
	/// Lists the pending updates for each [`ChannelMonitor`] (by `OutPoint` being monitored).
	pub fn list_pending_monitor_updates(&self) -> HashMap<OutPoint, Vec<MonitorUpdateId>> {
 self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
hash_map_from_iter(self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
 (*outpoint, holder.pending_monitor_updates.lock().unwrap().clone())
 }).collect()
 }))
	}

	#[cfg(c_bindings)]
Expand Down

37 changes: 21 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1235,7 +1235,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 channel_parameters.clone(), initial_holder_commitment_tx, secp_ctx
 );

 let mut outputs_to_watch = HashMap::new();
 let mut outputs_to_watch = new_hash_map();
 outputs_to_watch.insert(funding_info.0.txid, vec![(funding_info.0.index as u32, funding_info.1.clone())]);

 Self::from_impl(ChannelMonitorImpl {
Expand All@@ -1262,17 +1262,17 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 on_holder_tx_csv: counterparty_channel_parameters.selected_contest_delay,

 commitment_secrets: CounterpartyCommitmentSecrets::new(),
 counterparty_claimable_outpoints: HashMap::new(),
 counterparty_commitment_txn_on_chain: HashMap::new(),
 counterparty_hash_commitment_number: HashMap::new(),
 counterparty_fulfilled_htlcs: HashMap::new(),
 counterparty_claimable_outpoints: new_hash_map(),
 counterparty_commitment_txn_on_chain: new_hash_map(),
 counterparty_hash_commitment_number: new_hash_map(),
 counterparty_fulfilled_htlcs: new_hash_map(),

 prev_holder_signed_commitment_tx: None,
 current_holder_commitment_tx: holder_commitment_tx,
 current_counterparty_commitment_number: 1 << 48,
 current_holder_commitment_number,

 payment_preimages: HashMap::new(),
 payment_preimages: new_hash_map(),
 pending_monitor_events: Vec::new(),
 pending_events: Vec::new(),
 is_processing_pending_events: false,
Expand DownExpand Up@@ -2174,7 +2174,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// HTLCs which were resolved on-chain (i.e. where the final HTLC resolution was done by an
	/// event from this `ChannelMonitor`).
	pub(crate) fn get_all_current_outbound_htlcs(&self) -> HashMap<HTLCSource, (HTLCOutputInCommitment, Option<PaymentPreimage>)> {
 let mut res = HashMap::new();
 let mut res = new_hash_map();
 // Just examine the available counterparty commitment transactions. See docs on
 // `fail_unbroadcast_htlcs`, below, for justification.
 let us = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2226,7 +2226,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 return self.get_all_current_outbound_htlcs();
 }

 let mut res = HashMap::new();
 let mut res = new_hash_map();
 macro_rules! walk_htlcs {
 ($holder_commitment: expr, $htlc_iter: expr) => {
 for (htlc, source) in $htlc_iter {
Expand DownExpand Up@@ -3172,7 +3172,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 } else {
 debug_assert!(false, "We should have per-commitment option for any recognized old commitment txn");
 // Our fuzzers aren't contrained by pesky things like valid signatures, so can
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

nit: constrained
 // spend our funding output with a transaction which doesn't match our past
 // commitment transactions. Thus, we can only debug-assert here when not
 // fuzzing.
 debug_assert!(cfg!(fuzzing), "We should have per-commitment option for any recognized old commitment txn");
 fail_unbroadcast_htlcs!(self, "revoked counterparty", commitment_txid, tx, height,
 block_hash, [].iter().map(|reference| *reference), logger);
 }
Expand DownExpand Up@@ -3679,6 +3683,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 claimable_outpoints.append(&mut new_outpoints);
 if new_outpoints.is_empty() {
 if let Some((mut new_outpoints, new_outputs)) = self.check_spend_holder_transaction(&tx, height, &block_hash, &logger) {
 #[cfg(not(fuzzing))]
 debug_assert!(commitment_tx_to_counterparty_output.is_none(),
 "A commitment transaction matched as both a counterparty and local commitment tx?");
 if !new_outputs.1.is_empty() {
Expand DownExpand Up@@ -3935,7 +3940,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Filters a block's `txdata` for transactions spending watched outputs or for any child
	/// transactions thereof.
	fn filter_block<'a>(&self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
 let mut matched_txn = HashSet::new();
 let mut matched_txn = new_hash_set();
 txdata.iter().filter(|&&(_, tx)| {
 let mut matches = self.spends_watched_output(tx);
 for input in tx.input.iter() {
Expand DownExpand Up@@ -4450,7 +4455,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut counterparty_claimable_outpoints = HashMap::with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 let mut counterparty_claimable_outpoints = hash_map_with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 for _ in 0..counterparty_claimable_outpoints_len {
 let txid: Txid = Readable::read(reader)?;
 let htlcs_count: u64 = Readable::read(reader)?;
Expand All@@ -4464,7 +4469,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_commitment_txn_on_chain_len: u64 = Readable::read(reader)?;
 let mut counterparty_commitment_txn_on_chain = HashMap::with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_commitment_txn_on_chain = hash_map_with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_commitment_txn_on_chain_len {
 let txid: Txid = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4474,7 +4479,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_hash_commitment_number_len: u64 = Readable::read(reader)?;
 let mut counterparty_hash_commitment_number = HashMap::with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_hash_commitment_number = hash_map_with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_hash_commitment_number_len {
 let payment_hash: PaymentHash = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4497,7 +4502,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let current_holder_commitment_number = <U48 as Readable>::read(reader)?.0;

 let payment_preimages_len: u64 = Readable::read(reader)?;
 let mut payment_preimages = HashMap::with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 let mut payment_preimages = hash_map_with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..payment_preimages_len {
 let preimage: PaymentPreimage = Readable::read(reader)?;
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
Expand DownExpand Up@@ -4537,7 +4542,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let outputs_to_watch_len: u64 = Readable::read(reader)?;
 let mut outputs_to_watch = HashMap::with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 let mut outputs_to_watch = hash_map_with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 for _ in 0..outputs_to_watch_len {
 let txid = Readable::read(reader)?;
 let outputs_len: u64 = Readable::read(reader)?;
Expand DownExpand Up@@ -4579,7 +4584,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut counterparty_node_id = None;
 let mut confirmed_commitment_tx_counterparty_output = None;
 let mut spendable_txids_confirmed = Some(Vec::new());
 let mut counterparty_fulfilled_htlcs = Some(HashMap::new());
 let mut counterparty_fulfilled_htlcs = Some(new_hash_map());
 let mut initial_counterparty_commitment_info = None;
 let mut channel_id = None;
 read_tlv_fields!(reader, {
Expand Down

18 changes: 10 additions & 8 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374,13 +374,13 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 signer.provide_channel_parameters(&channel_parameters);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..pending_claim_requests_len {
 pending_claim_requests.insert(Readable::read(reader)?, Readable::read(reader)?);
 }

 let claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut claimable_outpoints = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut claimable_outpoints = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..claimable_outpoints_len {
 let outpoint = Readable::read(reader)?;
 let ancestor_claim_txid = Readable::read(reader)?;
Expand DownExpand Up@@ -445,8 +445,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 prev_holder_commitment: None,
 signer,
 channel_transaction_parameters: channel_parameters,
 pending_claim_requests: HashMap::new(),
 claimable_outpoints: HashMap::new(),
 pending_claim_requests: new_hash_map(),
 claimable_outpoints: new_hash_map(),
 locktimed_packages: BTreeMap::new(),
 onchain_events_awaiting_threshold_conf: Vec::new(),
 pending_claim_events: Vec::new(),
Expand DownExpand Up@@ -686,7 +686,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 if let Some(claim_id) = claim_id {
 if let Some(claim) = self.pending_claim_requests.remove(&claim_id) {
 for outpoint in claim.outpoints() {
 self.claimable_outpoints.remove(&outpoint);
 self.claimable_outpoints.remove(outpoint);
 }
 }
 } else {
Expand DownExpand Up@@ -806,7 +806,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 claim_id
 },
 };
 debug_assert!(self.pending_claim_requests.get(&claim_id).is_none());
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Expand All@@ -832,7 +834,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 F::Target: FeeEstimator,
	{
 log_debug!(logger, "Updating claims view at height {} with {} matched transactions in block {}", cur_height, txn_matched.len(), conf_height);
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 for tx in txn_matched {
 // Scan all input to verify is one of the outpoint spent is of interest for us
 let mut claimed_outputs_material = Vec::new();
Expand DownExpand Up@@ -1018,7 +1020,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
	{
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 let onchain_events_awaiting_threshold_conf =
 self.onchain_events_awaiting_threshold_conf.drain(..).collect::<Vec<_>>();
 for entry in onchain_events_awaiting_threshold_conf {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ where
	/// Returns a new instance backed by the given [`WalletSource`] that serves as an implementation
	/// of [`CoinSelectionSource`].
	pub fn new(source: W, logger: L) -> Self {
 Self { source, logger, locked_utxos: Mutex::new(HashMap::new()) }
 Self { source, logger, locked_utxos: Mutex::new(new_hash_map()) }
	}

	/// Performs coin selection on the set of UTXOs obtained from
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); }
})();
})();
Update `full_stack_target` to take an arbitrary config object by TheBlueMatt · Pull Request #2810 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update full_stack_target to take an arbitrary config object#2810

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 9 commits into

from

Feb 5, 2024
 Merged


Update full_stack_target to take an arbitrary config object
#2810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
c725842

Disable fuzzing-reachable debug assertion


TheBlueMatt Dec 24, 2023
248e2f5

Disable fuzzing-reachable debug assertions in `ChannelMonitor`s


TheBlueMatt Dec 25, 2023
f62a96e

Use arbitrary config object in full_stack_target fuzzer


TheBlueMatt Dec 23, 2023
76ed917

Update fuzz CI job to use our MSRV rather than 1.58


TheBlueMatt Jan 18, 2024
3e0d55b

Use utility methods to construct `HashMap`s and `HashSet`s


TheBlueMatt Jan 1, 2024
efbaa41

Stop relying on `Hash{Set,Map}::from_iter` directly


TheBlueMatt Jan 18, 2024
dedc830

Bump `hashbrown` dependency to 0.13


TheBlueMatt Jan 18, 2024
c9e4410

Fix test variable typos


TheBlueMatt Jan 11, 2024
7377cc9

[fuzz] Fix slice copy in `peer_crypt_target`


TheBlueMatt Jan 31, 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


8 changes: 6 additions & 2 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ jobs:
 run: |
 cd lightning
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown
 RUSTFLAGS="--cfg=require_route_graph_test" cargo test --features hashbrown,ahash
 cd ..
 - name: Run benchmarks on Rust ${{ matrix.toolchain }}
 run: |
Expand DownExpand Up@@ -176,7 +176,7 @@ jobs:
 fuzz:
 runs-on: ubuntu-latest
 env:
 TOOLCHAIN: 1.58
 TOOLCHAIN: 1.63
 steps:
 - name: Checkout source code
 uses: actions/checkout@v3
Expand All@@ -188,6 +188,10 @@ jobs:
 run: |
 sudo apt-get update
 sudo apt-get -y install build-essential binutils-dev libunwind-dev
 - name: Pin the regex dependency
 run: |
 cd fuzz && cargo update -p regex --precise "1.9.6" --verbose && cd ..
 cd lightning-invoice/fuzz && cargo update -p regex --precise "1.9.6" --verbose
 - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
 run: cd fuzz && RUSTFLAGS="--cfg=fuzzing" cargo test --verbose --color always
 - name: Run fuzzers
Expand Down

2 changes: 1 addition & 1 deletion
bench/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ name = "bench"
harness = false

[features]
hashbrown = ["lightning/hashbrown"]
hashbrown = ["lightning/hashbrown", "lightning/ahash"]

[dependencies]
lightning = { path = "../lightning", features = ["_test_utils", "criterion"] }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ def check_feature(feature):
 pass
 elif feature == "no-std":
 pass
 elif feature == "ahash":
 pass
 elif feature == "hashbrown":
 pass
 elif feature == "backtrace":
Expand Down

2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_ut
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.30.2", features = ["secp-lowmemory"] }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
hashbrown = "0.8"
hashbrown = "0.13"

afl = { version = "0.12", optional = true }
honggfuzz = { version = "0.5", optional = true, default-features = false }
Expand Down

47 changes: 17 additions & 30 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
fuzz/src/peer_crypt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ pub fn do_test(data: &[u8]) {
 Ok(len) => len,
 Err(_) => return,
 };
 buf.copy_from_slice(&get_slice!(len as usize + 16));
 buf[..len as usize + 16].copy_from_slice(&get_slice!(len as usize + 16));
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+ 16 might benefit from a comment?
@TheBlueMattTheBlueMattFeb 5, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Meh, its a fuzzer, it'll complain if its wrong :)
 match crypter.decrypt_message(&mut buf[..len as usize + 16]) {
 Ok(_) => {},
 Err(_) => return,
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ bech32 = { version = "0.9.0", default-features = false }
lightning = { version = "0.0.121", path = "../lightning", default-features = false }
secp256k1 = { version = "0.27.0", default-features = false, features = ["recovery", "alloc"] }
num-traits = { version = "0.2.8", default-features = false }
hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.30.2", default-features = false }

Expand Down

15 changes: 13 additions & 2 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ unsafe_revoked_tx_signing = []
# Override signing to not include randomness when generating signatures for test vectors.
_test_vectors = []

no-std = ["hashbrown", "bitcoin/no-std", "core2/alloc", "libm"]
no-std = ["hashbrown", "ahash", "bitcoin/no-std", "core2/alloc", "libm"]
std = ["bitcoin/std"]

# Generates low-r bitcoin signatures, which saves 1 byte in 50% of the cases
Expand All@@ -42,14 +42,25 @@ default = ["std", "grind_signatures"]
[dependencies]
bitcoin = { version = "0.30.2", default-features = false, features = ["secp-recovery"] }

hashbrown = { version = "0.8", optional = true }
hashbrown = { version = "0.13", optional = true }
ahash = { version = "0.8", optional = true, default-features = false }
hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
regex = { version = "1.5.6", optional = true }
backtrace = { version = "0.3", optional = true }

core2 = { version = "0.3.0", optional = true, default-features = false }
libm = { version = "0.2", optional = true, default-features = false }

# Because ahash no longer (kinda poorly) does it for us, (roughly) list out the targets that
# getrandom supports and turn on ahash's `runtime-rng` feature for them.
[target.'cfg(not(any(target_os = "unknown", target_os = "none")))'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

# Not sure what target_os gets set to for sgx, so to be safe always enable runtime-rng for x86_64
# platforms (assuming LDK isn't being used on embedded x86-64 running directly on metal).
[target.'cfg(target_arch = "x86_64")'.dependencies]
ahash = { version = "0.8", optional = true, default-features = false, features = ["runtime-rng"] }

[dev-dependencies]
regex = "1.5.6"

Expand Down

9 changes: 4 additions & 5 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ use crate::ln::channelmanager::ChannelDetails;

use crate::prelude::*;
use crate::sync::{RwLock, RwLockReadGuard, Mutex, MutexGuard};
use core::iter::FromIterator;
use core::ops::Deref;
use core::sync::atomic::{AtomicUsize, Ordering};
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -318,7 +317,7 @@ where C::Target: chain::Filter,
 FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs>
	{
 let err_str = "ChannelMonitor[Update] persistence failed unrecoverably. This indicates we cannot continue normal operation and must shut down.";
 let funding_outpoints: HashSet<OutPoint> = HashSet::from_iter(self.monitors.read().unwrap().keys().cloned());
 let funding_outpoints = hash_set_from_iter(self.monitors.read().unwrap().keys().cloned());
 for funding_outpoint in funding_outpoints.iter() {
 let monitor_lock = self.monitors.read().unwrap();
 if let Some(monitor_state) = monitor_lock.get(funding_outpoint) {
Expand DownExpand Up@@ -420,7 +419,7 @@ where C::Target: chain::Filter,
	/// transactions relevant to the watched channels.
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: RwLock::new(HashMap::new()),
 monitors: RwLock::new(new_hash_map()),
 sync_persistence_id: AtomicCounter::new(),
 chain_source,
 broadcaster,
Expand DownExpand Up@@ -486,9 +485,9 @@ where C::Target: chain::Filter,
	#[cfg(not(c_bindings))]
	/// Lists the pending updates for each [`ChannelMonitor`] (by `OutPoint` being monitored).
	pub fn list_pending_monitor_updates(&self) -> HashMap<OutPoint, Vec<MonitorUpdateId>> {
 self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
hash_map_from_iter(self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
 (*outpoint, holder.pending_monitor_updates.lock().unwrap().clone())
 }).collect()
 }))
	}

	#[cfg(c_bindings)]
Expand Down

37 changes: 21 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1235,7 +1235,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 channel_parameters.clone(), initial_holder_commitment_tx, secp_ctx
 );

 let mut outputs_to_watch = HashMap::new();
 let mut outputs_to_watch = new_hash_map();
 outputs_to_watch.insert(funding_info.0.txid, vec![(funding_info.0.index as u32, funding_info.1.clone())]);

 Self::from_impl(ChannelMonitorImpl {
Expand All@@ -1262,17 +1262,17 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 on_holder_tx_csv: counterparty_channel_parameters.selected_contest_delay,

 commitment_secrets: CounterpartyCommitmentSecrets::new(),
 counterparty_claimable_outpoints: HashMap::new(),
 counterparty_commitment_txn_on_chain: HashMap::new(),
 counterparty_hash_commitment_number: HashMap::new(),
 counterparty_fulfilled_htlcs: HashMap::new(),
 counterparty_claimable_outpoints: new_hash_map(),
 counterparty_commitment_txn_on_chain: new_hash_map(),
 counterparty_hash_commitment_number: new_hash_map(),
 counterparty_fulfilled_htlcs: new_hash_map(),

 prev_holder_signed_commitment_tx: None,
 current_holder_commitment_tx: holder_commitment_tx,
 current_counterparty_commitment_number: 1 << 48,
 current_holder_commitment_number,

 payment_preimages: HashMap::new(),
 payment_preimages: new_hash_map(),
 pending_monitor_events: Vec::new(),
 pending_events: Vec::new(),
 is_processing_pending_events: false,
Expand DownExpand Up@@ -2174,7 +2174,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
	/// HTLCs which were resolved on-chain (i.e. where the final HTLC resolution was done by an
	/// event from this `ChannelMonitor`).
	pub(crate) fn get_all_current_outbound_htlcs(&self) -> HashMap<HTLCSource, (HTLCOutputInCommitment, Option<PaymentPreimage>)> {
 let mut res = HashMap::new();
 let mut res = new_hash_map();
 // Just examine the available counterparty commitment transactions. See docs on
 // `fail_unbroadcast_htlcs`, below, for justification.
 let us = self.inner.lock().unwrap();
Expand DownExpand Up@@ -2226,7 +2226,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 return self.get_all_current_outbound_htlcs();
 }

 let mut res = HashMap::new();
 let mut res = new_hash_map();
 macro_rules! walk_htlcs {
 ($holder_commitment: expr, $htlc_iter: expr) => {
 for (htlc, source) in $htlc_iter {
Expand DownExpand Up@@ -3172,7 +3172,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 } else {
 debug_assert!(false, "We should have per-commitment option for any recognized old commitment txn");
 // Our fuzzers aren't contrained by pesky things like valid signatures, so can
@arik-soarik-soFeb 5, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

nit: constrained
 // spend our funding output with a transaction which doesn't match our past
 // commitment transactions. Thus, we can only debug-assert here when not
 // fuzzing.
 debug_assert!(cfg!(fuzzing), "We should have per-commitment option for any recognized old commitment txn");
 fail_unbroadcast_htlcs!(self, "revoked counterparty", commitment_txid, tx, height,
 block_hash, [].iter().map(|reference| *reference), logger);
 }
Expand DownExpand Up@@ -3679,6 +3683,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 claimable_outpoints.append(&mut new_outpoints);
 if new_outpoints.is_empty() {
 if let Some((mut new_outpoints, new_outputs)) = self.check_spend_holder_transaction(&tx, height, &block_hash, &logger) {
 #[cfg(not(fuzzing))]
 debug_assert!(commitment_tx_to_counterparty_output.is_none(),
 "A commitment transaction matched as both a counterparty and local commitment tx?");
 if !new_outputs.1.is_empty() {
Expand DownExpand Up@@ -3935,7 +3940,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Filters a block's `txdata` for transactions spending watched outputs or for any child
	/// transactions thereof.
	fn filter_block<'a>(&self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
 let mut matched_txn = HashSet::new();
 let mut matched_txn = new_hash_set();
 txdata.iter().filter(|&&(_, tx)| {
 let mut matches = self.spends_watched_output(tx);
 for input in tx.input.iter() {
Expand DownExpand Up@@ -4450,7 +4455,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut counterparty_claimable_outpoints = HashMap::with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 let mut counterparty_claimable_outpoints = hash_map_with_capacity(cmp::min(counterparty_claimable_outpoints_len as usize, MAX_ALLOC_SIZE / 64));
 for _ in 0..counterparty_claimable_outpoints_len {
 let txid: Txid = Readable::read(reader)?;
 let htlcs_count: u64 = Readable::read(reader)?;
Expand All@@ -4464,7 +4469,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_commitment_txn_on_chain_len: u64 = Readable::read(reader)?;
 let mut counterparty_commitment_txn_on_chain = HashMap::with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_commitment_txn_on_chain = hash_map_with_capacity(cmp::min(counterparty_commitment_txn_on_chain_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_commitment_txn_on_chain_len {
 let txid: Txid = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4474,7 +4479,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let counterparty_hash_commitment_number_len: u64 = Readable::read(reader)?;
 let mut counterparty_hash_commitment_number = HashMap::with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 let mut counterparty_hash_commitment_number = hash_map_with_capacity(cmp::min(counterparty_hash_commitment_number_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..counterparty_hash_commitment_number_len {
 let payment_hash: PaymentHash = Readable::read(reader)?;
 let commitment_number = <U48 as Readable>::read(reader)?.0;
Expand All@@ -4497,7 +4502,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let current_holder_commitment_number = <U48 as Readable>::read(reader)?.0;

 let payment_preimages_len: u64 = Readable::read(reader)?;
 let mut payment_preimages = HashMap::with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 let mut payment_preimages = hash_map_with_capacity(cmp::min(payment_preimages_len as usize, MAX_ALLOC_SIZE / 32));
 for _ in 0..payment_preimages_len {
 let preimage: PaymentPreimage = Readable::read(reader)?;
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
Expand DownExpand Up@@ -4537,7 +4542,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }

 let outputs_to_watch_len: u64 = Readable::read(reader)?;
 let mut outputs_to_watch = HashMap::with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 let mut outputs_to_watch = hash_map_with_capacity(cmp::min(outputs_to_watch_len as usize, MAX_ALLOC_SIZE / (mem::size_of::<Txid>() + mem::size_of::<u32>() + mem::size_of::<Vec<ScriptBuf>>())));
 for _ in 0..outputs_to_watch_len {
 let txid = Readable::read(reader)?;
 let outputs_len: u64 = Readable::read(reader)?;
Expand DownExpand Up@@ -4579,7 +4584,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut counterparty_node_id = None;
 let mut confirmed_commitment_tx_counterparty_output = None;
 let mut spendable_txids_confirmed = Some(Vec::new());
 let mut counterparty_fulfilled_htlcs = Some(HashMap::new());
 let mut counterparty_fulfilled_htlcs = Some(new_hash_map());
 let mut initial_counterparty_commitment_info = None;
 let mut channel_id = None;
 read_tlv_fields!(reader, {
Expand Down

18 changes: 10 additions & 8 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374,13 +374,13 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 signer.provide_channel_parameters(&channel_parameters);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..pending_claim_requests_len {
 pending_claim_requests.insert(Readable::read(reader)?, Readable::read(reader)?);
 }

 let claimable_outpoints_len: u64 = Readable::read(reader)?;
 let mut claimable_outpoints = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 let mut claimable_outpoints = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 for _ in 0..claimable_outpoints_len {
 let outpoint = Readable::read(reader)?;
 let ancestor_claim_txid = Readable::read(reader)?;
Expand DownExpand Up@@ -445,8 +445,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 prev_holder_commitment: None,
 signer,
 channel_transaction_parameters: channel_parameters,
 pending_claim_requests: HashMap::new(),
 claimable_outpoints: HashMap::new(),
 pending_claim_requests: new_hash_map(),
 claimable_outpoints: new_hash_map(),
 locktimed_packages: BTreeMap::new(),
 onchain_events_awaiting_threshold_conf: Vec::new(),
 pending_claim_events: Vec::new(),
Expand DownExpand Up@@ -686,7 +686,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 if let Some(claim_id) = claim_id {
 if let Some(claim) = self.pending_claim_requests.remove(&claim_id) {
 for outpoint in claim.outpoints() {
 self.claimable_outpoints.remove(&outpoint);
 self.claimable_outpoints.remove(outpoint);
 }
 }
 } else {
Expand DownExpand Up@@ -806,7 +806,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 claim_id
 },
 };
 debug_assert!(self.pending_claim_requests.get(&claim_id).is_none());
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Expand All@@ -832,7 +834,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 F::Target: FeeEstimator,
	{
 log_debug!(logger, "Updating claims view at height {} with {} matched transactions in block {}", cur_height, txn_matched.len(), conf_height);
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 for tx in txn_matched {
 // Scan all input to verify is one of the outpoint spent is of interest for us
 let mut claimed_outputs_material = Vec::new();
Expand DownExpand Up@@ -1018,7 +1020,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
	{
 let mut bump_candidates = HashMap::new();
 let mut bump_candidates = new_hash_map();
 let onchain_events_awaiting_threshold_conf =
 self.onchain_events_awaiting_threshold_conf.drain(..).collect::<Vec<_>>();
 for entry in onchain_events_awaiting_threshold_conf {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/events/bump_transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -391,7 +391,7 @@ where
	/// Returns a new instance backed by the given [`WalletSource`] that serves as an implementation
	/// of [`CoinSelectionSource`].
	pub fn new(source: W, logger: L) -> Self {
 Self { source, logger, locked_utxos: Mutex::new(HashMap::new()) }
 Self { source, logger, locked_utxos: Mutex::new(new_hash_map()) }
	}

	/// Performs coin selection on the set of UTXOs obtained from
Expand Down
Loading