Skip to content

Use ChainHash instead of BlockHash as applicable#2662

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
valentinewallace merged 1 commit into from
Oct 17, 2023
Merged

Use ChainHash instead of BlockHash as applicable #2662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fuzz/src/full_stack.rs
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions fuzz/src/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::script::Builder;
use bitcoin::blockdata::transaction::TxOut;
use bitcoin::hash_types::BlockHash;

use lightning::blinded_path::{BlindedHop, BlindedPath};
use lightning::chain::transaction::OutPoint;
Expand DownExpand Up@@ -89,7 +89,7 @@ struct FuzzChainSource<'a, 'b, Out: test_logger::Output> {
net_graph: &'a NetworkGraph<&'b test_logger::TestLogger<Out>>,
}
impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
fn get_utxo(&self, _genesis_hash: &BlockHash, _short_channel_id: u64) -> UtxoResult {
fn get_utxo(&self, _chain_hash: &ChainHash, _short_channel_id: u64) -> UtxoResult {
let input_slice = self.input.get_slice(2);
if input_slice.is_none() { return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx)); }
let input_slice = input_slice.unwrap();
Expand Down
3 changes: 2 additions & 1 deletion lightning-block-sync/src/gossip.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
use crate::{AsyncBlockSourceResult, BlockData, BlockSource, BlockSourceError};

use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::transaction::{TxOut, OutPoint};
use bitcoin::hash_types::BlockHash;

Expand DownExpand Up@@ -302,7 +303,7 @@ impl<S: FutureSpawner,
CMH::Target: CustomMessageHandler,
NS::Target: NodeSigner,
{
fn get_utxo(&self, _genesis_hash: &BlockHash, short_channel_id: u64) -> UtxoResult {
fn get_utxo(&self, _chain_hash: &ChainHash, short_channel_id: u64) -> UtxoResult {
let res = UtxoFuture::new();
let fut = res.clone();
let source = self.source.clone();
Expand Down
2 changes: 1 addition & 1 deletion lightning-net-tokio/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -630,7 +630,7 @@ mod tests {
fn handle_error(&self, _their_node_id: &PublicKey, _msg: &ErrorMessage) {}
fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::empty() }
fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
Some(vec![ChainHash::using_genesis_block(Network::Testnet)])
}
}
Expand Down
8 changes: 4 additions & 4 deletions lightning-rapid-gossip-sync/src/processing.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use core::cmp::max;
use core::ops::Deref;
use core::sync::atomic::Ordering;

use bitcoin::BlockHash;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::secp256k1::PublicKey;

use lightning::ln::msgs::{
Expand DownExpand Up@@ -67,9 +67,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
return Err(DecodeError::UnknownVersion.into());
}

let chain_hash: BlockHash = Readable::read(read_cursor)?;
let ng_genesis_hash = self.network_graph.get_genesis_hash();
if chain_hash != ng_genesis_hash {
let chain_hash: ChainHash = Readable::read(read_cursor)?;
let ng_chain_hash = self.network_graph.get_chain_hash();
if chain_hash != ng_chain_hash {
return Err(
LightningError {
err: "Rapid Gossip Sync data's chain hash does not match the network graph's".to_owned(),
Expand Down
77 changes: 39 additions & 38 deletions lightning/src/ln/channel.rs
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@

use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::{genesis_block, ChainHash};
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;

use bitcoin::hashes::Hash;
Expand DownExpand Up@@ -1018,7 +1018,7 @@ where
L::Target: Logger,
{
default_configuration: UserConfig,
genesis_hash: BlockHash,
chain_hash: ChainHash,
fee_estimator: LowerBoundedFeeEstimator<F>,
chain_monitor: M,
tx_broadcaster: T,
Expand DownExpand Up@@ -2012,7 +2012,7 @@ macro_rules! emit_channel_ready_event {
macro_rules! handle_monitor_update_completion {
($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
let mut updates = $chan.monitor_updating_restored(&$self.logger,
&$self.node_signer, $self.genesis_hash, &$self.default_configuration,
&$self.node_signer, $self.chain_hash, &$self.default_configuration,
$self.best_block.read().unwrap().height());
let counterparty_node_id = $chan.context.get_counterparty_node_id();
let channel_update = if updates.channel_ready.is_some() && $chan.context.is_usable() {
Expand DownExpand Up@@ -2258,7 +2258,7 @@ where
let expanded_inbound_key = inbound_payment::ExpandedKey::new(&inbound_pmt_key_material);
ChannelManager {
default_configuration: config.clone(),
genesis_hash: genesis_block(params.network).header.block_hash(),
chain_hash: ChainHash::using_genesis_block(params.network),
fee_estimator: LowerBoundedFeeEstimator::new(fee_est),
chain_monitor,
tx_broadcaster,
Expand DownExpand Up@@ -2317,7 +2317,7 @@ where
if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
outbound_scid_alias += 1;
} else {
outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
}
if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
break;
Expand DownExpand Up@@ -2387,7 +2387,7 @@ where
},
}
};
let res = channel.get_open_channel(self.genesis_hash.clone());
let res = channel.get_open_channel(self.chain_hash);

let temporary_channel_id = channel.context.channel_id();
match peer_state.channel_by_id.entry(temporary_channel_id) {
Expand DownExpand Up@@ -3103,8 +3103,8 @@ where
// Note that this is likely a timing oracle for detecting whether an scid is a
// phantom or an intercept.
if (self.default_configuration.accept_intercept_htlcs &&
fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)) ||
fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)
fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
{
None
} else {
Expand DownExpand Up@@ -3332,7 +3332,7 @@ where
};

let unsigned = msgs::UnsignedChannelUpdate {
chain_hash: self.genesis_hash,
chain_hash: self.chain_hash,
short_channel_id,
timestamp: chan.context.get_update_time_counter(),
flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
Expand DownExpand Up@@ -4250,7 +4250,7 @@ where
}
if let PendingHTLCRouting::Forward { onion_packet, .. } = routing {
let phantom_pubkey_res = self.node_signer.get_node_id(Recipient::PhantomNode);
if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.genesis_hash) {
if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.chain_hash) {
let phantom_shared_secret = self.node_signer.ecdh(Recipient::PhantomNode, &onion_packet.public_key.unwrap(), None).unwrap().secret_bytes();
let next_hop = match onion_utils::decode_next_payment_hop(
phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac,
Expand DownExpand Up@@ -5876,7 +5876,7 @@ where
fn internal_open_channel(&self, counterparty_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result<(), MsgHandleErrInternal> {
// Note that the ChannelManager is NOT re-persisted on disk after this, so any changes are
// likely to be lost on restart!
if msg.chain_hash != self.genesis_hash {
if msg.chain_hash != self.chain_hash {
return Err(MsgHandleErrInternal::send_err_msg_no_close("Unknown genesis block hash".to_owned(), msg.temporary_channel_id.clone()));
}

Expand DownExpand Up@@ -6141,7 +6141,7 @@ where
hash_map::Entry::Occupied(mut chan_phase_entry) => {
if let ChannelPhase::Funded(chan) = chan_phase_entry.get_mut() {
let announcement_sigs_opt = try_chan_phase_entry!(self, chan.channel_ready(&msg, &self.node_signer,
self.genesis_hash.clone(), &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
self.chain_hash, &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
if let Some(announcement_sigs) = announcement_sigs_opt {
log_trace!(self.logger, "Sending announcement_signatures for channel {}", chan.context.channel_id());
peer_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
Expand DownExpand Up@@ -6518,7 +6518,7 @@ where
},
hash_map::Entry::Vacant(entry) => {
if !is_our_scid && forward_info.incoming_amt_msat.is_some() &&
fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.genesis_hash)
fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.chain_hash)
{
let intercept_id = InterceptId(Sha256::hash(&forward_info.incoming_shared_secret).into_inner());
let mut pending_intercepts = self.pending_intercepted_htlcs.lock().unwrap();
Expand DownExpand Up@@ -6711,7 +6711,7 @@ where

peer_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
msg: try_chan_phase_entry!(self, chan.announcement_signatures(
&self.node_signer, self.genesis_hash.clone(), self.best_block.read().unwrap().height(),
&self.node_signer, self.chain_hash, self.best_block.read().unwrap().height(),
msg, &self.default_configuration
), chan_phase_entry),
// Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -6799,7 +6799,7 @@ where
// freed HTLCs to fail backwards. If in the future we no longer drop pending
// add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
let responses = try_chan_phase_entry!(self, chan.channel_reestablish(
msg, &self.logger, &self.node_signer, self.genesis_hash,
msg, &self.logger, &self.node_signer, self.chain_hash,
&self.default_configuration, &*self.best_block.read().unwrap()), chan_phase_entry);
let mut channel_update = None;
if let Some(msg) = responses.shutdown_msg {
Expand DownExpand Up@@ -7179,7 +7179,7 @@ where
let best_block_height = self.best_block.read().unwrap().height();
let short_to_chan_info = self.short_to_chan_info.read().unwrap();
loop {
let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
// Ensure the generated scid doesn't conflict with a real channel.
match short_to_chan_info.get(&scid_candidate) {
Some(_) => continue,
Expand DownExpand Up@@ -7209,7 +7209,7 @@ where
let best_block_height = self.best_block.read().unwrap().height();
let short_to_chan_info = self.short_to_chan_info.read().unwrap();
loop {
let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
// Ensure the generated scid doesn't conflict with a real channel.
if short_to_chan_info.contains_key(&scid_candidate) { continue }
return scid_candidate
Expand DownExpand Up@@ -7472,7 +7472,7 @@ where
*best_block = BestBlock::new(header.prev_blockhash, new_height)
}

self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
}
}

Expand All@@ -7498,13 +7498,13 @@ where
let _persistence_guard =
PersistenceNotifierGuard::optionally_notify_skipping_background_events(
self, || -> NotifyOption { NotifyOption::DoPersist });
self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger)
self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger)
.map(|(a, b)| (a, Vec::new(), b)));

let last_best_block_height = self.best_block.read().unwrap().height();
if height < last_best_block_height {
let timestamp = self.highest_seen_timestamp.load(Ordering::Acquire);
self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
}
}

Expand All@@ -7521,7 +7521,7 @@ where
self, || -> NotifyOption { NotifyOption::DoPersist });
*self.best_block.write().unwrap() = BestBlock::new(block_hash, height);

self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));

macro_rules! max_time {
($timestamp: expr) => {
Expand DownExpand Up@@ -7641,7 +7641,7 @@ where
msg: announcement_sigs,
});
if let Some(height) = height_opt {
if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.genesis_hash, height, &self.default_configuration) {
if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.chain_hash, height, &self.default_configuration) {
pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
msg: announcement,
// Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -8251,7 +8251,7 @@ where
let mut peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
let peer_state = &mut *peer_state_lock;
if let Some(ChannelPhase::UnfundedOutboundV1(chan)) = peer_state.channel_by_id.get_mut(&msg.channel_id) {
if let Ok(msg) = chan.maybe_handle_error_without_close(self.genesis_hash, &self.fee_estimator) {
if let Ok(msg) = chan.maybe_handle_error_without_close(self.chain_hash, &self.fee_estimator) {
peer_state.pending_msg_events.push(events::MessageSendEvent::SendOpenChannel {
node_id: *counterparty_node_id,
msg,
Expand All@@ -8274,8 +8274,8 @@ where
provided_init_features(&self.default_configuration)
}

fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
Some(vec![ChainHash::from(&self.genesis_hash[..])])
fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
Some(vec![self.chain_hash])
}

fn handle_tx_add_input(&self, counterparty_node_id: &PublicKey, msg: &msgs::TxAddInput) {
Expand DownExpand Up@@ -8820,7 +8820,7 @@ where

write_ver_prefix!(writer, SERIALIZATION_VERSION, MIN_SERIALIZATION_VERSION);

self.genesis_hash.write(writer)?;
self.chain_hash.write(writer)?;
{
let best_block = self.best_block.read().unwrap();
best_block.height().write(writer)?;
Expand DownExpand Up@@ -9231,7 +9231,7 @@ where
fn read<Reader: io::Read>(reader: &mut Reader, mut args: ChannelManagerReadArgs<'a, M, T, ES, NS, SP, F, R, L>) -> Result<Self, DecodeError> {
let _ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);

let genesis_hash: BlockHash = Readable::read(reader)?;
let chain_hash: ChainHash = Readable::read(reader)?;
let best_block_height: u32 = Readable::read(reader)?;
let best_block_hash: BlockHash = Readable::read(reader)?;

Expand DownExpand Up@@ -9879,7 +9879,7 @@ where
let mut outbound_scid_alias;
loop {
outbound_scid_alias = fake_scid::Namespace::OutboundAlias
.get_fake_scid(best_block_height, &genesis_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
.get_fake_scid(best_block_height, &chain_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
if outbound_scid_aliases.insert(outbound_scid_alias) { break; }
}
chan.context.set_outbound_scid_alias(outbound_scid_alias);
Expand DownExpand Up@@ -9993,7 +9993,7 @@ where
}

let channel_manager = ChannelManager {
genesis_hash,
chain_hash,
fee_estimator: bounded_fee_estimator,
chain_monitor: args.chain_monitor,
tx_broadcaster: args.tx_broadcaster,
Expand Down
6 changes: 3 additions & 3 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ use crate::util::config::{UserConfig, MaxDustHTLCExposure};
use bitcoin::hash_types::BlockHash;
use bitcoin::blockdata::script::{Builder, Script};
use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;
use bitcoin::{PackedLockTime, Sequence, Transaction, TxIn, TxOut, Witness};
use bitcoin::OutPoint as BitcoinOutPoint;
Expand DownExpand Up@@ -5830,8 +5830,8 @@ fn bolt2_open_channel_sending_node_checks_part2() {
assert!(node0_to_1_send_open_channel.to_self_delay==BREAKDOWN_TIMEOUT);

// BOLT #2 spec: Sending node must ensure the chain_hash value identifies the chain it wishes to open the channel within.
let chain_hash=genesis_block(Network::Testnet).header.block_hash();
assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);
let chain_hash = ChainHash::using_genesis_block(Network::Testnet);
assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);

// BOLT #2 spec: Sending node must set funding_pubkey, revocation_basepoint, htlc_basepoint, payment_basepoint, and delayed_payment_basepoint to valid DER-encoded, compressed, secp256k1 pubkeys.
assert!(PublicKey::from_slice(&node0_to_1_send_open_channel.funding_pubkey.serialize()).is_ok());
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" + '
Use `ChainHash` instead of `BlockHash` as applicable by jkczyz · Pull Request #2662 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use ChainHash instead of BlockHash as applicable#2662

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

valentinewallace
merged 1 commit into

from

Oct 17, 2023
 Merged


Use ChainHash instead of BlockHash as applicable
#2662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::script::Builder;
use bitcoin::blockdata::transaction::TxOut;
use bitcoin::hash_types::BlockHash;

use lightning::blinded_path::{BlindedHop, BlindedPath};
use lightning::chain::transaction::OutPoint;
Expand DownExpand Up@@ -89,7 +89,7 @@ struct FuzzChainSource<'a, 'b, Out: test_logger::Output> {
	net_graph: &'a NetworkGraph<&'b test_logger::TestLogger<Out>>,
}
impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
	fn get_utxo(&self, _genesis_hash: &BlockHash, _short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, _short_channel_id: u64) -> UtxoResult {
 let input_slice = self.input.get_slice(2);
 if input_slice.is_none() { return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx)); }
 let input_slice = input_slice.unwrap();
Expand Down

3 changes: 2 additions & 1 deletion
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
use crate::{AsyncBlockSourceResult, BlockData, BlockSource, BlockSourceError};

use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::transaction::{TxOut, OutPoint};
use bitcoin::hash_types::BlockHash;

Expand DownExpand Up@@ -302,7 +303,7 @@ impl<S: FutureSpawner,
	CMH::Target: CustomMessageHandler,
	NS::Target: NodeSigner,
{
	fn get_utxo(&self, _genesis_hash: &BlockHash, short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, short_channel_id: u64) -> UtxoResult {
 let res = UtxoFuture::new();
 let fut = res.clone();
 let source = self.source.clone();
Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,7 +630,7 @@ mod tests {
 fn handle_error(&self, _their_node_id: &PublicKey, _msg: &ErrorMessage) {}
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::empty() }
 fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::using_genesis_block(Network::Testnet)])
 }
	}
Expand Down

8 changes: 4 additions & 4 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use core::cmp::max;
use core::ops::Deref;
use core::sync::atomic::Ordering;

use bitcoin::BlockHash;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::secp256k1::PublicKey;

use lightning::ln::msgs::{
Expand DownExpand Up@@ -67,9 +67,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 return Err(DecodeError::UnknownVersion.into());
 }

 let chain_hash: BlockHash = Readable::read(read_cursor)?;
 let ng_genesis_hash = self.network_graph.get_genesis_hash();
 if chain_hash != ng_genesis_hash {
 let chain_hash: ChainHash = Readable::read(read_cursor)?;
 let ng_chain_hash = self.network_graph.get_chain_hash();
 if chain_hash != ng_chain_hash {
 return Err(
 LightningError {
 err: "Rapid Gossip Sync data's chain hash does not match the network graph's".to_owned(),
Expand Down

77 changes: 39 additions & 38 deletions
lightning/src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


58 changes: 29 additions & 29 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@

use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::{genesis_block, ChainHash};
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;

use bitcoin::hashes::Hash;
Expand DownExpand Up@@ -1018,7 +1018,7 @@ where
	L::Target: Logger,
{
	default_configuration: UserConfig,
genesis_hash: BlockHash,
chain_hash: ChainHash,
	fee_estimator: LowerBoundedFeeEstimator<F>,
	chain_monitor: M,
	tx_broadcaster: T,
Expand DownExpand Up@@ -2012,7 +2012,7 @@ macro_rules! emit_channel_ready_event {
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let mut updates = $chan.monitor_updating_restored(&$self.logger,
 &$self.node_signer, $self.genesis_hash, &$self.default_configuration,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
 $self.best_block.read().unwrap().height());
 let counterparty_node_id = $chan.context.get_counterparty_node_id();
 let channel_update = if updates.channel_ready.is_some() && $chan.context.is_usable() {
Expand DownExpand Up@@ -2258,7 +2258,7 @@ where
 let expanded_inbound_key = inbound_payment::ExpandedKey::new(&inbound_pmt_key_material);
 ChannelManager {
 default_configuration: config.clone(),
genesis_hash: genesis_block(params.network).header.block_hash(),
chain_hash: ChainHash::using_genesis_block(params.network),
 fee_estimator: LowerBoundedFeeEstimator::new(fee_est),
 chain_monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -2317,7 +2317,7 @@ where
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand DownExpand Up@@ -2387,7 +2387,7 @@ where
 },
 }
 };
 let res = channel.get_open_channel(self.genesis_hash.clone());
 let res = channel.get_open_channel(self.chain_hash);

 let temporary_channel_id = channel.context.channel_id();
 match peer_state.channel_by_id.entry(temporary_channel_id) {
Expand DownExpand Up@@ -3103,8 +3103,8 @@ where
 // Note that this is likely a timing oracle for detecting whether an scid is a
 // phantom or an intercept.
 if (self.default_configuration.accept_intercept_htlcs &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {
 None
 } else {
Expand DownExpand Up@@ -3332,7 +3332,7 @@ where
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 chain_hash: self.chain_hash,
 short_channel_id,
 timestamp: chan.context.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
Expand DownExpand Up@@ -4250,7 +4250,7 @@ where
 }
 if let PendingHTLCRouting::Forward { onion_packet, .. } = routing {
 let phantom_pubkey_res = self.node_signer.get_node_id(Recipient::PhantomNode);
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.genesis_hash) {
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.chain_hash) {
 let phantom_shared_secret = self.node_signer.ecdh(Recipient::PhantomNode, &onion_packet.public_key.unwrap(), None).unwrap().secret_bytes();
 let next_hop = match onion_utils::decode_next_payment_hop(
 phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac,
Expand DownExpand Up@@ -5876,7 +5876,7 @@ where
	fn internal_open_channel(&self, counterparty_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result<(), MsgHandleErrInternal> {
 // Note that the ChannelManager is NOT re-persisted on disk after this, so any changes are
 // likely to be lost on restart!
 if msg.chain_hash != self.genesis_hash {
 if msg.chain_hash != self.chain_hash {
 return Err(MsgHandleErrInternal::send_err_msg_no_close("Unknown genesis block hash".to_owned(), msg.temporary_channel_id.clone()));
 }

Expand DownExpand Up@@ -6141,7 +6141,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase_entry) => {
 if let ChannelPhase::Funded(chan) = chan_phase_entry.get_mut() {
 let announcement_sigs_opt = try_chan_phase_entry!(self, chan.channel_ready(&msg, &self.node_signer,
 self.genesis_hash.clone(), &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 self.chain_hash, &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 if let Some(announcement_sigs) = announcement_sigs_opt {
 log_trace!(self.logger, "Sending announcement_signatures for channel {}", chan.context.channel_id());
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
Expand DownExpand Up@@ -6518,7 +6518,7 @@ where
 },
 hash_map::Entry::Vacant(entry) => {
 if !is_our_scid && forward_info.incoming_amt_msat.is_some() &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.chain_hash)
 {
 let intercept_id = InterceptId(Sha256::hash(&forward_info.incoming_shared_secret).into_inner());
 let mut pending_intercepts = self.pending_intercepted_htlcs.lock().unwrap();
Expand DownExpand Up@@ -6711,7 +6711,7 @@ where

 peer_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: try_chan_phase_entry!(self, chan.announcement_signatures(
 &self.node_signer, self.genesis_hash.clone(), self.best_block.read().unwrap().height(),
 &self.node_signer, self.chain_hash, self.best_block.read().unwrap().height(),
 msg, &self.default_configuration
 ), chan_phase_entry),
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -6799,7 +6799,7 @@ where
 // freed HTLCs to fail backwards. If in the future we no longer drop pending
 // add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
 let responses = try_chan_phase_entry!(self, chan.channel_reestablish(
 msg, &self.logger, &self.node_signer, self.genesis_hash,
 msg, &self.logger, &self.node_signer, self.chain_hash,
 &self.default_configuration, &*self.best_block.read().unwrap()), chan_phase_entry);
 let mut channel_update = None;
 if let Some(msg) = responses.shutdown_msg {
Expand DownExpand Up@@ -7179,7 +7179,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 match short_to_chan_info.get(&scid_candidate) {
 Some(_) => continue,
Expand DownExpand Up@@ -7209,7 +7209,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 if short_to_chan_info.contains_key(&scid_candidate) { continue }
 return scid_candidate
Expand DownExpand Up@@ -7472,7 +7472,7 @@ where
 *best_block = BestBlock::new(header.prev_blockhash, new_height)
 }

 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
	}
}

Expand All@@ -7498,13 +7498,13 @@ where
 let _persistence_guard =
 PersistenceNotifierGuard::optionally_notify_skipping_background_events(
 self, || -> NotifyOption { NotifyOption::DoPersist });
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger)
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger)
 .map(|(a, b)| (a, Vec::new(), b)));

 let last_best_block_height = self.best_block.read().unwrap().height();
 if height < last_best_block_height {
 let timestamp = self.highest_seen_timestamp.load(Ordering::Acquire);
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
 }
	}

Expand All@@ -7521,7 +7521,7 @@ where
 self, || -> NotifyOption { NotifyOption::DoPersist });
 *self.best_block.write().unwrap() = BestBlock::new(block_hash, height);

 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));

 macro_rules! max_time {
 ($timestamp: expr) => {
Expand DownExpand Up@@ -7641,7 +7641,7 @@ where
 msg: announcement_sigs,
 });
 if let Some(height) = height_opt {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.genesis_hash, height, &self.default_configuration) {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.chain_hash, height, &self.default_configuration) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: announcement,
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -8251,7 +8251,7 @@ where
 let mut peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(ChannelPhase::UnfundedOutboundV1(chan)) = peer_state.channel_by_id.get_mut(&msg.channel_id) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.genesis_hash, &self.fee_estimator) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.chain_hash, &self.fee_estimator) {
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendOpenChannel {
 node_id: *counterparty_node_id,
 msg,
Expand All@@ -8274,8 +8274,8 @@ where
 provided_init_features(&self.default_configuration)
	}

	fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::from(&self.genesis_hash[..])])
	fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![self.chain_hash])
	}

	fn handle_tx_add_input(&self, counterparty_node_id: &PublicKey, msg: &msgs::TxAddInput) {
Expand DownExpand Up@@ -8820,7 +8820,7 @@ where

 write_ver_prefix!(writer, SERIALIZATION_VERSION, MIN_SERIALIZATION_VERSION);

 self.genesis_hash.write(writer)?;
 self.chain_hash.write(writer)?;
 {
 let best_block = self.best_block.read().unwrap();
 best_block.height().write(writer)?;
Expand DownExpand Up@@ -9231,7 +9231,7 @@ where
	fn read<Reader: io::Read>(reader: &mut Reader, mut args: ChannelManagerReadArgs<'a, M, T, ES, NS, SP, F, R, L>) -> Result<Self, DecodeError> {
 let _ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);

 let genesis_hash: BlockHash = Readable::read(reader)?;
 let chain_hash: ChainHash = Readable::read(reader)?;
 let best_block_height: u32 = Readable::read(reader)?;
 let best_block_hash: BlockHash = Readable::read(reader)?;

Expand DownExpand Up@@ -9879,7 +9879,7 @@ where
 let mut outbound_scid_alias;
 loop {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias
 .get_fake_scid(best_block_height, &genesis_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 .get_fake_scid(best_block_height, &chain_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 if outbound_scid_aliases.insert(outbound_scid_alias) { break; }
 }
 chan.context.set_outbound_scid_alias(outbound_scid_alias);
Expand DownExpand Up@@ -9993,7 +9993,7 @@ where
 }

 let channel_manager = ChannelManager {
genesis_hash,
chain_hash,
 fee_estimator: bounded_fee_estimator,
 chain_monitor: args.chain_monitor,
 tx_broadcaster: args.tx_broadcaster,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ use crate::util::config::{UserConfig, MaxDustHTLCExposure};
use bitcoin::hash_types::BlockHash;
use bitcoin::blockdata::script::{Builder, Script};
use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;
use bitcoin::{PackedLockTime, Sequence, Transaction, TxIn, TxOut, Witness};
use bitcoin::OutPoint as BitcoinOutPoint;
Expand DownExpand Up@@ -5830,8 +5830,8 @@ fn bolt2_open_channel_sending_node_checks_part2() {
	assert!(node0_to_1_send_open_channel.to_self_delay==BREAKDOWN_TIMEOUT);

	// BOLT #2 spec: Sending node must ensure the chain_hash value identifies the chain it wishes to open the channel within.
	let chain_hash=genesis_block(Network::Testnet).header.block_hash();
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);
	let chain_hash = ChainHash::using_genesis_block(Network::Testnet);
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);

	// BOLT #2 spec: Sending node must set funding_pubkey, revocation_basepoint, htlc_basepoint, payment_basepoint, and delayed_payment_basepoint to valid DER-encoded, compressed, secp256k1 pubkeys.
	assert!(PublicKey::from_slice(&node0_to_1_send_open_channel.funding_pubkey.serialize()).is_ok());
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('^' + ".*" + '
Use `ChainHash` instead of `BlockHash` as applicable by jkczyz · Pull Request #2662 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use ChainHash instead of BlockHash as applicable#2662

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

valentinewallace
merged 1 commit into

from

Oct 17, 2023
 Merged


Use ChainHash instead of BlockHash as applicable
#2662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::script::Builder;
use bitcoin::blockdata::transaction::TxOut;
use bitcoin::hash_types::BlockHash;

use lightning::blinded_path::{BlindedHop, BlindedPath};
use lightning::chain::transaction::OutPoint;
Expand DownExpand Up@@ -89,7 +89,7 @@ struct FuzzChainSource<'a, 'b, Out: test_logger::Output> {
	net_graph: &'a NetworkGraph<&'b test_logger::TestLogger<Out>>,
}
impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
	fn get_utxo(&self, _genesis_hash: &BlockHash, _short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, _short_channel_id: u64) -> UtxoResult {
 let input_slice = self.input.get_slice(2);
 if input_slice.is_none() { return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx)); }
 let input_slice = input_slice.unwrap();
Expand Down

3 changes: 2 additions & 1 deletion
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
use crate::{AsyncBlockSourceResult, BlockData, BlockSource, BlockSourceError};

use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::transaction::{TxOut, OutPoint};
use bitcoin::hash_types::BlockHash;

Expand DownExpand Up@@ -302,7 +303,7 @@ impl<S: FutureSpawner,
	CMH::Target: CustomMessageHandler,
	NS::Target: NodeSigner,
{
	fn get_utxo(&self, _genesis_hash: &BlockHash, short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, short_channel_id: u64) -> UtxoResult {
 let res = UtxoFuture::new();
 let fut = res.clone();
 let source = self.source.clone();
Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,7 +630,7 @@ mod tests {
 fn handle_error(&self, _their_node_id: &PublicKey, _msg: &ErrorMessage) {}
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::empty() }
 fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::using_genesis_block(Network::Testnet)])
 }
	}
Expand Down

8 changes: 4 additions & 4 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use core::cmp::max;
use core::ops::Deref;
use core::sync::atomic::Ordering;

use bitcoin::BlockHash;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::secp256k1::PublicKey;

use lightning::ln::msgs::{
Expand DownExpand Up@@ -67,9 +67,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 return Err(DecodeError::UnknownVersion.into());
 }

 let chain_hash: BlockHash = Readable::read(read_cursor)?;
 let ng_genesis_hash = self.network_graph.get_genesis_hash();
 if chain_hash != ng_genesis_hash {
 let chain_hash: ChainHash = Readable::read(read_cursor)?;
 let ng_chain_hash = self.network_graph.get_chain_hash();
 if chain_hash != ng_chain_hash {
 return Err(
 LightningError {
 err: "Rapid Gossip Sync data's chain hash does not match the network graph's".to_owned(),
Expand Down

77 changes: 39 additions & 38 deletions
lightning/src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


58 changes: 29 additions & 29 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@

use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::{genesis_block, ChainHash};
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;

use bitcoin::hashes::Hash;
Expand DownExpand Up@@ -1018,7 +1018,7 @@ where
	L::Target: Logger,
{
	default_configuration: UserConfig,
genesis_hash: BlockHash,
chain_hash: ChainHash,
	fee_estimator: LowerBoundedFeeEstimator<F>,
	chain_monitor: M,
	tx_broadcaster: T,
Expand DownExpand Up@@ -2012,7 +2012,7 @@ macro_rules! emit_channel_ready_event {
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let mut updates = $chan.monitor_updating_restored(&$self.logger,
 &$self.node_signer, $self.genesis_hash, &$self.default_configuration,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
 $self.best_block.read().unwrap().height());
 let counterparty_node_id = $chan.context.get_counterparty_node_id();
 let channel_update = if updates.channel_ready.is_some() && $chan.context.is_usable() {
Expand DownExpand Up@@ -2258,7 +2258,7 @@ where
 let expanded_inbound_key = inbound_payment::ExpandedKey::new(&inbound_pmt_key_material);
 ChannelManager {
 default_configuration: config.clone(),
genesis_hash: genesis_block(params.network).header.block_hash(),
chain_hash: ChainHash::using_genesis_block(params.network),
 fee_estimator: LowerBoundedFeeEstimator::new(fee_est),
 chain_monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -2317,7 +2317,7 @@ where
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand DownExpand Up@@ -2387,7 +2387,7 @@ where
 },
 }
 };
 let res = channel.get_open_channel(self.genesis_hash.clone());
 let res = channel.get_open_channel(self.chain_hash);

 let temporary_channel_id = channel.context.channel_id();
 match peer_state.channel_by_id.entry(temporary_channel_id) {
Expand DownExpand Up@@ -3103,8 +3103,8 @@ where
 // Note that this is likely a timing oracle for detecting whether an scid is a
 // phantom or an intercept.
 if (self.default_configuration.accept_intercept_htlcs &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {
 None
 } else {
Expand DownExpand Up@@ -3332,7 +3332,7 @@ where
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 chain_hash: self.chain_hash,
 short_channel_id,
 timestamp: chan.context.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
Expand DownExpand Up@@ -4250,7 +4250,7 @@ where
 }
 if let PendingHTLCRouting::Forward { onion_packet, .. } = routing {
 let phantom_pubkey_res = self.node_signer.get_node_id(Recipient::PhantomNode);
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.genesis_hash) {
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.chain_hash) {
 let phantom_shared_secret = self.node_signer.ecdh(Recipient::PhantomNode, &onion_packet.public_key.unwrap(), None).unwrap().secret_bytes();
 let next_hop = match onion_utils::decode_next_payment_hop(
 phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac,
Expand DownExpand Up@@ -5876,7 +5876,7 @@ where
	fn internal_open_channel(&self, counterparty_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result<(), MsgHandleErrInternal> {
 // Note that the ChannelManager is NOT re-persisted on disk after this, so any changes are
 // likely to be lost on restart!
 if msg.chain_hash != self.genesis_hash {
 if msg.chain_hash != self.chain_hash {
 return Err(MsgHandleErrInternal::send_err_msg_no_close("Unknown genesis block hash".to_owned(), msg.temporary_channel_id.clone()));
 }

Expand DownExpand Up@@ -6141,7 +6141,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase_entry) => {
 if let ChannelPhase::Funded(chan) = chan_phase_entry.get_mut() {
 let announcement_sigs_opt = try_chan_phase_entry!(self, chan.channel_ready(&msg, &self.node_signer,
 self.genesis_hash.clone(), &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 self.chain_hash, &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 if let Some(announcement_sigs) = announcement_sigs_opt {
 log_trace!(self.logger, "Sending announcement_signatures for channel {}", chan.context.channel_id());
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
Expand DownExpand Up@@ -6518,7 +6518,7 @@ where
 },
 hash_map::Entry::Vacant(entry) => {
 if !is_our_scid && forward_info.incoming_amt_msat.is_some() &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.chain_hash)
 {
 let intercept_id = InterceptId(Sha256::hash(&forward_info.incoming_shared_secret).into_inner());
 let mut pending_intercepts = self.pending_intercepted_htlcs.lock().unwrap();
Expand DownExpand Up@@ -6711,7 +6711,7 @@ where

 peer_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: try_chan_phase_entry!(self, chan.announcement_signatures(
 &self.node_signer, self.genesis_hash.clone(), self.best_block.read().unwrap().height(),
 &self.node_signer, self.chain_hash, self.best_block.read().unwrap().height(),
 msg, &self.default_configuration
 ), chan_phase_entry),
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -6799,7 +6799,7 @@ where
 // freed HTLCs to fail backwards. If in the future we no longer drop pending
 // add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
 let responses = try_chan_phase_entry!(self, chan.channel_reestablish(
 msg, &self.logger, &self.node_signer, self.genesis_hash,
 msg, &self.logger, &self.node_signer, self.chain_hash,
 &self.default_configuration, &*self.best_block.read().unwrap()), chan_phase_entry);
 let mut channel_update = None;
 if let Some(msg) = responses.shutdown_msg {
Expand DownExpand Up@@ -7179,7 +7179,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 match short_to_chan_info.get(&scid_candidate) {
 Some(_) => continue,
Expand DownExpand Up@@ -7209,7 +7209,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 if short_to_chan_info.contains_key(&scid_candidate) { continue }
 return scid_candidate
Expand DownExpand Up@@ -7472,7 +7472,7 @@ where
 *best_block = BestBlock::new(header.prev_blockhash, new_height)
 }

 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
	}
}

Expand All@@ -7498,13 +7498,13 @@ where
 let _persistence_guard =
 PersistenceNotifierGuard::optionally_notify_skipping_background_events(
 self, || -> NotifyOption { NotifyOption::DoPersist });
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger)
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger)
 .map(|(a, b)| (a, Vec::new(), b)));

 let last_best_block_height = self.best_block.read().unwrap().height();
 if height < last_best_block_height {
 let timestamp = self.highest_seen_timestamp.load(Ordering::Acquire);
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
 }
	}

Expand All@@ -7521,7 +7521,7 @@ where
 self, || -> NotifyOption { NotifyOption::DoPersist });
 *self.best_block.write().unwrap() = BestBlock::new(block_hash, height);

 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));

 macro_rules! max_time {
 ($timestamp: expr) => {
Expand DownExpand Up@@ -7641,7 +7641,7 @@ where
 msg: announcement_sigs,
 });
 if let Some(height) = height_opt {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.genesis_hash, height, &self.default_configuration) {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.chain_hash, height, &self.default_configuration) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: announcement,
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -8251,7 +8251,7 @@ where
 let mut peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(ChannelPhase::UnfundedOutboundV1(chan)) = peer_state.channel_by_id.get_mut(&msg.channel_id) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.genesis_hash, &self.fee_estimator) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.chain_hash, &self.fee_estimator) {
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendOpenChannel {
 node_id: *counterparty_node_id,
 msg,
Expand All@@ -8274,8 +8274,8 @@ where
 provided_init_features(&self.default_configuration)
	}

	fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::from(&self.genesis_hash[..])])
	fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![self.chain_hash])
	}

	fn handle_tx_add_input(&self, counterparty_node_id: &PublicKey, msg: &msgs::TxAddInput) {
Expand DownExpand Up@@ -8820,7 +8820,7 @@ where

 write_ver_prefix!(writer, SERIALIZATION_VERSION, MIN_SERIALIZATION_VERSION);

 self.genesis_hash.write(writer)?;
 self.chain_hash.write(writer)?;
 {
 let best_block = self.best_block.read().unwrap();
 best_block.height().write(writer)?;
Expand DownExpand Up@@ -9231,7 +9231,7 @@ where
	fn read<Reader: io::Read>(reader: &mut Reader, mut args: ChannelManagerReadArgs<'a, M, T, ES, NS, SP, F, R, L>) -> Result<Self, DecodeError> {
 let _ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);

 let genesis_hash: BlockHash = Readable::read(reader)?;
 let chain_hash: ChainHash = Readable::read(reader)?;
 let best_block_height: u32 = Readable::read(reader)?;
 let best_block_hash: BlockHash = Readable::read(reader)?;

Expand DownExpand Up@@ -9879,7 +9879,7 @@ where
 let mut outbound_scid_alias;
 loop {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias
 .get_fake_scid(best_block_height, &genesis_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 .get_fake_scid(best_block_height, &chain_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 if outbound_scid_aliases.insert(outbound_scid_alias) { break; }
 }
 chan.context.set_outbound_scid_alias(outbound_scid_alias);
Expand DownExpand Up@@ -9993,7 +9993,7 @@ where
 }

 let channel_manager = ChannelManager {
genesis_hash,
chain_hash,
 fee_estimator: bounded_fee_estimator,
 chain_monitor: args.chain_monitor,
 tx_broadcaster: args.tx_broadcaster,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ use crate::util::config::{UserConfig, MaxDustHTLCExposure};
use bitcoin::hash_types::BlockHash;
use bitcoin::blockdata::script::{Builder, Script};
use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;
use bitcoin::{PackedLockTime, Sequence, Transaction, TxIn, TxOut, Witness};
use bitcoin::OutPoint as BitcoinOutPoint;
Expand DownExpand Up@@ -5830,8 +5830,8 @@ fn bolt2_open_channel_sending_node_checks_part2() {
	assert!(node0_to_1_send_open_channel.to_self_delay==BREAKDOWN_TIMEOUT);

	// BOLT #2 spec: Sending node must ensure the chain_hash value identifies the chain it wishes to open the channel within.
	let chain_hash=genesis_block(Network::Testnet).header.block_hash();
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);
	let chain_hash = ChainHash::using_genesis_block(Network::Testnet);
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);

	// BOLT #2 spec: Sending node must set funding_pubkey, revocation_basepoint, htlc_basepoint, payment_basepoint, and delayed_payment_basepoint to valid DER-encoded, compressed, secp256k1 pubkeys.
	assert!(PublicKey::from_slice(&node0_to_1_send_open_channel.funding_pubkey.serialize()).is_ok());
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('^' + ".*" + '
Use `ChainHash` instead of `BlockHash` as applicable by jkczyz · Pull Request #2662 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use ChainHash instead of BlockHash as applicable#2662

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

valentinewallace
merged 1 commit into

from

Oct 17, 2023
 Merged


Use ChainHash instead of BlockHash as applicable
#2662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::script::Builder;
use bitcoin::blockdata::transaction::TxOut;
use bitcoin::hash_types::BlockHash;

use lightning::blinded_path::{BlindedHop, BlindedPath};
use lightning::chain::transaction::OutPoint;
Expand DownExpand Up@@ -89,7 +89,7 @@ struct FuzzChainSource<'a, 'b, Out: test_logger::Output> {
	net_graph: &'a NetworkGraph<&'b test_logger::TestLogger<Out>>,
}
impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
	fn get_utxo(&self, _genesis_hash: &BlockHash, _short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, _short_channel_id: u64) -> UtxoResult {
 let input_slice = self.input.get_slice(2);
 if input_slice.is_none() { return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx)); }
 let input_slice = input_slice.unwrap();
Expand Down

3 changes: 2 additions & 1 deletion
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
use crate::{AsyncBlockSourceResult, BlockData, BlockSource, BlockSourceError};

use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::transaction::{TxOut, OutPoint};
use bitcoin::hash_types::BlockHash;

Expand DownExpand Up@@ -302,7 +303,7 @@ impl<S: FutureSpawner,
	CMH::Target: CustomMessageHandler,
	NS::Target: NodeSigner,
{
	fn get_utxo(&self, _genesis_hash: &BlockHash, short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, short_channel_id: u64) -> UtxoResult {
 let res = UtxoFuture::new();
 let fut = res.clone();
 let source = self.source.clone();
Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,7 +630,7 @@ mod tests {
 fn handle_error(&self, _their_node_id: &PublicKey, _msg: &ErrorMessage) {}
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::empty() }
 fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::using_genesis_block(Network::Testnet)])
 }
	}
Expand Down

8 changes: 4 additions & 4 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use core::cmp::max;
use core::ops::Deref;
use core::sync::atomic::Ordering;

use bitcoin::BlockHash;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::secp256k1::PublicKey;

use lightning::ln::msgs::{
Expand DownExpand Up@@ -67,9 +67,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 return Err(DecodeError::UnknownVersion.into());
 }

 let chain_hash: BlockHash = Readable::read(read_cursor)?;
 let ng_genesis_hash = self.network_graph.get_genesis_hash();
 if chain_hash != ng_genesis_hash {
 let chain_hash: ChainHash = Readable::read(read_cursor)?;
 let ng_chain_hash = self.network_graph.get_chain_hash();
 if chain_hash != ng_chain_hash {
 return Err(
 LightningError {
 err: "Rapid Gossip Sync data's chain hash does not match the network graph's".to_owned(),
Expand Down

77 changes: 39 additions & 38 deletions
lightning/src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


58 changes: 29 additions & 29 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@

use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::{genesis_block, ChainHash};
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;

use bitcoin::hashes::Hash;
Expand DownExpand Up@@ -1018,7 +1018,7 @@ where
	L::Target: Logger,
{
	default_configuration: UserConfig,
genesis_hash: BlockHash,
chain_hash: ChainHash,
	fee_estimator: LowerBoundedFeeEstimator<F>,
	chain_monitor: M,
	tx_broadcaster: T,
Expand DownExpand Up@@ -2012,7 +2012,7 @@ macro_rules! emit_channel_ready_event {
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let mut updates = $chan.monitor_updating_restored(&$self.logger,
 &$self.node_signer, $self.genesis_hash, &$self.default_configuration,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
 $self.best_block.read().unwrap().height());
 let counterparty_node_id = $chan.context.get_counterparty_node_id();
 let channel_update = if updates.channel_ready.is_some() && $chan.context.is_usable() {
Expand DownExpand Up@@ -2258,7 +2258,7 @@ where
 let expanded_inbound_key = inbound_payment::ExpandedKey::new(&inbound_pmt_key_material);
 ChannelManager {
 default_configuration: config.clone(),
genesis_hash: genesis_block(params.network).header.block_hash(),
chain_hash: ChainHash::using_genesis_block(params.network),
 fee_estimator: LowerBoundedFeeEstimator::new(fee_est),
 chain_monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -2317,7 +2317,7 @@ where
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand DownExpand Up@@ -2387,7 +2387,7 @@ where
 },
 }
 };
 let res = channel.get_open_channel(self.genesis_hash.clone());
 let res = channel.get_open_channel(self.chain_hash);

 let temporary_channel_id = channel.context.channel_id();
 match peer_state.channel_by_id.entry(temporary_channel_id) {
Expand DownExpand Up@@ -3103,8 +3103,8 @@ where
 // Note that this is likely a timing oracle for detecting whether an scid is a
 // phantom or an intercept.
 if (self.default_configuration.accept_intercept_htlcs &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {
 None
 } else {
Expand DownExpand Up@@ -3332,7 +3332,7 @@ where
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 chain_hash: self.chain_hash,
 short_channel_id,
 timestamp: chan.context.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
Expand DownExpand Up@@ -4250,7 +4250,7 @@ where
 }
 if let PendingHTLCRouting::Forward { onion_packet, .. } = routing {
 let phantom_pubkey_res = self.node_signer.get_node_id(Recipient::PhantomNode);
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.genesis_hash) {
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.chain_hash) {
 let phantom_shared_secret = self.node_signer.ecdh(Recipient::PhantomNode, &onion_packet.public_key.unwrap(), None).unwrap().secret_bytes();
 let next_hop = match onion_utils::decode_next_payment_hop(
 phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac,
Expand DownExpand Up@@ -5876,7 +5876,7 @@ where
	fn internal_open_channel(&self, counterparty_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result<(), MsgHandleErrInternal> {
 // Note that the ChannelManager is NOT re-persisted on disk after this, so any changes are
 // likely to be lost on restart!
 if msg.chain_hash != self.genesis_hash {
 if msg.chain_hash != self.chain_hash {
 return Err(MsgHandleErrInternal::send_err_msg_no_close("Unknown genesis block hash".to_owned(), msg.temporary_channel_id.clone()));
 }

Expand DownExpand Up@@ -6141,7 +6141,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase_entry) => {
 if let ChannelPhase::Funded(chan) = chan_phase_entry.get_mut() {
 let announcement_sigs_opt = try_chan_phase_entry!(self, chan.channel_ready(&msg, &self.node_signer,
 self.genesis_hash.clone(), &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 self.chain_hash, &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 if let Some(announcement_sigs) = announcement_sigs_opt {
 log_trace!(self.logger, "Sending announcement_signatures for channel {}", chan.context.channel_id());
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
Expand DownExpand Up@@ -6518,7 +6518,7 @@ where
 },
 hash_map::Entry::Vacant(entry) => {
 if !is_our_scid && forward_info.incoming_amt_msat.is_some() &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.chain_hash)
 {
 let intercept_id = InterceptId(Sha256::hash(&forward_info.incoming_shared_secret).into_inner());
 let mut pending_intercepts = self.pending_intercepted_htlcs.lock().unwrap();
Expand DownExpand Up@@ -6711,7 +6711,7 @@ where

 peer_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: try_chan_phase_entry!(self, chan.announcement_signatures(
 &self.node_signer, self.genesis_hash.clone(), self.best_block.read().unwrap().height(),
 &self.node_signer, self.chain_hash, self.best_block.read().unwrap().height(),
 msg, &self.default_configuration
 ), chan_phase_entry),
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -6799,7 +6799,7 @@ where
 // freed HTLCs to fail backwards. If in the future we no longer drop pending
 // add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
 let responses = try_chan_phase_entry!(self, chan.channel_reestablish(
 msg, &self.logger, &self.node_signer, self.genesis_hash,
 msg, &self.logger, &self.node_signer, self.chain_hash,
 &self.default_configuration, &*self.best_block.read().unwrap()), chan_phase_entry);
 let mut channel_update = None;
 if let Some(msg) = responses.shutdown_msg {
Expand DownExpand Up@@ -7179,7 +7179,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 match short_to_chan_info.get(&scid_candidate) {
 Some(_) => continue,
Expand DownExpand Up@@ -7209,7 +7209,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 if short_to_chan_info.contains_key(&scid_candidate) { continue }
 return scid_candidate
Expand DownExpand Up@@ -7472,7 +7472,7 @@ where
 *best_block = BestBlock::new(header.prev_blockhash, new_height)
 }

 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
	}
}

Expand All@@ -7498,13 +7498,13 @@ where
 let _persistence_guard =
 PersistenceNotifierGuard::optionally_notify_skipping_background_events(
 self, || -> NotifyOption { NotifyOption::DoPersist });
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger)
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger)
 .map(|(a, b)| (a, Vec::new(), b)));

 let last_best_block_height = self.best_block.read().unwrap().height();
 if height < last_best_block_height {
 let timestamp = self.highest_seen_timestamp.load(Ordering::Acquire);
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
 }
	}

Expand All@@ -7521,7 +7521,7 @@ where
 self, || -> NotifyOption { NotifyOption::DoPersist });
 *self.best_block.write().unwrap() = BestBlock::new(block_hash, height);

 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));

 macro_rules! max_time {
 ($timestamp: expr) => {
Expand DownExpand Up@@ -7641,7 +7641,7 @@ where
 msg: announcement_sigs,
 });
 if let Some(height) = height_opt {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.genesis_hash, height, &self.default_configuration) {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.chain_hash, height, &self.default_configuration) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: announcement,
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -8251,7 +8251,7 @@ where
 let mut peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(ChannelPhase::UnfundedOutboundV1(chan)) = peer_state.channel_by_id.get_mut(&msg.channel_id) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.genesis_hash, &self.fee_estimator) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.chain_hash, &self.fee_estimator) {
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendOpenChannel {
 node_id: *counterparty_node_id,
 msg,
Expand All@@ -8274,8 +8274,8 @@ where
 provided_init_features(&self.default_configuration)
	}

	fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::from(&self.genesis_hash[..])])
	fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![self.chain_hash])
	}

	fn handle_tx_add_input(&self, counterparty_node_id: &PublicKey, msg: &msgs::TxAddInput) {
Expand DownExpand Up@@ -8820,7 +8820,7 @@ where

 write_ver_prefix!(writer, SERIALIZATION_VERSION, MIN_SERIALIZATION_VERSION);

 self.genesis_hash.write(writer)?;
 self.chain_hash.write(writer)?;
 {
 let best_block = self.best_block.read().unwrap();
 best_block.height().write(writer)?;
Expand DownExpand Up@@ -9231,7 +9231,7 @@ where
	fn read<Reader: io::Read>(reader: &mut Reader, mut args: ChannelManagerReadArgs<'a, M, T, ES, NS, SP, F, R, L>) -> Result<Self, DecodeError> {
 let _ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);

 let genesis_hash: BlockHash = Readable::read(reader)?;
 let chain_hash: ChainHash = Readable::read(reader)?;
 let best_block_height: u32 = Readable::read(reader)?;
 let best_block_hash: BlockHash = Readable::read(reader)?;

Expand DownExpand Up@@ -9879,7 +9879,7 @@ where
 let mut outbound_scid_alias;
 loop {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias
 .get_fake_scid(best_block_height, &genesis_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 .get_fake_scid(best_block_height, &chain_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 if outbound_scid_aliases.insert(outbound_scid_alias) { break; }
 }
 chan.context.set_outbound_scid_alias(outbound_scid_alias);
Expand DownExpand Up@@ -9993,7 +9993,7 @@ where
 }

 let channel_manager = ChannelManager {
genesis_hash,
chain_hash,
 fee_estimator: bounded_fee_estimator,
 chain_monitor: args.chain_monitor,
 tx_broadcaster: args.tx_broadcaster,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ use crate::util::config::{UserConfig, MaxDustHTLCExposure};
use bitcoin::hash_types::BlockHash;
use bitcoin::blockdata::script::{Builder, Script};
use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;
use bitcoin::{PackedLockTime, Sequence, Transaction, TxIn, TxOut, Witness};
use bitcoin::OutPoint as BitcoinOutPoint;
Expand DownExpand Up@@ -5830,8 +5830,8 @@ fn bolt2_open_channel_sending_node_checks_part2() {
	assert!(node0_to_1_send_open_channel.to_self_delay==BREAKDOWN_TIMEOUT);

	// BOLT #2 spec: Sending node must ensure the chain_hash value identifies the chain it wishes to open the channel within.
	let chain_hash=genesis_block(Network::Testnet).header.block_hash();
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);
	let chain_hash = ChainHash::using_genesis_block(Network::Testnet);
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);

	// BOLT #2 spec: Sending node must set funding_pubkey, revocation_basepoint, htlc_basepoint, payment_basepoint, and delayed_payment_basepoint to valid DER-encoded, compressed, secp256k1 pubkeys.
	assert!(PublicKey::from_slice(&node0_to_1_send_open_channel.funding_pubkey.serialize()).is_ok());
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" + '
Use `ChainHash` instead of `BlockHash` as applicable by jkczyz · Pull Request #2662 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use ChainHash instead of BlockHash as applicable#2662

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

valentinewallace
merged 1 commit into

from

Oct 17, 2023
 Merged


Use ChainHash instead of BlockHash as applicable
#2662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::script::Builder;
use bitcoin::blockdata::transaction::TxOut;
use bitcoin::hash_types::BlockHash;

use lightning::blinded_path::{BlindedHop, BlindedPath};
use lightning::chain::transaction::OutPoint;
Expand DownExpand Up@@ -89,7 +89,7 @@ struct FuzzChainSource<'a, 'b, Out: test_logger::Output> {
	net_graph: &'a NetworkGraph<&'b test_logger::TestLogger<Out>>,
}
impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
	fn get_utxo(&self, _genesis_hash: &BlockHash, _short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, _short_channel_id: u64) -> UtxoResult {
 let input_slice = self.input.get_slice(2);
 if input_slice.is_none() { return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx)); }
 let input_slice = input_slice.unwrap();
Expand Down

3 changes: 2 additions & 1 deletion
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
use crate::{AsyncBlockSourceResult, BlockData, BlockSource, BlockSourceError};

use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::transaction::{TxOut, OutPoint};
use bitcoin::hash_types::BlockHash;

Expand DownExpand Up@@ -302,7 +303,7 @@ impl<S: FutureSpawner,
	CMH::Target: CustomMessageHandler,
	NS::Target: NodeSigner,
{
	fn get_utxo(&self, _genesis_hash: &BlockHash, short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, short_channel_id: u64) -> UtxoResult {
 let res = UtxoFuture::new();
 let fut = res.clone();
 let source = self.source.clone();
Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,7 +630,7 @@ mod tests {
 fn handle_error(&self, _their_node_id: &PublicKey, _msg: &ErrorMessage) {}
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::empty() }
 fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::using_genesis_block(Network::Testnet)])
 }
	}
Expand Down

8 changes: 4 additions & 4 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use core::cmp::max;
use core::ops::Deref;
use core::sync::atomic::Ordering;

use bitcoin::BlockHash;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::secp256k1::PublicKey;

use lightning::ln::msgs::{
Expand DownExpand Up@@ -67,9 +67,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 return Err(DecodeError::UnknownVersion.into());
 }

 let chain_hash: BlockHash = Readable::read(read_cursor)?;
 let ng_genesis_hash = self.network_graph.get_genesis_hash();
 if chain_hash != ng_genesis_hash {
 let chain_hash: ChainHash = Readable::read(read_cursor)?;
 let ng_chain_hash = self.network_graph.get_chain_hash();
 if chain_hash != ng_chain_hash {
 return Err(
 LightningError {
 err: "Rapid Gossip Sync data's chain hash does not match the network graph's".to_owned(),
Expand Down

77 changes: 39 additions & 38 deletions
lightning/src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


58 changes: 29 additions & 29 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@

use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::{genesis_block, ChainHash};
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;

use bitcoin::hashes::Hash;
Expand DownExpand Up@@ -1018,7 +1018,7 @@ where
	L::Target: Logger,
{
	default_configuration: UserConfig,
genesis_hash: BlockHash,
chain_hash: ChainHash,
	fee_estimator: LowerBoundedFeeEstimator<F>,
	chain_monitor: M,
	tx_broadcaster: T,
Expand DownExpand Up@@ -2012,7 +2012,7 @@ macro_rules! emit_channel_ready_event {
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let mut updates = $chan.monitor_updating_restored(&$self.logger,
 &$self.node_signer, $self.genesis_hash, &$self.default_configuration,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
 $self.best_block.read().unwrap().height());
 let counterparty_node_id = $chan.context.get_counterparty_node_id();
 let channel_update = if updates.channel_ready.is_some() && $chan.context.is_usable() {
Expand DownExpand Up@@ -2258,7 +2258,7 @@ where
 let expanded_inbound_key = inbound_payment::ExpandedKey::new(&inbound_pmt_key_material);
 ChannelManager {
 default_configuration: config.clone(),
genesis_hash: genesis_block(params.network).header.block_hash(),
chain_hash: ChainHash::using_genesis_block(params.network),
 fee_estimator: LowerBoundedFeeEstimator::new(fee_est),
 chain_monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -2317,7 +2317,7 @@ where
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand DownExpand Up@@ -2387,7 +2387,7 @@ where
 },
 }
 };
 let res = channel.get_open_channel(self.genesis_hash.clone());
 let res = channel.get_open_channel(self.chain_hash);

 let temporary_channel_id = channel.context.channel_id();
 match peer_state.channel_by_id.entry(temporary_channel_id) {
Expand DownExpand Up@@ -3103,8 +3103,8 @@ where
 // Note that this is likely a timing oracle for detecting whether an scid is a
 // phantom or an intercept.
 if (self.default_configuration.accept_intercept_htlcs &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {
 None
 } else {
Expand DownExpand Up@@ -3332,7 +3332,7 @@ where
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 chain_hash: self.chain_hash,
 short_channel_id,
 timestamp: chan.context.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
Expand DownExpand Up@@ -4250,7 +4250,7 @@ where
 }
 if let PendingHTLCRouting::Forward { onion_packet, .. } = routing {
 let phantom_pubkey_res = self.node_signer.get_node_id(Recipient::PhantomNode);
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.genesis_hash) {
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.chain_hash) {
 let phantom_shared_secret = self.node_signer.ecdh(Recipient::PhantomNode, &onion_packet.public_key.unwrap(), None).unwrap().secret_bytes();
 let next_hop = match onion_utils::decode_next_payment_hop(
 phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac,
Expand DownExpand Up@@ -5876,7 +5876,7 @@ where
	fn internal_open_channel(&self, counterparty_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result<(), MsgHandleErrInternal> {
 // Note that the ChannelManager is NOT re-persisted on disk after this, so any changes are
 // likely to be lost on restart!
 if msg.chain_hash != self.genesis_hash {
 if msg.chain_hash != self.chain_hash {
 return Err(MsgHandleErrInternal::send_err_msg_no_close("Unknown genesis block hash".to_owned(), msg.temporary_channel_id.clone()));
 }

Expand DownExpand Up@@ -6141,7 +6141,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase_entry) => {
 if let ChannelPhase::Funded(chan) = chan_phase_entry.get_mut() {
 let announcement_sigs_opt = try_chan_phase_entry!(self, chan.channel_ready(&msg, &self.node_signer,
 self.genesis_hash.clone(), &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 self.chain_hash, &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 if let Some(announcement_sigs) = announcement_sigs_opt {
 log_trace!(self.logger, "Sending announcement_signatures for channel {}", chan.context.channel_id());
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
Expand DownExpand Up@@ -6518,7 +6518,7 @@ where
 },
 hash_map::Entry::Vacant(entry) => {
 if !is_our_scid && forward_info.incoming_amt_msat.is_some() &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.chain_hash)
 {
 let intercept_id = InterceptId(Sha256::hash(&forward_info.incoming_shared_secret).into_inner());
 let mut pending_intercepts = self.pending_intercepted_htlcs.lock().unwrap();
Expand DownExpand Up@@ -6711,7 +6711,7 @@ where

 peer_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: try_chan_phase_entry!(self, chan.announcement_signatures(
 &self.node_signer, self.genesis_hash.clone(), self.best_block.read().unwrap().height(),
 &self.node_signer, self.chain_hash, self.best_block.read().unwrap().height(),
 msg, &self.default_configuration
 ), chan_phase_entry),
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -6799,7 +6799,7 @@ where
 // freed HTLCs to fail backwards. If in the future we no longer drop pending
 // add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
 let responses = try_chan_phase_entry!(self, chan.channel_reestablish(
 msg, &self.logger, &self.node_signer, self.genesis_hash,
 msg, &self.logger, &self.node_signer, self.chain_hash,
 &self.default_configuration, &*self.best_block.read().unwrap()), chan_phase_entry);
 let mut channel_update = None;
 if let Some(msg) = responses.shutdown_msg {
Expand DownExpand Up@@ -7179,7 +7179,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 match short_to_chan_info.get(&scid_candidate) {
 Some(_) => continue,
Expand DownExpand Up@@ -7209,7 +7209,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 if short_to_chan_info.contains_key(&scid_candidate) { continue }
 return scid_candidate
Expand DownExpand Up@@ -7472,7 +7472,7 @@ where
 *best_block = BestBlock::new(header.prev_blockhash, new_height)
 }

 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
	}
}

Expand All@@ -7498,13 +7498,13 @@ where
 let _persistence_guard =
 PersistenceNotifierGuard::optionally_notify_skipping_background_events(
 self, || -> NotifyOption { NotifyOption::DoPersist });
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger)
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger)
 .map(|(a, b)| (a, Vec::new(), b)));

 let last_best_block_height = self.best_block.read().unwrap().height();
 if height < last_best_block_height {
 let timestamp = self.highest_seen_timestamp.load(Ordering::Acquire);
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
 }
	}

Expand All@@ -7521,7 +7521,7 @@ where
 self, || -> NotifyOption { NotifyOption::DoPersist });
 *self.best_block.write().unwrap() = BestBlock::new(block_hash, height);

 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));

 macro_rules! max_time {
 ($timestamp: expr) => {
Expand DownExpand Up@@ -7641,7 +7641,7 @@ where
 msg: announcement_sigs,
 });
 if let Some(height) = height_opt {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.genesis_hash, height, &self.default_configuration) {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.chain_hash, height, &self.default_configuration) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: announcement,
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -8251,7 +8251,7 @@ where
 let mut peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(ChannelPhase::UnfundedOutboundV1(chan)) = peer_state.channel_by_id.get_mut(&msg.channel_id) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.genesis_hash, &self.fee_estimator) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.chain_hash, &self.fee_estimator) {
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendOpenChannel {
 node_id: *counterparty_node_id,
 msg,
Expand All@@ -8274,8 +8274,8 @@ where
 provided_init_features(&self.default_configuration)
	}

	fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::from(&self.genesis_hash[..])])
	fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![self.chain_hash])
	}

	fn handle_tx_add_input(&self, counterparty_node_id: &PublicKey, msg: &msgs::TxAddInput) {
Expand DownExpand Up@@ -8820,7 +8820,7 @@ where

 write_ver_prefix!(writer, SERIALIZATION_VERSION, MIN_SERIALIZATION_VERSION);

 self.genesis_hash.write(writer)?;
 self.chain_hash.write(writer)?;
 {
 let best_block = self.best_block.read().unwrap();
 best_block.height().write(writer)?;
Expand DownExpand Up@@ -9231,7 +9231,7 @@ where
	fn read<Reader: io::Read>(reader: &mut Reader, mut args: ChannelManagerReadArgs<'a, M, T, ES, NS, SP, F, R, L>) -> Result<Self, DecodeError> {
 let _ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);

 let genesis_hash: BlockHash = Readable::read(reader)?;
 let chain_hash: ChainHash = Readable::read(reader)?;
 let best_block_height: u32 = Readable::read(reader)?;
 let best_block_hash: BlockHash = Readable::read(reader)?;

Expand DownExpand Up@@ -9879,7 +9879,7 @@ where
 let mut outbound_scid_alias;
 loop {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias
 .get_fake_scid(best_block_height, &genesis_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 .get_fake_scid(best_block_height, &chain_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 if outbound_scid_aliases.insert(outbound_scid_alias) { break; }
 }
 chan.context.set_outbound_scid_alias(outbound_scid_alias);
Expand DownExpand Up@@ -9993,7 +9993,7 @@ where
 }

 let channel_manager = ChannelManager {
genesis_hash,
chain_hash,
 fee_estimator: bounded_fee_estimator,
 chain_monitor: args.chain_monitor,
 tx_broadcaster: args.tx_broadcaster,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ use crate::util::config::{UserConfig, MaxDustHTLCExposure};
use bitcoin::hash_types::BlockHash;
use bitcoin::blockdata::script::{Builder, Script};
use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;
use bitcoin::{PackedLockTime, Sequence, Transaction, TxIn, TxOut, Witness};
use bitcoin::OutPoint as BitcoinOutPoint;
Expand DownExpand Up@@ -5830,8 +5830,8 @@ fn bolt2_open_channel_sending_node_checks_part2() {
	assert!(node0_to_1_send_open_channel.to_self_delay==BREAKDOWN_TIMEOUT);

	// BOLT #2 spec: Sending node must ensure the chain_hash value identifies the chain it wishes to open the channel within.
	let chain_hash=genesis_block(Network::Testnet).header.block_hash();
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);
	let chain_hash = ChainHash::using_genesis_block(Network::Testnet);
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);

	// BOLT #2 spec: Sending node must set funding_pubkey, revocation_basepoint, htlc_basepoint, payment_basepoint, and delayed_payment_basepoint to valid DER-encoded, compressed, secp256k1 pubkeys.
	assert!(PublicKey::from_slice(&node0_to_1_send_open_channel.funding_pubkey.serialize()).is_ok());
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('^' + ".*" + '
Use `ChainHash` instead of `BlockHash` as applicable by jkczyz · Pull Request #2662 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use ChainHash instead of BlockHash as applicable#2662

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

valentinewallace
merged 1 commit into

from

Oct 17, 2023
 Merged


Use ChainHash instead of BlockHash as applicable
#2662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::script::Builder;
use bitcoin::blockdata::transaction::TxOut;
use bitcoin::hash_types::BlockHash;

use lightning::blinded_path::{BlindedHop, BlindedPath};
use lightning::chain::transaction::OutPoint;
Expand DownExpand Up@@ -89,7 +89,7 @@ struct FuzzChainSource<'a, 'b, Out: test_logger::Output> {
	net_graph: &'a NetworkGraph<&'b test_logger::TestLogger<Out>>,
}
impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
	fn get_utxo(&self, _genesis_hash: &BlockHash, _short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, _short_channel_id: u64) -> UtxoResult {
 let input_slice = self.input.get_slice(2);
 if input_slice.is_none() { return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx)); }
 let input_slice = input_slice.unwrap();
Expand Down

3 changes: 2 additions & 1 deletion
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
use crate::{AsyncBlockSourceResult, BlockData, BlockSource, BlockSourceError};

use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::transaction::{TxOut, OutPoint};
use bitcoin::hash_types::BlockHash;

Expand DownExpand Up@@ -302,7 +303,7 @@ impl<S: FutureSpawner,
	CMH::Target: CustomMessageHandler,
	NS::Target: NodeSigner,
{
	fn get_utxo(&self, _genesis_hash: &BlockHash, short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, short_channel_id: u64) -> UtxoResult {
 let res = UtxoFuture::new();
 let fut = res.clone();
 let source = self.source.clone();
Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,7 +630,7 @@ mod tests {
 fn handle_error(&self, _their_node_id: &PublicKey, _msg: &ErrorMessage) {}
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::empty() }
 fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::using_genesis_block(Network::Testnet)])
 }
	}
Expand Down

8 changes: 4 additions & 4 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use core::cmp::max;
use core::ops::Deref;
use core::sync::atomic::Ordering;

use bitcoin::BlockHash;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::secp256k1::PublicKey;

use lightning::ln::msgs::{
Expand DownExpand Up@@ -67,9 +67,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 return Err(DecodeError::UnknownVersion.into());
 }

 let chain_hash: BlockHash = Readable::read(read_cursor)?;
 let ng_genesis_hash = self.network_graph.get_genesis_hash();
 if chain_hash != ng_genesis_hash {
 let chain_hash: ChainHash = Readable::read(read_cursor)?;
 let ng_chain_hash = self.network_graph.get_chain_hash();
 if chain_hash != ng_chain_hash {
 return Err(
 LightningError {
 err: "Rapid Gossip Sync data's chain hash does not match the network graph's".to_owned(),
Expand Down

77 changes: 39 additions & 38 deletions
lightning/src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


58 changes: 29 additions & 29 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@

use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::{genesis_block, ChainHash};
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;

use bitcoin::hashes::Hash;
Expand DownExpand Up@@ -1018,7 +1018,7 @@ where
	L::Target: Logger,
{
	default_configuration: UserConfig,
genesis_hash: BlockHash,
chain_hash: ChainHash,
	fee_estimator: LowerBoundedFeeEstimator<F>,
	chain_monitor: M,
	tx_broadcaster: T,
Expand DownExpand Up@@ -2012,7 +2012,7 @@ macro_rules! emit_channel_ready_event {
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let mut updates = $chan.monitor_updating_restored(&$self.logger,
 &$self.node_signer, $self.genesis_hash, &$self.default_configuration,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
 $self.best_block.read().unwrap().height());
 let counterparty_node_id = $chan.context.get_counterparty_node_id();
 let channel_update = if updates.channel_ready.is_some() && $chan.context.is_usable() {
Expand DownExpand Up@@ -2258,7 +2258,7 @@ where
 let expanded_inbound_key = inbound_payment::ExpandedKey::new(&inbound_pmt_key_material);
 ChannelManager {
 default_configuration: config.clone(),
genesis_hash: genesis_block(params.network).header.block_hash(),
chain_hash: ChainHash::using_genesis_block(params.network),
 fee_estimator: LowerBoundedFeeEstimator::new(fee_est),
 chain_monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -2317,7 +2317,7 @@ where
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand DownExpand Up@@ -2387,7 +2387,7 @@ where
 },
 }
 };
 let res = channel.get_open_channel(self.genesis_hash.clone());
 let res = channel.get_open_channel(self.chain_hash);

 let temporary_channel_id = channel.context.channel_id();
 match peer_state.channel_by_id.entry(temporary_channel_id) {
Expand DownExpand Up@@ -3103,8 +3103,8 @@ where
 // Note that this is likely a timing oracle for detecting whether an scid is a
 // phantom or an intercept.
 if (self.default_configuration.accept_intercept_htlcs &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {
 None
 } else {
Expand DownExpand Up@@ -3332,7 +3332,7 @@ where
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 chain_hash: self.chain_hash,
 short_channel_id,
 timestamp: chan.context.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
Expand DownExpand Up@@ -4250,7 +4250,7 @@ where
 }
 if let PendingHTLCRouting::Forward { onion_packet, .. } = routing {
 let phantom_pubkey_res = self.node_signer.get_node_id(Recipient::PhantomNode);
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.genesis_hash) {
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.chain_hash) {
 let phantom_shared_secret = self.node_signer.ecdh(Recipient::PhantomNode, &onion_packet.public_key.unwrap(), None).unwrap().secret_bytes();
 let next_hop = match onion_utils::decode_next_payment_hop(
 phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac,
Expand DownExpand Up@@ -5876,7 +5876,7 @@ where
	fn internal_open_channel(&self, counterparty_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result<(), MsgHandleErrInternal> {
 // Note that the ChannelManager is NOT re-persisted on disk after this, so any changes are
 // likely to be lost on restart!
 if msg.chain_hash != self.genesis_hash {
 if msg.chain_hash != self.chain_hash {
 return Err(MsgHandleErrInternal::send_err_msg_no_close("Unknown genesis block hash".to_owned(), msg.temporary_channel_id.clone()));
 }

Expand DownExpand Up@@ -6141,7 +6141,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase_entry) => {
 if let ChannelPhase::Funded(chan) = chan_phase_entry.get_mut() {
 let announcement_sigs_opt = try_chan_phase_entry!(self, chan.channel_ready(&msg, &self.node_signer,
 self.genesis_hash.clone(), &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 self.chain_hash, &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 if let Some(announcement_sigs) = announcement_sigs_opt {
 log_trace!(self.logger, "Sending announcement_signatures for channel {}", chan.context.channel_id());
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
Expand DownExpand Up@@ -6518,7 +6518,7 @@ where
 },
 hash_map::Entry::Vacant(entry) => {
 if !is_our_scid && forward_info.incoming_amt_msat.is_some() &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.chain_hash)
 {
 let intercept_id = InterceptId(Sha256::hash(&forward_info.incoming_shared_secret).into_inner());
 let mut pending_intercepts = self.pending_intercepted_htlcs.lock().unwrap();
Expand DownExpand Up@@ -6711,7 +6711,7 @@ where

 peer_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: try_chan_phase_entry!(self, chan.announcement_signatures(
 &self.node_signer, self.genesis_hash.clone(), self.best_block.read().unwrap().height(),
 &self.node_signer, self.chain_hash, self.best_block.read().unwrap().height(),
 msg, &self.default_configuration
 ), chan_phase_entry),
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -6799,7 +6799,7 @@ where
 // freed HTLCs to fail backwards. If in the future we no longer drop pending
 // add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
 let responses = try_chan_phase_entry!(self, chan.channel_reestablish(
 msg, &self.logger, &self.node_signer, self.genesis_hash,
 msg, &self.logger, &self.node_signer, self.chain_hash,
 &self.default_configuration, &*self.best_block.read().unwrap()), chan_phase_entry);
 let mut channel_update = None;
 if let Some(msg) = responses.shutdown_msg {
Expand DownExpand Up@@ -7179,7 +7179,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 match short_to_chan_info.get(&scid_candidate) {
 Some(_) => continue,
Expand DownExpand Up@@ -7209,7 +7209,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 if short_to_chan_info.contains_key(&scid_candidate) { continue }
 return scid_candidate
Expand DownExpand Up@@ -7472,7 +7472,7 @@ where
 *best_block = BestBlock::new(header.prev_blockhash, new_height)
 }

 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
	}
}

Expand All@@ -7498,13 +7498,13 @@ where
 let _persistence_guard =
 PersistenceNotifierGuard::optionally_notify_skipping_background_events(
 self, || -> NotifyOption { NotifyOption::DoPersist });
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger)
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger)
 .map(|(a, b)| (a, Vec::new(), b)));

 let last_best_block_height = self.best_block.read().unwrap().height();
 if height < last_best_block_height {
 let timestamp = self.highest_seen_timestamp.load(Ordering::Acquire);
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
 }
	}

Expand All@@ -7521,7 +7521,7 @@ where
 self, || -> NotifyOption { NotifyOption::DoPersist });
 *self.best_block.write().unwrap() = BestBlock::new(block_hash, height);

 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));

 macro_rules! max_time {
 ($timestamp: expr) => {
Expand DownExpand Up@@ -7641,7 +7641,7 @@ where
 msg: announcement_sigs,
 });
 if let Some(height) = height_opt {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.genesis_hash, height, &self.default_configuration) {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.chain_hash, height, &self.default_configuration) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: announcement,
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -8251,7 +8251,7 @@ where
 let mut peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(ChannelPhase::UnfundedOutboundV1(chan)) = peer_state.channel_by_id.get_mut(&msg.channel_id) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.genesis_hash, &self.fee_estimator) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.chain_hash, &self.fee_estimator) {
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendOpenChannel {
 node_id: *counterparty_node_id,
 msg,
Expand All@@ -8274,8 +8274,8 @@ where
 provided_init_features(&self.default_configuration)
	}

	fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::from(&self.genesis_hash[..])])
	fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![self.chain_hash])
	}

	fn handle_tx_add_input(&self, counterparty_node_id: &PublicKey, msg: &msgs::TxAddInput) {
Expand DownExpand Up@@ -8820,7 +8820,7 @@ where

 write_ver_prefix!(writer, SERIALIZATION_VERSION, MIN_SERIALIZATION_VERSION);

 self.genesis_hash.write(writer)?;
 self.chain_hash.write(writer)?;
 {
 let best_block = self.best_block.read().unwrap();
 best_block.height().write(writer)?;
Expand DownExpand Up@@ -9231,7 +9231,7 @@ where
	fn read<Reader: io::Read>(reader: &mut Reader, mut args: ChannelManagerReadArgs<'a, M, T, ES, NS, SP, F, R, L>) -> Result<Self, DecodeError> {
 let _ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);

 let genesis_hash: BlockHash = Readable::read(reader)?;
 let chain_hash: ChainHash = Readable::read(reader)?;
 let best_block_height: u32 = Readable::read(reader)?;
 let best_block_hash: BlockHash = Readable::read(reader)?;

Expand DownExpand Up@@ -9879,7 +9879,7 @@ where
 let mut outbound_scid_alias;
 loop {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias
 .get_fake_scid(best_block_height, &genesis_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 .get_fake_scid(best_block_height, &chain_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 if outbound_scid_aliases.insert(outbound_scid_alias) { break; }
 }
 chan.context.set_outbound_scid_alias(outbound_scid_alias);
Expand DownExpand Up@@ -9993,7 +9993,7 @@ where
 }

 let channel_manager = ChannelManager {
genesis_hash,
chain_hash,
 fee_estimator: bounded_fee_estimator,
 chain_monitor: args.chain_monitor,
 tx_broadcaster: args.tx_broadcaster,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ use crate::util::config::{UserConfig, MaxDustHTLCExposure};
use bitcoin::hash_types::BlockHash;
use bitcoin::blockdata::script::{Builder, Script};
use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;
use bitcoin::{PackedLockTime, Sequence, Transaction, TxIn, TxOut, Witness};
use bitcoin::OutPoint as BitcoinOutPoint;
Expand DownExpand Up@@ -5830,8 +5830,8 @@ fn bolt2_open_channel_sending_node_checks_part2() {
	assert!(node0_to_1_send_open_channel.to_self_delay==BREAKDOWN_TIMEOUT);

	// BOLT #2 spec: Sending node must ensure the chain_hash value identifies the chain it wishes to open the channel within.
	let chain_hash=genesis_block(Network::Testnet).header.block_hash();
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);
	let chain_hash = ChainHash::using_genesis_block(Network::Testnet);
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);

	// BOLT #2 spec: Sending node must set funding_pubkey, revocation_basepoint, htlc_basepoint, payment_basepoint, and delayed_payment_basepoint to valid DER-encoded, compressed, secp256k1 pubkeys.
	assert!(PublicKey::from_slice(&node0_to_1_send_open_channel.funding_pubkey.serialize()).is_ok());
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('^' + ".*" + '
Use `ChainHash` instead of `BlockHash` as applicable by jkczyz · Pull Request #2662 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use ChainHash instead of BlockHash as applicable#2662

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

valentinewallace
merged 1 commit into

from

Oct 17, 2023
 Merged


Use ChainHash instead of BlockHash as applicable
#2662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::script::Builder;
use bitcoin::blockdata::transaction::TxOut;
use bitcoin::hash_types::BlockHash;

use lightning::blinded_path::{BlindedHop, BlindedPath};
use lightning::chain::transaction::OutPoint;
Expand DownExpand Up@@ -89,7 +89,7 @@ struct FuzzChainSource<'a, 'b, Out: test_logger::Output> {
	net_graph: &'a NetworkGraph<&'b test_logger::TestLogger<Out>>,
}
impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
	fn get_utxo(&self, _genesis_hash: &BlockHash, _short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, _short_channel_id: u64) -> UtxoResult {
 let input_slice = self.input.get_slice(2);
 if input_slice.is_none() { return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx)); }
 let input_slice = input_slice.unwrap();
Expand Down

3 changes: 2 additions & 1 deletion
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
use crate::{AsyncBlockSourceResult, BlockData, BlockSource, BlockSourceError};

use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::transaction::{TxOut, OutPoint};
use bitcoin::hash_types::BlockHash;

Expand DownExpand Up@@ -302,7 +303,7 @@ impl<S: FutureSpawner,
	CMH::Target: CustomMessageHandler,
	NS::Target: NodeSigner,
{
	fn get_utxo(&self, _genesis_hash: &BlockHash, short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, short_channel_id: u64) -> UtxoResult {
 let res = UtxoFuture::new();
 let fut = res.clone();
 let source = self.source.clone();
Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,7 +630,7 @@ mod tests {
 fn handle_error(&self, _their_node_id: &PublicKey, _msg: &ErrorMessage) {}
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::empty() }
 fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::using_genesis_block(Network::Testnet)])
 }
	}
Expand Down

8 changes: 4 additions & 4 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use core::cmp::max;
use core::ops::Deref;
use core::sync::atomic::Ordering;

use bitcoin::BlockHash;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::secp256k1::PublicKey;

use lightning::ln::msgs::{
Expand DownExpand Up@@ -67,9 +67,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 return Err(DecodeError::UnknownVersion.into());
 }

 let chain_hash: BlockHash = Readable::read(read_cursor)?;
 let ng_genesis_hash = self.network_graph.get_genesis_hash();
 if chain_hash != ng_genesis_hash {
 let chain_hash: ChainHash = Readable::read(read_cursor)?;
 let ng_chain_hash = self.network_graph.get_chain_hash();
 if chain_hash != ng_chain_hash {
 return Err(
 LightningError {
 err: "Rapid Gossip Sync data's chain hash does not match the network graph's".to_owned(),
Expand Down

77 changes: 39 additions & 38 deletions
lightning/src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


58 changes: 29 additions & 29 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@

use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::{genesis_block, ChainHash};
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;

use bitcoin::hashes::Hash;
Expand DownExpand Up@@ -1018,7 +1018,7 @@ where
	L::Target: Logger,
{
	default_configuration: UserConfig,
genesis_hash: BlockHash,
chain_hash: ChainHash,
	fee_estimator: LowerBoundedFeeEstimator<F>,
	chain_monitor: M,
	tx_broadcaster: T,
Expand DownExpand Up@@ -2012,7 +2012,7 @@ macro_rules! emit_channel_ready_event {
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let mut updates = $chan.monitor_updating_restored(&$self.logger,
 &$self.node_signer, $self.genesis_hash, &$self.default_configuration,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
 $self.best_block.read().unwrap().height());
 let counterparty_node_id = $chan.context.get_counterparty_node_id();
 let channel_update = if updates.channel_ready.is_some() && $chan.context.is_usable() {
Expand DownExpand Up@@ -2258,7 +2258,7 @@ where
 let expanded_inbound_key = inbound_payment::ExpandedKey::new(&inbound_pmt_key_material);
 ChannelManager {
 default_configuration: config.clone(),
genesis_hash: genesis_block(params.network).header.block_hash(),
chain_hash: ChainHash::using_genesis_block(params.network),
 fee_estimator: LowerBoundedFeeEstimator::new(fee_est),
 chain_monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -2317,7 +2317,7 @@ where
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand DownExpand Up@@ -2387,7 +2387,7 @@ where
 },
 }
 };
 let res = channel.get_open_channel(self.genesis_hash.clone());
 let res = channel.get_open_channel(self.chain_hash);

 let temporary_channel_id = channel.context.channel_id();
 match peer_state.channel_by_id.entry(temporary_channel_id) {
Expand DownExpand Up@@ -3103,8 +3103,8 @@ where
 // Note that this is likely a timing oracle for detecting whether an scid is a
 // phantom or an intercept.
 if (self.default_configuration.accept_intercept_htlcs &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {
 None
 } else {
Expand DownExpand Up@@ -3332,7 +3332,7 @@ where
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 chain_hash: self.chain_hash,
 short_channel_id,
 timestamp: chan.context.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
Expand DownExpand Up@@ -4250,7 +4250,7 @@ where
 }
 if let PendingHTLCRouting::Forward { onion_packet, .. } = routing {
 let phantom_pubkey_res = self.node_signer.get_node_id(Recipient::PhantomNode);
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.genesis_hash) {
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.chain_hash) {
 let phantom_shared_secret = self.node_signer.ecdh(Recipient::PhantomNode, &onion_packet.public_key.unwrap(), None).unwrap().secret_bytes();
 let next_hop = match onion_utils::decode_next_payment_hop(
 phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac,
Expand DownExpand Up@@ -5876,7 +5876,7 @@ where
	fn internal_open_channel(&self, counterparty_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result<(), MsgHandleErrInternal> {
 // Note that the ChannelManager is NOT re-persisted on disk after this, so any changes are
 // likely to be lost on restart!
 if msg.chain_hash != self.genesis_hash {
 if msg.chain_hash != self.chain_hash {
 return Err(MsgHandleErrInternal::send_err_msg_no_close("Unknown genesis block hash".to_owned(), msg.temporary_channel_id.clone()));
 }

Expand DownExpand Up@@ -6141,7 +6141,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase_entry) => {
 if let ChannelPhase::Funded(chan) = chan_phase_entry.get_mut() {
 let announcement_sigs_opt = try_chan_phase_entry!(self, chan.channel_ready(&msg, &self.node_signer,
 self.genesis_hash.clone(), &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 self.chain_hash, &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 if let Some(announcement_sigs) = announcement_sigs_opt {
 log_trace!(self.logger, "Sending announcement_signatures for channel {}", chan.context.channel_id());
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
Expand DownExpand Up@@ -6518,7 +6518,7 @@ where
 },
 hash_map::Entry::Vacant(entry) => {
 if !is_our_scid && forward_info.incoming_amt_msat.is_some() &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.chain_hash)
 {
 let intercept_id = InterceptId(Sha256::hash(&forward_info.incoming_shared_secret).into_inner());
 let mut pending_intercepts = self.pending_intercepted_htlcs.lock().unwrap();
Expand DownExpand Up@@ -6711,7 +6711,7 @@ where

 peer_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: try_chan_phase_entry!(self, chan.announcement_signatures(
 &self.node_signer, self.genesis_hash.clone(), self.best_block.read().unwrap().height(),
 &self.node_signer, self.chain_hash, self.best_block.read().unwrap().height(),
 msg, &self.default_configuration
 ), chan_phase_entry),
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -6799,7 +6799,7 @@ where
 // freed HTLCs to fail backwards. If in the future we no longer drop pending
 // add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
 let responses = try_chan_phase_entry!(self, chan.channel_reestablish(
 msg, &self.logger, &self.node_signer, self.genesis_hash,
 msg, &self.logger, &self.node_signer, self.chain_hash,
 &self.default_configuration, &*self.best_block.read().unwrap()), chan_phase_entry);
 let mut channel_update = None;
 if let Some(msg) = responses.shutdown_msg {
Expand DownExpand Up@@ -7179,7 +7179,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 match short_to_chan_info.get(&scid_candidate) {
 Some(_) => continue,
Expand DownExpand Up@@ -7209,7 +7209,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 if short_to_chan_info.contains_key(&scid_candidate) { continue }
 return scid_candidate
Expand DownExpand Up@@ -7472,7 +7472,7 @@ where
 *best_block = BestBlock::new(header.prev_blockhash, new_height)
 }

 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
	}
}

Expand All@@ -7498,13 +7498,13 @@ where
 let _persistence_guard =
 PersistenceNotifierGuard::optionally_notify_skipping_background_events(
 self, || -> NotifyOption { NotifyOption::DoPersist });
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger)
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger)
 .map(|(a, b)| (a, Vec::new(), b)));

 let last_best_block_height = self.best_block.read().unwrap().height();
 if height < last_best_block_height {
 let timestamp = self.highest_seen_timestamp.load(Ordering::Acquire);
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
 }
	}

Expand All@@ -7521,7 +7521,7 @@ where
 self, || -> NotifyOption { NotifyOption::DoPersist });
 *self.best_block.write().unwrap() = BestBlock::new(block_hash, height);

 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));

 macro_rules! max_time {
 ($timestamp: expr) => {
Expand DownExpand Up@@ -7641,7 +7641,7 @@ where
 msg: announcement_sigs,
 });
 if let Some(height) = height_opt {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.genesis_hash, height, &self.default_configuration) {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.chain_hash, height, &self.default_configuration) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: announcement,
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -8251,7 +8251,7 @@ where
 let mut peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(ChannelPhase::UnfundedOutboundV1(chan)) = peer_state.channel_by_id.get_mut(&msg.channel_id) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.genesis_hash, &self.fee_estimator) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.chain_hash, &self.fee_estimator) {
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendOpenChannel {
 node_id: *counterparty_node_id,
 msg,
Expand All@@ -8274,8 +8274,8 @@ where
 provided_init_features(&self.default_configuration)
	}

	fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::from(&self.genesis_hash[..])])
	fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![self.chain_hash])
	}

	fn handle_tx_add_input(&self, counterparty_node_id: &PublicKey, msg: &msgs::TxAddInput) {
Expand DownExpand Up@@ -8820,7 +8820,7 @@ where

 write_ver_prefix!(writer, SERIALIZATION_VERSION, MIN_SERIALIZATION_VERSION);

 self.genesis_hash.write(writer)?;
 self.chain_hash.write(writer)?;
 {
 let best_block = self.best_block.read().unwrap();
 best_block.height().write(writer)?;
Expand DownExpand Up@@ -9231,7 +9231,7 @@ where
	fn read<Reader: io::Read>(reader: &mut Reader, mut args: ChannelManagerReadArgs<'a, M, T, ES, NS, SP, F, R, L>) -> Result<Self, DecodeError> {
 let _ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);

 let genesis_hash: BlockHash = Readable::read(reader)?;
 let chain_hash: ChainHash = Readable::read(reader)?;
 let best_block_height: u32 = Readable::read(reader)?;
 let best_block_hash: BlockHash = Readable::read(reader)?;

Expand DownExpand Up@@ -9879,7 +9879,7 @@ where
 let mut outbound_scid_alias;
 loop {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias
 .get_fake_scid(best_block_height, &genesis_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 .get_fake_scid(best_block_height, &chain_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 if outbound_scid_aliases.insert(outbound_scid_alias) { break; }
 }
 chan.context.set_outbound_scid_alias(outbound_scid_alias);
Expand DownExpand Up@@ -9993,7 +9993,7 @@ where
 }

 let channel_manager = ChannelManager {
genesis_hash,
chain_hash,
 fee_estimator: bounded_fee_estimator,
 chain_monitor: args.chain_monitor,
 tx_broadcaster: args.tx_broadcaster,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ use crate::util::config::{UserConfig, MaxDustHTLCExposure};
use bitcoin::hash_types::BlockHash;
use bitcoin::blockdata::script::{Builder, Script};
use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;
use bitcoin::{PackedLockTime, Sequence, Transaction, TxIn, TxOut, Witness};
use bitcoin::OutPoint as BitcoinOutPoint;
Expand DownExpand Up@@ -5830,8 +5830,8 @@ fn bolt2_open_channel_sending_node_checks_part2() {
	assert!(node0_to_1_send_open_channel.to_self_delay==BREAKDOWN_TIMEOUT);

	// BOLT #2 spec: Sending node must ensure the chain_hash value identifies the chain it wishes to open the channel within.
	let chain_hash=genesis_block(Network::Testnet).header.block_hash();
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);
	let chain_hash = ChainHash::using_genesis_block(Network::Testnet);
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);

	// BOLT #2 spec: Sending node must set funding_pubkey, revocation_basepoint, htlc_basepoint, payment_basepoint, and delayed_payment_basepoint to valid DER-encoded, compressed, secp256k1 pubkeys.
	assert!(PublicKey::from_slice(&node0_to_1_send_open_channel.funding_pubkey.serialize()).is_ok());
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); }
})();
})();
Use `ChainHash` instead of `BlockHash` as applicable by jkczyz · Pull Request #2662 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use ChainHash instead of BlockHash as applicable#2662

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

valentinewallace
merged 1 commit into

from

Oct 17, 2023
 Merged


Use ChainHash instead of BlockHash as applicable
#2662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,9 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::script::Builder;
use bitcoin::blockdata::transaction::TxOut;
use bitcoin::hash_types::BlockHash;

use lightning::blinded_path::{BlindedHop, BlindedPath};
use lightning::chain::transaction::OutPoint;
Expand DownExpand Up@@ -89,7 +89,7 @@ struct FuzzChainSource<'a, 'b, Out: test_logger::Output> {
	net_graph: &'a NetworkGraph<&'b test_logger::TestLogger<Out>>,
}
impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
	fn get_utxo(&self, _genesis_hash: &BlockHash, _short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, _short_channel_id: u64) -> UtxoResult {
 let input_slice = self.input.get_slice(2);
 if input_slice.is_none() { return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx)); }
 let input_slice = input_slice.unwrap();
Expand Down

3 changes: 2 additions & 1 deletion
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
use crate::{AsyncBlockSourceResult, BlockData, BlockSource, BlockSourceError};

use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::blockdata::transaction::{TxOut, OutPoint};
use bitcoin::hash_types::BlockHash;

Expand DownExpand Up@@ -302,7 +303,7 @@ impl<S: FutureSpawner,
	CMH::Target: CustomMessageHandler,
	NS::Target: NodeSigner,
{
	fn get_utxo(&self, _genesis_hash: &BlockHash, short_channel_id: u64) -> UtxoResult {
	fn get_utxo(&self, _chain_hash: &ChainHash, short_channel_id: u64) -> UtxoResult {
 let res = UtxoFuture::new();
 let fut = res.clone();
 let source = self.source.clone();
Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,7 +630,7 @@ mod tests {
 fn handle_error(&self, _their_node_id: &PublicKey, _msg: &ErrorMessage) {}
 fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
 fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::empty() }
 fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::using_genesis_block(Network::Testnet)])
 }
	}
Expand Down

8 changes: 4 additions & 4 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use core::cmp::max;
use core::ops::Deref;
use core::sync::atomic::Ordering;

use bitcoin::BlockHash;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::secp256k1::PublicKey;

use lightning::ln::msgs::{
Expand DownExpand Up@@ -67,9 +67,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 return Err(DecodeError::UnknownVersion.into());
 }

 let chain_hash: BlockHash = Readable::read(read_cursor)?;
 let ng_genesis_hash = self.network_graph.get_genesis_hash();
 if chain_hash != ng_genesis_hash {
 let chain_hash: ChainHash = Readable::read(read_cursor)?;
 let ng_chain_hash = self.network_graph.get_chain_hash();
 if chain_hash != ng_chain_hash {
 return Err(
 LightningError {
 err: "Rapid Gossip Sync data's chain hash does not match the network graph's".to_owned(),
Expand Down

77 changes: 39 additions & 38 deletions
lightning/src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


58 changes: 29 additions & 29 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@

use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::{genesis_block, ChainHash};
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;

use bitcoin::hashes::Hash;
Expand DownExpand Up@@ -1018,7 +1018,7 @@ where
	L::Target: Logger,
{
	default_configuration: UserConfig,
genesis_hash: BlockHash,
chain_hash: ChainHash,
	fee_estimator: LowerBoundedFeeEstimator<F>,
	chain_monitor: M,
	tx_broadcaster: T,
Expand DownExpand Up@@ -2012,7 +2012,7 @@ macro_rules! emit_channel_ready_event {
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 let mut updates = $chan.monitor_updating_restored(&$self.logger,
 &$self.node_signer, $self.genesis_hash, &$self.default_configuration,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
 $self.best_block.read().unwrap().height());
 let counterparty_node_id = $chan.context.get_counterparty_node_id();
 let channel_update = if updates.channel_ready.is_some() && $chan.context.is_usable() {
Expand DownExpand Up@@ -2258,7 +2258,7 @@ where
 let expanded_inbound_key = inbound_payment::ExpandedKey::new(&inbound_pmt_key_material);
 ChannelManager {
 default_configuration: config.clone(),
genesis_hash: genesis_block(params.network).header.block_hash(),
chain_hash: ChainHash::using_genesis_block(params.network),
 fee_estimator: LowerBoundedFeeEstimator::new(fee_est),
 chain_monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -2317,7 +2317,7 @@ where
 if cfg!(fuzzing) { // fuzzing chacha20 doesn't use the key at all so we always get the same alias
 outbound_scid_alias += 1;
 } else {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias.get_fake_scid(height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 }
 if outbound_scid_alias != 0 && self.outbound_scid_aliases.lock().unwrap().insert(outbound_scid_alias) {
 break;
Expand DownExpand Up@@ -2387,7 +2387,7 @@ where
 },
 }
 };
 let res = channel.get_open_channel(self.genesis_hash.clone());
 let res = channel.get_open_channel(self.chain_hash);

 let temporary_channel_id = channel.context.channel_id();
 match peer_state.channel_by_id.entry(temporary_channel_id) {
Expand DownExpand Up@@ -3103,8 +3103,8 @@ where
 // Note that this is likely a timing oracle for detecting whether an scid is a
 // phantom or an intercept.
 if (self.default_configuration.accept_intercept_htlcs &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {
 None
 } else {
Expand DownExpand Up@@ -3332,7 +3332,7 @@ where
 };

 let unsigned = msgs::UnsignedChannelUpdate {
 chain_hash: self.genesis_hash,
 chain_hash: self.chain_hash,
 short_channel_id,
 timestamp: chan.context.get_update_time_counter(),
 flags: (!were_node_one) as u8 | ((!enabled as u8) << 1),
Expand DownExpand Up@@ -4250,7 +4250,7 @@ where
 }
 if let PendingHTLCRouting::Forward { onion_packet, .. } = routing {
 let phantom_pubkey_res = self.node_signer.get_node_id(Recipient::PhantomNode);
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.genesis_hash) {
 if phantom_pubkey_res.is_ok() && fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, short_chan_id, &self.chain_hash) {
 let phantom_shared_secret = self.node_signer.ecdh(Recipient::PhantomNode, &onion_packet.public_key.unwrap(), None).unwrap().secret_bytes();
 let next_hop = match onion_utils::decode_next_payment_hop(
 phantom_shared_secret, &onion_packet.hop_data, onion_packet.hmac,
Expand DownExpand Up@@ -5876,7 +5876,7 @@ where
	fn internal_open_channel(&self, counterparty_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result<(), MsgHandleErrInternal> {
 // Note that the ChannelManager is NOT re-persisted on disk after this, so any changes are
 // likely to be lost on restart!
 if msg.chain_hash != self.genesis_hash {
 if msg.chain_hash != self.chain_hash {
 return Err(MsgHandleErrInternal::send_err_msg_no_close("Unknown genesis block hash".to_owned(), msg.temporary_channel_id.clone()));
 }

Expand DownExpand Up@@ -6141,7 +6141,7 @@ where
 hash_map::Entry::Occupied(mut chan_phase_entry) => {
 if let ChannelPhase::Funded(chan) = chan_phase_entry.get_mut() {
 let announcement_sigs_opt = try_chan_phase_entry!(self, chan.channel_ready(&msg, &self.node_signer,
 self.genesis_hash.clone(), &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 self.chain_hash, &self.default_configuration, &self.best_block.read().unwrap(), &self.logger), chan_phase_entry);
 if let Some(announcement_sigs) = announcement_sigs_opt {
 log_trace!(self.logger, "Sending announcement_signatures for channel {}", chan.context.channel_id());
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
Expand DownExpand Up@@ -6518,7 +6518,7 @@ where
 },
 hash_map::Entry::Vacant(entry) => {
 if !is_our_scid && forward_info.incoming_amt_msat.is_some() &&
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.genesis_hash)
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, scid, &self.chain_hash)
 {
 let intercept_id = InterceptId(Sha256::hash(&forward_info.incoming_shared_secret).into_inner());
 let mut pending_intercepts = self.pending_intercepted_htlcs.lock().unwrap();
Expand DownExpand Up@@ -6711,7 +6711,7 @@ where

 peer_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: try_chan_phase_entry!(self, chan.announcement_signatures(
 &self.node_signer, self.genesis_hash.clone(), self.best_block.read().unwrap().height(),
 &self.node_signer, self.chain_hash, self.best_block.read().unwrap().height(),
 msg, &self.default_configuration
 ), chan_phase_entry),
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -6799,7 +6799,7 @@ where
 // freed HTLCs to fail backwards. If in the future we no longer drop pending
 // add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
 let responses = try_chan_phase_entry!(self, chan.channel_reestablish(
 msg, &self.logger, &self.node_signer, self.genesis_hash,
 msg, &self.logger, &self.node_signer, self.chain_hash,
 &self.default_configuration, &*self.best_block.read().unwrap()), chan_phase_entry);
 let mut channel_update = None;
 if let Some(msg) = responses.shutdown_msg {
Expand DownExpand Up@@ -7179,7 +7179,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Phantom.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 match short_to_chan_info.get(&scid_candidate) {
 Some(_) => continue,
Expand DownExpand Up@@ -7209,7 +7209,7 @@ where
 let best_block_height = self.best_block.read().unwrap().height();
 let short_to_chan_info = self.short_to_chan_info.read().unwrap();
 loop {
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.genesis_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 let scid_candidate = fake_scid::Namespace::Intercept.get_fake_scid(best_block_height, &self.chain_hash, &self.fake_scid_rand_bytes, &self.entropy_source);
 // Ensure the generated scid doesn't conflict with a real channel.
 if short_to_chan_info.contains_key(&scid_candidate) { continue }
 return scid_candidate
Expand DownExpand Up@@ -7472,7 +7472,7 @@ where
 *best_block = BestBlock::new(header.prev_blockhash, new_height)
 }

 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(new_height), |channel| channel.best_block_updated(new_height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
	}
}

Expand All@@ -7498,13 +7498,13 @@ where
 let _persistence_guard =
 PersistenceNotifierGuard::optionally_notify_skipping_background_events(
 self, || -> NotifyOption { NotifyOption::DoPersist });
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger)
 self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger)
 .map(|(a, b)| (a, Vec::new(), b)));

 let last_best_block_height = self.best_block.read().unwrap().height();
 if height < last_best_block_height {
 let timestamp = self.highest_seen_timestamp.load(Ordering::Acquire);
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));
 }
	}

Expand All@@ -7521,7 +7521,7 @@ where
 self, || -> NotifyOption { NotifyOption::DoPersist });
 *self.best_block.write().unwrap() = BestBlock::new(block_hash, height);

 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 self.do_chain_event(Some(height), |channel| channel.best_block_updated(height, header.time, self.chain_hash, &self.node_signer, &self.default_configuration, &self.logger));

 macro_rules! max_time {
 ($timestamp: expr) => {
Expand DownExpand Up@@ -7641,7 +7641,7 @@ where
 msg: announcement_sigs,
 });
 if let Some(height) = height_opt {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.genesis_hash, height, &self.default_configuration) {
 if let Some(announcement) = channel.get_signed_channel_announcement(&self.node_signer, self.chain_hash, height, &self.default_configuration) {
 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
 msg: announcement,
 // Note that announcement_signatures fails if the channel cannot be announced,
Expand DownExpand Up@@ -8251,7 +8251,7 @@ where
 let mut peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(ChannelPhase::UnfundedOutboundV1(chan)) = peer_state.channel_by_id.get_mut(&msg.channel_id) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.genesis_hash, &self.fee_estimator) {
 if let Ok(msg) = chan.maybe_handle_error_without_close(self.chain_hash, &self.fee_estimator) {
 peer_state.pending_msg_events.push(events::MessageSendEvent::SendOpenChannel {
 node_id: *counterparty_node_id,
 msg,
Expand All@@ -8274,8 +8274,8 @@ where
 provided_init_features(&self.default_configuration)
	}

	fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![ChainHash::from(&self.genesis_hash[..])])
	fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 Some(vec![self.chain_hash])
	}

	fn handle_tx_add_input(&self, counterparty_node_id: &PublicKey, msg: &msgs::TxAddInput) {
Expand DownExpand Up@@ -8820,7 +8820,7 @@ where

 write_ver_prefix!(writer, SERIALIZATION_VERSION, MIN_SERIALIZATION_VERSION);

 self.genesis_hash.write(writer)?;
 self.chain_hash.write(writer)?;
 {
 let best_block = self.best_block.read().unwrap();
 best_block.height().write(writer)?;
Expand DownExpand Up@@ -9231,7 +9231,7 @@ where
	fn read<Reader: io::Read>(reader: &mut Reader, mut args: ChannelManagerReadArgs<'a, M, T, ES, NS, SP, F, R, L>) -> Result<Self, DecodeError> {
 let _ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);

 let genesis_hash: BlockHash = Readable::read(reader)?;
 let chain_hash: ChainHash = Readable::read(reader)?;
 let best_block_height: u32 = Readable::read(reader)?;
 let best_block_hash: BlockHash = Readable::read(reader)?;

Expand DownExpand Up@@ -9879,7 +9879,7 @@ where
 let mut outbound_scid_alias;
 loop {
 outbound_scid_alias = fake_scid::Namespace::OutboundAlias
 .get_fake_scid(best_block_height, &genesis_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 .get_fake_scid(best_block_height, &chain_hash, fake_scid_rand_bytes.as_ref().unwrap(), &args.entropy_source);
 if outbound_scid_aliases.insert(outbound_scid_alias) { break; }
 }
 chan.context.set_outbound_scid_alias(outbound_scid_alias);
Expand DownExpand Up@@ -9993,7 +9993,7 @@ where
 }

 let channel_manager = ChannelManager {
genesis_hash,
chain_hash,
 fee_estimator: bounded_fee_estimator,
 chain_monitor: args.chain_monitor,
 tx_broadcaster: args.tx_broadcaster,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ use crate::util::config::{UserConfig, MaxDustHTLCExposure};
use bitcoin::hash_types::BlockHash;
use bitcoin::blockdata::script::{Builder, Script};
use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::blockdata::constants::ChainHash;
use bitcoin::network::constants::Network;
use bitcoin::{PackedLockTime, Sequence, Transaction, TxIn, TxOut, Witness};
use bitcoin::OutPoint as BitcoinOutPoint;
Expand DownExpand Up@@ -5830,8 +5830,8 @@ fn bolt2_open_channel_sending_node_checks_part2() {
	assert!(node0_to_1_send_open_channel.to_self_delay==BREAKDOWN_TIMEOUT);

	// BOLT #2 spec: Sending node must ensure the chain_hash value identifies the chain it wishes to open the channel within.
	let chain_hash=genesis_block(Network::Testnet).header.block_hash();
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);
	let chain_hash = ChainHash::using_genesis_block(Network::Testnet);
	assert_eq!(node0_to_1_send_open_channel.chain_hash,chain_hash);

	// BOLT #2 spec: Sending node must set funding_pubkey, revocation_basepoint, htlc_basepoint, payment_basepoint, and delayed_payment_basepoint to valid DER-encoded, compressed, secp256k1 pubkeys.
	assert!(PublicKey::from_slice(&node0_to_1_send_open_channel.funding_pubkey.serialize()).is_ok());
Expand Down
Loading