Adopting block_hash() instead of removed bitcoin_hash()#683

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

Closed
dr-orlovsky wants to merge 1 commit into from
Closed

Adopting block_hash() instead of removed bitcoin_hash() #683

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
3 changes: 1 addition & 2 deletions lightning/src/chain/chaininterface.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ use bitcoin::blockdata::block::{Block, BlockHeader};
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::script::Script;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::network::constants::Network;
use bitcoin::hash_types::{Txid, BlockHash};

Expand DownExpand Up@@ -366,7 +365,7 @@ impl ChainWatchInterface for ChainWatchInterfaceUtil {
}

fn get_chain_utxo(&self, genesis_hash: BlockHash, _unspent_tx_output_identifier: u64) -> Result<(Script, u64), ChainError> {
if genesis_hash != genesis_block(self.network).header.bitcoin_hash() {
if genesis_hash != genesis_block(self.network).block_hash() {
return Err(ChainError::NotWatched);
}
Err(ChainError::NotSupported)
Expand Down
18 changes: 8 additions & 10 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::script::{Script,Builder};
use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
use bitcoin::blockdata::opcodes;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::util::bip143;
use bitcoin::consensus::encode;

Expand DownExpand Up@@ -3327,7 +3326,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
}
});
let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
if header.bitcoin_hash() != self.last_block_connected {
if header.block_hash() != self.last_block_connected {
if self.funding_tx_confirmations > 0 {
self.funding_tx_confirmations += 1;
}
Expand DownExpand Up@@ -3376,8 +3375,8 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
}
}
}
if header.bitcoin_hash() != self.last_block_connected {
self.last_block_connected = header.bitcoin_hash();
if header.block_hash() != self.last_block_connected {
self.last_block_connected = header.block_hash();
self.update_time_counter = cmp::max(self.update_time_counter, header.time);
if self.funding_tx_confirmations > 0 {
if self.funding_tx_confirmations == self.minimum_depth as u64 {
Expand All@@ -3399,7 +3398,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
// funding_tx_confirmed_in and return.
false
};
self.funding_tx_confirmed_in = Some(header.bitcoin_hash());
self.funding_tx_confirmed_in = Some(header.block_hash());

//TODO: Note that this must be a duplicate of the previous commitment point they sent us,
//as otherwise we will have a commitment transaction that they can't revoke (well, kinda,
Expand DownExpand Up@@ -3433,10 +3432,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
return true;
}
}
if Some(header.bitcoin_hash()) == self.funding_tx_confirmed_in {
if Some(header.block_hash()) == self.funding_tx_confirmed_in {
self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
}
self.last_block_connected = header.bitcoin_hash();
self.last_block_connected = header.block_hash();
false
}

Expand DownExpand Up@@ -4451,7 +4450,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

#[cfg(test)]
mod tests {
use bitcoin::BitcoinHash;
use bitcoin::util::bip143;
use bitcoin::consensus::encode::serialize;
use bitcoin::blockdata::script::{Script, Builder};
Expand DownExpand Up@@ -4545,7 +4543,7 @@ mod tests {
// Now change the fee so we can check that the fee in the open_channel message is the
// same as the old fee.
fee_est.fee_est = 500;
let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.block_hash());
assert_eq!(open_channel_msg.feerate_per_kw, original_fee);
}

Expand All@@ -4566,7 +4564,7 @@ mod tests {
let mut node_a_chan = Channel::<EnforcingChannelKeys>::new_outbound(&&feeest, &&keys_provider, node_a_node_id, 10000000, 100000, 42, &config).unwrap();

// Create Node B's channel by receiving Node A's open_channel message
let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).block_hash());
let node_b_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[7; 32]).unwrap());
let mut node_b_chan = Channel::<EnforcingChannelKeys>::new_from_req(&&feeest, &&keys_provider, node_b_node_id, InitFeatures::known(), &open_channel_msg, 7, &config).unwrap();

Expand Down
7 changes: 3 additions & 4 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::network::constants::Network;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
Expand DownExpand Up@@ -724,7 +723,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>

ChannelManager {
default_configuration: config.clone(),
genesis_hash: genesis_block(network).header.bitcoin_hash(),
genesis_hash: genesis_block(network).block_hash(),
fee_estimator: fee_est,
monitor,
tx_broadcaster,
Expand DownExpand Up@@ -3060,7 +3059,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
L::Target: Logger,
{
fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[usize]) {
let header_hash = header.bitcoin_hash();
let header_hash = header.block_hash();
log_trace!(self.logger, "Block {} at height {} connected with {} txn matched", header_hash, height, txn_matched.len());
let _ = self.total_consistency_lock.read().unwrap();
let mut failed_channels = Vec::new();
Expand DownExpand Up@@ -3200,7 +3199,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
self.finish_force_close_channel(failure);
}
self.latest_block_height.fetch_sub(1, Ordering::AcqRel);
*self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.bitcoin_hash();
*self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.block_hash();
}
}

Expand Down
5 changes: 2 additions & 3 deletions lightning/src/ln/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::consensus::encode;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::Hash;
use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -203,7 +202,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
C::Target: ChainWatchInterface,
{
fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], _indexes_of_txn_matched: &[usize]) {
let block_hash = header.bitcoin_hash();
let block_hash = header.block_hash();
{
let mut monitors = self.monitors.lock().unwrap();
for monitor in monitors.values_mut() {
Expand All@@ -219,7 +218,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
}

fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
let block_hash = header.bitcoin_hash();
let block_hash = header.block_hash();
let mut monitors = self.monitors.lock().unwrap();
for monitor in monitors.values_mut() {
monitor.block_disconnected(disconnected_height, &block_hash, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
Expand Down
7 changes: 3 additions & 4 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ use util::errors::APIError;
use util::config::UserConfig;
use util::ser::{ReadableArgs, Writeable, Readable};

use bitcoin::util::hash::BitcoinHash;
use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::{Transaction, TxOut};
use bitcoin::network::constants::Network;
Expand All@@ -50,7 +49,7 @@ pub fn confirm_transaction<'a, 'b: 'a>(notifier: &'a chaininterface::BlockNotifi
let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
notifier.block_connected_checked(&header, 1, &[tx; 1], &[chan_id as usize; 1]);
for i in 2..CHAN_CONFIRM_DEPTH {
header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
notifier.block_connected_checked(&header, i, &vec![], &[0; 0]);
}
}
Expand All@@ -59,10 +58,10 @@ pub fn connect_blocks<'a, 'b>(notifier: &'a chaininterface::BlockNotifierRef<'b,
let mut header = BlockHeader { version: 0x2000000, prev_blockhash: if parent { prev_blockhash } else { Default::default() }, merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
notifier.block_connected_checked(&header, height + 1, &Vec::new(), &Vec::new());
for i in 2..depth + 1 {
header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
notifier.block_connected_checked(&header, height + i, &Vec::new(), &Vec::new());
}
header.bitcoin_hash()
header.block_hash()
}

pub struct TestChanMonCfg {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Adopting block_hash() instead of removed bitcoin_hash()#683

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

 Closed

dr-orlovsky
wants to merge
1
commit into

from

 Closed


Adopting block_hash() instead of removed bitcoin_hash()
#683
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


3 changes: 1 addition & 2 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ use bitcoin::blockdata::block::{Block, BlockHeader};
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::script::Script;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::network::constants::Network;
use bitcoin::hash_types::{Txid, BlockHash};

Expand DownExpand Up@@ -366,7 +365,7 @@ impl ChainWatchInterface for ChainWatchInterfaceUtil {
	}

	fn get_chain_utxo(&self, genesis_hash: BlockHash, _unspent_tx_output_identifier: u64) -> Result<(Script, u64), ChainError> {
 if genesis_hash != genesis_block(self.network).header.bitcoin_hash() {
 if genesis_hash != genesis_block(self.network).block_hash() {
 return Err(ChainError::NotWatched);
 }
 Err(ChainError::NotSupported)
Expand Down

18 changes: 8 additions & 10 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::script::{Script,Builder};
use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
use bitcoin::blockdata::opcodes;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::util::bip143;
use bitcoin::consensus::encode;

Expand DownExpand Up@@ -3327,7 +3326,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 });
 let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
 if header.bitcoin_hash() != self.last_block_connected {
 if header.block_hash() != self.last_block_connected {
 if self.funding_tx_confirmations > 0 {
 self.funding_tx_confirmations += 1;
 }
Expand DownExpand Up@@ -3376,8 +3375,8 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 }
 }
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 if header.block_hash() != self.last_block_connected {
 self.last_block_connected = header.block_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
Expand All@@ -3399,7 +3398,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 // funding_tx_confirmed_in and return.
 false
 };
 self.funding_tx_confirmed_in = Some(header.bitcoin_hash());
 self.funding_tx_confirmed_in = Some(header.block_hash());

 //TODO: Note that this must be a duplicate of the previous commitment point they sent us,
 //as otherwise we will have a commitment transaction that they can't revoke (well, kinda,
Expand DownExpand Up@@ -3433,10 +3432,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 return true;
 }
 }
 if Some(header.bitcoin_hash()) == self.funding_tx_confirmed_in {
 if Some(header.block_hash()) == self.funding_tx_confirmed_in {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 self.last_block_connected = header.block_hash();
 false
	}

Expand DownExpand Up@@ -4451,7 +4450,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

#[cfg(test)]
mod tests {
	use bitcoin::BitcoinHash;
	use bitcoin::util::bip143;
	use bitcoin::consensus::encode::serialize;
	use bitcoin::blockdata::script::{Script, Builder};
Expand DownExpand Up@@ -4545,7 +4543,7 @@ mod tests {
 // Now change the fee so we can check that the fee in the open_channel message is the
 // same as the old fee.
 fee_est.fee_est = 500;
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.block_hash());
 assert_eq!(open_channel_msg.feerate_per_kw, original_fee);
	}

Expand All@@ -4566,7 +4564,7 @@ mod tests {
 let mut node_a_chan = Channel::<EnforcingChannelKeys>::new_outbound(&&feeest, &&keys_provider, node_a_node_id, 10000000, 100000, 42, &config).unwrap();

 // Create Node B's channel by receiving Node A's open_channel message
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).block_hash());
 let node_b_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[7; 32]).unwrap());
 let mut node_b_chan = Channel::<EnforcingChannelKeys>::new_from_req(&&feeest, &&keys_provider, node_b_node_id, InitFeatures::known(), &open_channel_msg, 7, &config).unwrap();

Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::network::constants::Network;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
Expand DownExpand Up@@ -724,7 +723,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>

 ChannelManager {
 default_configuration: config.clone(),
 genesis_hash: genesis_block(network).header.bitcoin_hash(),
 genesis_hash: genesis_block(network).block_hash(),
 fee_estimator: fee_est,
 monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -3060,7 +3059,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 L::Target: Logger,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[usize]) {
 let header_hash = header.bitcoin_hash();
 let header_hash = header.block_hash();
 log_trace!(self.logger, "Block {} at height {} connected with {} txn matched", header_hash, height, txn_matched.len());
 let _ = self.total_consistency_lock.read().unwrap();
 let mut failed_channels = Vec::new();
Expand DownExpand Up@@ -3200,7 +3199,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 self.finish_force_close_channel(failure);
 }
 self.latest_block_height.fetch_sub(1, Ordering::AcqRel);
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.bitcoin_hash();
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.block_hash();
	}
}

Expand Down

5 changes: 2 additions & 3 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::consensus::encode;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::Hash;
use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -203,7 +202,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
 C::Target: ChainWatchInterface,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], _indexes_of_txn_matched: &[usize]) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
Expand All@@ -219,7 +218,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
	}

	fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 monitor.block_disconnected(disconnected_height, &block_hash, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ use util::errors::APIError;
use util::config::UserConfig;
use util::ser::{ReadableArgs, Writeable, Readable};

use bitcoin::util::hash::BitcoinHash;
use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::{Transaction, TxOut};
use bitcoin::network::constants::Network;
Expand All@@ -50,7 +49,7 @@ pub fn confirm_transaction<'a, 'b: 'a>(notifier: &'a chaininterface::BlockNotifi
	let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, 1, &[tx; 1], &[chan_id as usize; 1]);
	for i in 2..CHAN_CONFIRM_DEPTH {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, i, &vec![], &[0; 0]);
	}
}
Expand All@@ -59,10 +58,10 @@ pub fn connect_blocks<'a, 'b>(notifier: &'a chaininterface::BlockNotifierRef<'b,
	let mut header = BlockHeader { version: 0x2000000, prev_blockhash: if parent { prev_blockhash } else { Default::default() }, merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, height + 1, &Vec::new(), &Vec::new());
	for i in 2..depth + 1 {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, height + i, &Vec::new(), &Vec::new());
	}
	header.bitcoin_hash()
	header.block_hash()
}

pub struct TestChanMonCfg {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adopting block_hash() instead of removed bitcoin_hash()#683

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

 Closed

dr-orlovsky
wants to merge
1
commit into

from

 Closed


Adopting block_hash() instead of removed bitcoin_hash()
#683
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


3 changes: 1 addition & 2 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ use bitcoin::blockdata::block::{Block, BlockHeader};
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::script::Script;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::network::constants::Network;
use bitcoin::hash_types::{Txid, BlockHash};

Expand DownExpand Up@@ -366,7 +365,7 @@ impl ChainWatchInterface for ChainWatchInterfaceUtil {
	}

	fn get_chain_utxo(&self, genesis_hash: BlockHash, _unspent_tx_output_identifier: u64) -> Result<(Script, u64), ChainError> {
 if genesis_hash != genesis_block(self.network).header.bitcoin_hash() {
 if genesis_hash != genesis_block(self.network).block_hash() {
 return Err(ChainError::NotWatched);
 }
 Err(ChainError::NotSupported)
Expand Down

18 changes: 8 additions & 10 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::script::{Script,Builder};
use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
use bitcoin::blockdata::opcodes;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::util::bip143;
use bitcoin::consensus::encode;

Expand DownExpand Up@@ -3327,7 +3326,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 });
 let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
 if header.bitcoin_hash() != self.last_block_connected {
 if header.block_hash() != self.last_block_connected {
 if self.funding_tx_confirmations > 0 {
 self.funding_tx_confirmations += 1;
 }
Expand DownExpand Up@@ -3376,8 +3375,8 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 }
 }
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 if header.block_hash() != self.last_block_connected {
 self.last_block_connected = header.block_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
Expand All@@ -3399,7 +3398,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 // funding_tx_confirmed_in and return.
 false
 };
 self.funding_tx_confirmed_in = Some(header.bitcoin_hash());
 self.funding_tx_confirmed_in = Some(header.block_hash());

 //TODO: Note that this must be a duplicate of the previous commitment point they sent us,
 //as otherwise we will have a commitment transaction that they can't revoke (well, kinda,
Expand DownExpand Up@@ -3433,10 +3432,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 return true;
 }
 }
 if Some(header.bitcoin_hash()) == self.funding_tx_confirmed_in {
 if Some(header.block_hash()) == self.funding_tx_confirmed_in {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 self.last_block_connected = header.block_hash();
 false
	}

Expand DownExpand Up@@ -4451,7 +4450,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

#[cfg(test)]
mod tests {
	use bitcoin::BitcoinHash;
	use bitcoin::util::bip143;
	use bitcoin::consensus::encode::serialize;
	use bitcoin::blockdata::script::{Script, Builder};
Expand DownExpand Up@@ -4545,7 +4543,7 @@ mod tests {
 // Now change the fee so we can check that the fee in the open_channel message is the
 // same as the old fee.
 fee_est.fee_est = 500;
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.block_hash());
 assert_eq!(open_channel_msg.feerate_per_kw, original_fee);
	}

Expand All@@ -4566,7 +4564,7 @@ mod tests {
 let mut node_a_chan = Channel::<EnforcingChannelKeys>::new_outbound(&&feeest, &&keys_provider, node_a_node_id, 10000000, 100000, 42, &config).unwrap();

 // Create Node B's channel by receiving Node A's open_channel message
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).block_hash());
 let node_b_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[7; 32]).unwrap());
 let mut node_b_chan = Channel::<EnforcingChannelKeys>::new_from_req(&&feeest, &&keys_provider, node_b_node_id, InitFeatures::known(), &open_channel_msg, 7, &config).unwrap();

Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::network::constants::Network;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
Expand DownExpand Up@@ -724,7 +723,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>

 ChannelManager {
 default_configuration: config.clone(),
 genesis_hash: genesis_block(network).header.bitcoin_hash(),
 genesis_hash: genesis_block(network).block_hash(),
 fee_estimator: fee_est,
 monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -3060,7 +3059,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 L::Target: Logger,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[usize]) {
 let header_hash = header.bitcoin_hash();
 let header_hash = header.block_hash();
 log_trace!(self.logger, "Block {} at height {} connected with {} txn matched", header_hash, height, txn_matched.len());
 let _ = self.total_consistency_lock.read().unwrap();
 let mut failed_channels = Vec::new();
Expand DownExpand Up@@ -3200,7 +3199,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 self.finish_force_close_channel(failure);
 }
 self.latest_block_height.fetch_sub(1, Ordering::AcqRel);
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.bitcoin_hash();
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.block_hash();
	}
}

Expand Down

5 changes: 2 additions & 3 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::consensus::encode;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::Hash;
use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -203,7 +202,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
 C::Target: ChainWatchInterface,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], _indexes_of_txn_matched: &[usize]) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
Expand All@@ -219,7 +218,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
	}

	fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 monitor.block_disconnected(disconnected_height, &block_hash, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ use util::errors::APIError;
use util::config::UserConfig;
use util::ser::{ReadableArgs, Writeable, Readable};

use bitcoin::util::hash::BitcoinHash;
use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::{Transaction, TxOut};
use bitcoin::network::constants::Network;
Expand All@@ -50,7 +49,7 @@ pub fn confirm_transaction<'a, 'b: 'a>(notifier: &'a chaininterface::BlockNotifi
	let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, 1, &[tx; 1], &[chan_id as usize; 1]);
	for i in 2..CHAN_CONFIRM_DEPTH {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, i, &vec![], &[0; 0]);
	}
}
Expand All@@ -59,10 +58,10 @@ pub fn connect_blocks<'a, 'b>(notifier: &'a chaininterface::BlockNotifierRef<'b,
	let mut header = BlockHeader { version: 0x2000000, prev_blockhash: if parent { prev_blockhash } else { Default::default() }, merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, height + 1, &Vec::new(), &Vec::new());
	for i in 2..depth + 1 {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, height + i, &Vec::new(), &Vec::new());
	}
	header.bitcoin_hash()
	header.block_hash()
}

pub struct TestChanMonCfg {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adopting block_hash() instead of removed bitcoin_hash()#683

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

 Closed

dr-orlovsky
wants to merge
1
commit into

from

 Closed


Adopting block_hash() instead of removed bitcoin_hash()
#683
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


3 changes: 1 addition & 2 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ use bitcoin::blockdata::block::{Block, BlockHeader};
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::script::Script;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::network::constants::Network;
use bitcoin::hash_types::{Txid, BlockHash};

Expand DownExpand Up@@ -366,7 +365,7 @@ impl ChainWatchInterface for ChainWatchInterfaceUtil {
	}

	fn get_chain_utxo(&self, genesis_hash: BlockHash, _unspent_tx_output_identifier: u64) -> Result<(Script, u64), ChainError> {
 if genesis_hash != genesis_block(self.network).header.bitcoin_hash() {
 if genesis_hash != genesis_block(self.network).block_hash() {
 return Err(ChainError::NotWatched);
 }
 Err(ChainError::NotSupported)
Expand Down

18 changes: 8 additions & 10 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::script::{Script,Builder};
use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
use bitcoin::blockdata::opcodes;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::util::bip143;
use bitcoin::consensus::encode;

Expand DownExpand Up@@ -3327,7 +3326,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 });
 let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
 if header.bitcoin_hash() != self.last_block_connected {
 if header.block_hash() != self.last_block_connected {
 if self.funding_tx_confirmations > 0 {
 self.funding_tx_confirmations += 1;
 }
Expand DownExpand Up@@ -3376,8 +3375,8 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 }
 }
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 if header.block_hash() != self.last_block_connected {
 self.last_block_connected = header.block_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
Expand All@@ -3399,7 +3398,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 // funding_tx_confirmed_in and return.
 false
 };
 self.funding_tx_confirmed_in = Some(header.bitcoin_hash());
 self.funding_tx_confirmed_in = Some(header.block_hash());

 //TODO: Note that this must be a duplicate of the previous commitment point they sent us,
 //as otherwise we will have a commitment transaction that they can't revoke (well, kinda,
Expand DownExpand Up@@ -3433,10 +3432,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 return true;
 }
 }
 if Some(header.bitcoin_hash()) == self.funding_tx_confirmed_in {
 if Some(header.block_hash()) == self.funding_tx_confirmed_in {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 self.last_block_connected = header.block_hash();
 false
	}

Expand DownExpand Up@@ -4451,7 +4450,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

#[cfg(test)]
mod tests {
	use bitcoin::BitcoinHash;
	use bitcoin::util::bip143;
	use bitcoin::consensus::encode::serialize;
	use bitcoin::blockdata::script::{Script, Builder};
Expand DownExpand Up@@ -4545,7 +4543,7 @@ mod tests {
 // Now change the fee so we can check that the fee in the open_channel message is the
 // same as the old fee.
 fee_est.fee_est = 500;
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.block_hash());
 assert_eq!(open_channel_msg.feerate_per_kw, original_fee);
	}

Expand All@@ -4566,7 +4564,7 @@ mod tests {
 let mut node_a_chan = Channel::<EnforcingChannelKeys>::new_outbound(&&feeest, &&keys_provider, node_a_node_id, 10000000, 100000, 42, &config).unwrap();

 // Create Node B's channel by receiving Node A's open_channel message
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).block_hash());
 let node_b_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[7; 32]).unwrap());
 let mut node_b_chan = Channel::<EnforcingChannelKeys>::new_from_req(&&feeest, &&keys_provider, node_b_node_id, InitFeatures::known(), &open_channel_msg, 7, &config).unwrap();

Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::network::constants::Network;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
Expand DownExpand Up@@ -724,7 +723,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>

 ChannelManager {
 default_configuration: config.clone(),
 genesis_hash: genesis_block(network).header.bitcoin_hash(),
 genesis_hash: genesis_block(network).block_hash(),
 fee_estimator: fee_est,
 monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -3060,7 +3059,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 L::Target: Logger,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[usize]) {
 let header_hash = header.bitcoin_hash();
 let header_hash = header.block_hash();
 log_trace!(self.logger, "Block {} at height {} connected with {} txn matched", header_hash, height, txn_matched.len());
 let _ = self.total_consistency_lock.read().unwrap();
 let mut failed_channels = Vec::new();
Expand DownExpand Up@@ -3200,7 +3199,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 self.finish_force_close_channel(failure);
 }
 self.latest_block_height.fetch_sub(1, Ordering::AcqRel);
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.bitcoin_hash();
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.block_hash();
	}
}

Expand Down

5 changes: 2 additions & 3 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::consensus::encode;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::Hash;
use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -203,7 +202,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
 C::Target: ChainWatchInterface,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], _indexes_of_txn_matched: &[usize]) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
Expand All@@ -219,7 +218,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
	}

	fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 monitor.block_disconnected(disconnected_height, &block_hash, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ use util::errors::APIError;
use util::config::UserConfig;
use util::ser::{ReadableArgs, Writeable, Readable};

use bitcoin::util::hash::BitcoinHash;
use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::{Transaction, TxOut};
use bitcoin::network::constants::Network;
Expand All@@ -50,7 +49,7 @@ pub fn confirm_transaction<'a, 'b: 'a>(notifier: &'a chaininterface::BlockNotifi
	let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, 1, &[tx; 1], &[chan_id as usize; 1]);
	for i in 2..CHAN_CONFIRM_DEPTH {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, i, &vec![], &[0; 0]);
	}
}
Expand All@@ -59,10 +58,10 @@ pub fn connect_blocks<'a, 'b>(notifier: &'a chaininterface::BlockNotifierRef<'b,
	let mut header = BlockHeader { version: 0x2000000, prev_blockhash: if parent { prev_blockhash } else { Default::default() }, merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, height + 1, &Vec::new(), &Vec::new());
	for i in 2..depth + 1 {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, height + i, &Vec::new(), &Vec::new());
	}
	header.bitcoin_hash()
	header.block_hash()
}

pub struct TestChanMonCfg {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Adopting block_hash() instead of removed bitcoin_hash()#683

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

 Closed

dr-orlovsky
wants to merge
1
commit into

from

 Closed


Adopting block_hash() instead of removed bitcoin_hash()
#683
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


3 changes: 1 addition & 2 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ use bitcoin::blockdata::block::{Block, BlockHeader};
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::script::Script;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::network::constants::Network;
use bitcoin::hash_types::{Txid, BlockHash};

Expand DownExpand Up@@ -366,7 +365,7 @@ impl ChainWatchInterface for ChainWatchInterfaceUtil {
	}

	fn get_chain_utxo(&self, genesis_hash: BlockHash, _unspent_tx_output_identifier: u64) -> Result<(Script, u64), ChainError> {
 if genesis_hash != genesis_block(self.network).header.bitcoin_hash() {
 if genesis_hash != genesis_block(self.network).block_hash() {
 return Err(ChainError::NotWatched);
 }
 Err(ChainError::NotSupported)
Expand Down

18 changes: 8 additions & 10 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::script::{Script,Builder};
use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
use bitcoin::blockdata::opcodes;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::util::bip143;
use bitcoin::consensus::encode;

Expand DownExpand Up@@ -3327,7 +3326,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 });
 let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
 if header.bitcoin_hash() != self.last_block_connected {
 if header.block_hash() != self.last_block_connected {
 if self.funding_tx_confirmations > 0 {
 self.funding_tx_confirmations += 1;
 }
Expand DownExpand Up@@ -3376,8 +3375,8 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 }
 }
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 if header.block_hash() != self.last_block_connected {
 self.last_block_connected = header.block_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
Expand All@@ -3399,7 +3398,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 // funding_tx_confirmed_in and return.
 false
 };
 self.funding_tx_confirmed_in = Some(header.bitcoin_hash());
 self.funding_tx_confirmed_in = Some(header.block_hash());

 //TODO: Note that this must be a duplicate of the previous commitment point they sent us,
 //as otherwise we will have a commitment transaction that they can't revoke (well, kinda,
Expand DownExpand Up@@ -3433,10 +3432,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 return true;
 }
 }
 if Some(header.bitcoin_hash()) == self.funding_tx_confirmed_in {
 if Some(header.block_hash()) == self.funding_tx_confirmed_in {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 self.last_block_connected = header.block_hash();
 false
	}

Expand DownExpand Up@@ -4451,7 +4450,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

#[cfg(test)]
mod tests {
	use bitcoin::BitcoinHash;
	use bitcoin::util::bip143;
	use bitcoin::consensus::encode::serialize;
	use bitcoin::blockdata::script::{Script, Builder};
Expand DownExpand Up@@ -4545,7 +4543,7 @@ mod tests {
 // Now change the fee so we can check that the fee in the open_channel message is the
 // same as the old fee.
 fee_est.fee_est = 500;
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.block_hash());
 assert_eq!(open_channel_msg.feerate_per_kw, original_fee);
	}

Expand All@@ -4566,7 +4564,7 @@ mod tests {
 let mut node_a_chan = Channel::<EnforcingChannelKeys>::new_outbound(&&feeest, &&keys_provider, node_a_node_id, 10000000, 100000, 42, &config).unwrap();

 // Create Node B's channel by receiving Node A's open_channel message
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).block_hash());
 let node_b_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[7; 32]).unwrap());
 let mut node_b_chan = Channel::<EnforcingChannelKeys>::new_from_req(&&feeest, &&keys_provider, node_b_node_id, InitFeatures::known(), &open_channel_msg, 7, &config).unwrap();

Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::network::constants::Network;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
Expand DownExpand Up@@ -724,7 +723,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>

 ChannelManager {
 default_configuration: config.clone(),
 genesis_hash: genesis_block(network).header.bitcoin_hash(),
 genesis_hash: genesis_block(network).block_hash(),
 fee_estimator: fee_est,
 monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -3060,7 +3059,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 L::Target: Logger,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[usize]) {
 let header_hash = header.bitcoin_hash();
 let header_hash = header.block_hash();
 log_trace!(self.logger, "Block {} at height {} connected with {} txn matched", header_hash, height, txn_matched.len());
 let _ = self.total_consistency_lock.read().unwrap();
 let mut failed_channels = Vec::new();
Expand DownExpand Up@@ -3200,7 +3199,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 self.finish_force_close_channel(failure);
 }
 self.latest_block_height.fetch_sub(1, Ordering::AcqRel);
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.bitcoin_hash();
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.block_hash();
	}
}

Expand Down

5 changes: 2 additions & 3 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::consensus::encode;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::Hash;
use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -203,7 +202,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
 C::Target: ChainWatchInterface,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], _indexes_of_txn_matched: &[usize]) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
Expand All@@ -219,7 +218,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
	}

	fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 monitor.block_disconnected(disconnected_height, &block_hash, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ use util::errors::APIError;
use util::config::UserConfig;
use util::ser::{ReadableArgs, Writeable, Readable};

use bitcoin::util::hash::BitcoinHash;
use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::{Transaction, TxOut};
use bitcoin::network::constants::Network;
Expand All@@ -50,7 +49,7 @@ pub fn confirm_transaction<'a, 'b: 'a>(notifier: &'a chaininterface::BlockNotifi
	let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, 1, &[tx; 1], &[chan_id as usize; 1]);
	for i in 2..CHAN_CONFIRM_DEPTH {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, i, &vec![], &[0; 0]);
	}
}
Expand All@@ -59,10 +58,10 @@ pub fn connect_blocks<'a, 'b>(notifier: &'a chaininterface::BlockNotifierRef<'b,
	let mut header = BlockHeader { version: 0x2000000, prev_blockhash: if parent { prev_blockhash } else { Default::default() }, merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, height + 1, &Vec::new(), &Vec::new());
	for i in 2..depth + 1 {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, height + i, &Vec::new(), &Vec::new());
	}
	header.bitcoin_hash()
	header.block_hash()
}

pub struct TestChanMonCfg {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adopting block_hash() instead of removed bitcoin_hash()#683

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

 Closed

dr-orlovsky
wants to merge
1
commit into

from

 Closed


Adopting block_hash() instead of removed bitcoin_hash()
#683
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


3 changes: 1 addition & 2 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ use bitcoin::blockdata::block::{Block, BlockHeader};
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::script::Script;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::network::constants::Network;
use bitcoin::hash_types::{Txid, BlockHash};

Expand DownExpand Up@@ -366,7 +365,7 @@ impl ChainWatchInterface for ChainWatchInterfaceUtil {
	}

	fn get_chain_utxo(&self, genesis_hash: BlockHash, _unspent_tx_output_identifier: u64) -> Result<(Script, u64), ChainError> {
 if genesis_hash != genesis_block(self.network).header.bitcoin_hash() {
 if genesis_hash != genesis_block(self.network).block_hash() {
 return Err(ChainError::NotWatched);
 }
 Err(ChainError::NotSupported)
Expand Down

18 changes: 8 additions & 10 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::script::{Script,Builder};
use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
use bitcoin::blockdata::opcodes;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::util::bip143;
use bitcoin::consensus::encode;

Expand DownExpand Up@@ -3327,7 +3326,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 });
 let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
 if header.bitcoin_hash() != self.last_block_connected {
 if header.block_hash() != self.last_block_connected {
 if self.funding_tx_confirmations > 0 {
 self.funding_tx_confirmations += 1;
 }
Expand DownExpand Up@@ -3376,8 +3375,8 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 }
 }
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 if header.block_hash() != self.last_block_connected {
 self.last_block_connected = header.block_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
Expand All@@ -3399,7 +3398,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 // funding_tx_confirmed_in and return.
 false
 };
 self.funding_tx_confirmed_in = Some(header.bitcoin_hash());
 self.funding_tx_confirmed_in = Some(header.block_hash());

 //TODO: Note that this must be a duplicate of the previous commitment point they sent us,
 //as otherwise we will have a commitment transaction that they can't revoke (well, kinda,
Expand DownExpand Up@@ -3433,10 +3432,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 return true;
 }
 }
 if Some(header.bitcoin_hash()) == self.funding_tx_confirmed_in {
 if Some(header.block_hash()) == self.funding_tx_confirmed_in {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 self.last_block_connected = header.block_hash();
 false
	}

Expand DownExpand Up@@ -4451,7 +4450,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

#[cfg(test)]
mod tests {
	use bitcoin::BitcoinHash;
	use bitcoin::util::bip143;
	use bitcoin::consensus::encode::serialize;
	use bitcoin::blockdata::script::{Script, Builder};
Expand DownExpand Up@@ -4545,7 +4543,7 @@ mod tests {
 // Now change the fee so we can check that the fee in the open_channel message is the
 // same as the old fee.
 fee_est.fee_est = 500;
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.block_hash());
 assert_eq!(open_channel_msg.feerate_per_kw, original_fee);
	}

Expand All@@ -4566,7 +4564,7 @@ mod tests {
 let mut node_a_chan = Channel::<EnforcingChannelKeys>::new_outbound(&&feeest, &&keys_provider, node_a_node_id, 10000000, 100000, 42, &config).unwrap();

 // Create Node B's channel by receiving Node A's open_channel message
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).block_hash());
 let node_b_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[7; 32]).unwrap());
 let mut node_b_chan = Channel::<EnforcingChannelKeys>::new_from_req(&&feeest, &&keys_provider, node_b_node_id, InitFeatures::known(), &open_channel_msg, 7, &config).unwrap();

Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::network::constants::Network;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
Expand DownExpand Up@@ -724,7 +723,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>

 ChannelManager {
 default_configuration: config.clone(),
 genesis_hash: genesis_block(network).header.bitcoin_hash(),
 genesis_hash: genesis_block(network).block_hash(),
 fee_estimator: fee_est,
 monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -3060,7 +3059,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 L::Target: Logger,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[usize]) {
 let header_hash = header.bitcoin_hash();
 let header_hash = header.block_hash();
 log_trace!(self.logger, "Block {} at height {} connected with {} txn matched", header_hash, height, txn_matched.len());
 let _ = self.total_consistency_lock.read().unwrap();
 let mut failed_channels = Vec::new();
Expand DownExpand Up@@ -3200,7 +3199,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 self.finish_force_close_channel(failure);
 }
 self.latest_block_height.fetch_sub(1, Ordering::AcqRel);
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.bitcoin_hash();
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.block_hash();
	}
}

Expand Down

5 changes: 2 additions & 3 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::consensus::encode;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::Hash;
use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -203,7 +202,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
 C::Target: ChainWatchInterface,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], _indexes_of_txn_matched: &[usize]) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
Expand All@@ -219,7 +218,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
	}

	fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 monitor.block_disconnected(disconnected_height, &block_hash, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ use util::errors::APIError;
use util::config::UserConfig;
use util::ser::{ReadableArgs, Writeable, Readable};

use bitcoin::util::hash::BitcoinHash;
use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::{Transaction, TxOut};
use bitcoin::network::constants::Network;
Expand All@@ -50,7 +49,7 @@ pub fn confirm_transaction<'a, 'b: 'a>(notifier: &'a chaininterface::BlockNotifi
	let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, 1, &[tx; 1], &[chan_id as usize; 1]);
	for i in 2..CHAN_CONFIRM_DEPTH {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, i, &vec![], &[0; 0]);
	}
}
Expand All@@ -59,10 +58,10 @@ pub fn connect_blocks<'a, 'b>(notifier: &'a chaininterface::BlockNotifierRef<'b,
	let mut header = BlockHeader { version: 0x2000000, prev_blockhash: if parent { prev_blockhash } else { Default::default() }, merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, height + 1, &Vec::new(), &Vec::new());
	for i in 2..depth + 1 {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, height + i, &Vec::new(), &Vec::new());
	}
	header.bitcoin_hash()
	header.block_hash()
}

pub struct TestChanMonCfg {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adopting block_hash() instead of removed bitcoin_hash()#683

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

 Closed

dr-orlovsky
wants to merge
1
commit into

from

 Closed


Adopting block_hash() instead of removed bitcoin_hash()
#683
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


3 changes: 1 addition & 2 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ use bitcoin::blockdata::block::{Block, BlockHeader};
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::script::Script;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::network::constants::Network;
use bitcoin::hash_types::{Txid, BlockHash};

Expand DownExpand Up@@ -366,7 +365,7 @@ impl ChainWatchInterface for ChainWatchInterfaceUtil {
	}

	fn get_chain_utxo(&self, genesis_hash: BlockHash, _unspent_tx_output_identifier: u64) -> Result<(Script, u64), ChainError> {
 if genesis_hash != genesis_block(self.network).header.bitcoin_hash() {
 if genesis_hash != genesis_block(self.network).block_hash() {
 return Err(ChainError::NotWatched);
 }
 Err(ChainError::NotSupported)
Expand Down

18 changes: 8 additions & 10 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::script::{Script,Builder};
use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
use bitcoin::blockdata::opcodes;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::util::bip143;
use bitcoin::consensus::encode;

Expand DownExpand Up@@ -3327,7 +3326,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 });
 let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
 if header.bitcoin_hash() != self.last_block_connected {
 if header.block_hash() != self.last_block_connected {
 if self.funding_tx_confirmations > 0 {
 self.funding_tx_confirmations += 1;
 }
Expand DownExpand Up@@ -3376,8 +3375,8 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 }
 }
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 if header.block_hash() != self.last_block_connected {
 self.last_block_connected = header.block_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
Expand All@@ -3399,7 +3398,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 // funding_tx_confirmed_in and return.
 false
 };
 self.funding_tx_confirmed_in = Some(header.bitcoin_hash());
 self.funding_tx_confirmed_in = Some(header.block_hash());

 //TODO: Note that this must be a duplicate of the previous commitment point they sent us,
 //as otherwise we will have a commitment transaction that they can't revoke (well, kinda,
Expand DownExpand Up@@ -3433,10 +3432,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 return true;
 }
 }
 if Some(header.bitcoin_hash()) == self.funding_tx_confirmed_in {
 if Some(header.block_hash()) == self.funding_tx_confirmed_in {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 self.last_block_connected = header.block_hash();
 false
	}

Expand DownExpand Up@@ -4451,7 +4450,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

#[cfg(test)]
mod tests {
	use bitcoin::BitcoinHash;
	use bitcoin::util::bip143;
	use bitcoin::consensus::encode::serialize;
	use bitcoin::blockdata::script::{Script, Builder};
Expand DownExpand Up@@ -4545,7 +4543,7 @@ mod tests {
 // Now change the fee so we can check that the fee in the open_channel message is the
 // same as the old fee.
 fee_est.fee_est = 500;
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.block_hash());
 assert_eq!(open_channel_msg.feerate_per_kw, original_fee);
	}

Expand All@@ -4566,7 +4564,7 @@ mod tests {
 let mut node_a_chan = Channel::<EnforcingChannelKeys>::new_outbound(&&feeest, &&keys_provider, node_a_node_id, 10000000, 100000, 42, &config).unwrap();

 // Create Node B's channel by receiving Node A's open_channel message
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).block_hash());
 let node_b_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[7; 32]).unwrap());
 let mut node_b_chan = Channel::<EnforcingChannelKeys>::new_from_req(&&feeest, &&keys_provider, node_b_node_id, InitFeatures::known(), &open_channel_msg, 7, &config).unwrap();

Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::network::constants::Network;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
Expand DownExpand Up@@ -724,7 +723,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>

 ChannelManager {
 default_configuration: config.clone(),
 genesis_hash: genesis_block(network).header.bitcoin_hash(),
 genesis_hash: genesis_block(network).block_hash(),
 fee_estimator: fee_est,
 monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -3060,7 +3059,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 L::Target: Logger,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[usize]) {
 let header_hash = header.bitcoin_hash();
 let header_hash = header.block_hash();
 log_trace!(self.logger, "Block {} at height {} connected with {} txn matched", header_hash, height, txn_matched.len());
 let _ = self.total_consistency_lock.read().unwrap();
 let mut failed_channels = Vec::new();
Expand DownExpand Up@@ -3200,7 +3199,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 self.finish_force_close_channel(failure);
 }
 self.latest_block_height.fetch_sub(1, Ordering::AcqRel);
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.bitcoin_hash();
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.block_hash();
	}
}

Expand Down

5 changes: 2 additions & 3 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::consensus::encode;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::Hash;
use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -203,7 +202,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
 C::Target: ChainWatchInterface,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], _indexes_of_txn_matched: &[usize]) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
Expand All@@ -219,7 +218,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
	}

	fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 monitor.block_disconnected(disconnected_height, &block_hash, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ use util::errors::APIError;
use util::config::UserConfig;
use util::ser::{ReadableArgs, Writeable, Readable};

use bitcoin::util::hash::BitcoinHash;
use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::{Transaction, TxOut};
use bitcoin::network::constants::Network;
Expand All@@ -50,7 +49,7 @@ pub fn confirm_transaction<'a, 'b: 'a>(notifier: &'a chaininterface::BlockNotifi
	let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, 1, &[tx; 1], &[chan_id as usize; 1]);
	for i in 2..CHAN_CONFIRM_DEPTH {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, i, &vec![], &[0; 0]);
	}
}
Expand All@@ -59,10 +58,10 @@ pub fn connect_blocks<'a, 'b>(notifier: &'a chaininterface::BlockNotifierRef<'b,
	let mut header = BlockHeader { version: 0x2000000, prev_blockhash: if parent { prev_blockhash } else { Default::default() }, merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, height + 1, &Vec::new(), &Vec::new());
	for i in 2..depth + 1 {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, height + i, &Vec::new(), &Vec::new());
	}
	header.bitcoin_hash()
	header.block_hash()
}

pub struct TestChanMonCfg {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Adopting block_hash() instead of removed bitcoin_hash()#683

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

 Closed

dr-orlovsky
wants to merge
1
commit into

from

 Closed


Adopting block_hash() instead of removed bitcoin_hash()
#683
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


3 changes: 1 addition & 2 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ use bitcoin::blockdata::block::{Block, BlockHeader};
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::script::Script;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::network::constants::Network;
use bitcoin::hash_types::{Txid, BlockHash};

Expand DownExpand Up@@ -366,7 +365,7 @@ impl ChainWatchInterface for ChainWatchInterfaceUtil {
	}

	fn get_chain_utxo(&self, genesis_hash: BlockHash, _unspent_tx_output_identifier: u64) -> Result<(Script, u64), ChainError> {
 if genesis_hash != genesis_block(self.network).header.bitcoin_hash() {
 if genesis_hash != genesis_block(self.network).block_hash() {
 return Err(ChainError::NotWatched);
 }
 Err(ChainError::NotSupported)
Expand Down

18 changes: 8 additions & 10 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::script::{Script,Builder};
use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
use bitcoin::blockdata::opcodes;
use bitcoin::util::hash::BitcoinHash;
use bitcoin::util::bip143;
use bitcoin::consensus::encode;

Expand DownExpand Up@@ -3327,7 +3326,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 });
 let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
 if header.bitcoin_hash() != self.last_block_connected {
 if header.block_hash() != self.last_block_connected {
 if self.funding_tx_confirmations > 0 {
 self.funding_tx_confirmations += 1;
 }
Expand DownExpand Up@@ -3376,8 +3375,8 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 }
 }
 }
 if header.bitcoin_hash() != self.last_block_connected {
 self.last_block_connected = header.bitcoin_hash();
 if header.block_hash() != self.last_block_connected {
 self.last_block_connected = header.block_hash();
 self.update_time_counter = cmp::max(self.update_time_counter, header.time);
 if self.funding_tx_confirmations > 0 {
 if self.funding_tx_confirmations == self.minimum_depth as u64 {
Expand All@@ -3399,7 +3398,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 // funding_tx_confirmed_in and return.
 false
 };
 self.funding_tx_confirmed_in = Some(header.bitcoin_hash());
 self.funding_tx_confirmed_in = Some(header.block_hash());

 //TODO: Note that this must be a duplicate of the previous commitment point they sent us,
 //as otherwise we will have a commitment transaction that they can't revoke (well, kinda,
Expand DownExpand Up@@ -3433,10 +3432,10 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 return true;
 }
 }
 if Some(header.bitcoin_hash()) == self.funding_tx_confirmed_in {
 if Some(header.block_hash()) == self.funding_tx_confirmed_in {
 self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
 }
 self.last_block_connected = header.bitcoin_hash();
 self.last_block_connected = header.block_hash();
 false
	}

Expand DownExpand Up@@ -4451,7 +4450,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for Channel<ChanSigner> {

#[cfg(test)]
mod tests {
	use bitcoin::BitcoinHash;
	use bitcoin::util::bip143;
	use bitcoin::consensus::encode::serialize;
	use bitcoin::blockdata::script::{Script, Builder};
Expand DownExpand Up@@ -4545,7 +4543,7 @@ mod tests {
 // Now change the fee so we can check that the fee in the open_channel message is the
 // same as the old fee.
 fee_est.fee_est = 500;
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.block_hash());
 assert_eq!(open_channel_msg.feerate_per_kw, original_fee);
	}

Expand All@@ -4566,7 +4564,7 @@ mod tests {
 let mut node_a_chan = Channel::<EnforcingChannelKeys>::new_outbound(&&feeest, &&keys_provider, node_a_node_id, 10000000, 100000, 42, &config).unwrap();

 // Create Node B's channel by receiving Node A's open_channel message
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.bitcoin_hash());
 let open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).block_hash());
 let node_b_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[7; 32]).unwrap());
 let mut node_b_chan = Channel::<EnforcingChannelKeys>::new_from_req(&&feeest, &&keys_provider, node_b_node_id, InitFeatures::known(), &open_channel_msg, 7, &config).unwrap();

Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::network::constants::Network;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
Expand DownExpand Up@@ -724,7 +723,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>

 ChannelManager {
 default_configuration: config.clone(),
 genesis_hash: genesis_block(network).header.bitcoin_hash(),
 genesis_hash: genesis_block(network).block_hash(),
 fee_estimator: fee_est,
 monitor,
 tx_broadcaster,
Expand DownExpand Up@@ -3060,7 +3059,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 L::Target: Logger,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[usize]) {
 let header_hash = header.bitcoin_hash();
 let header_hash = header.block_hash();
 log_trace!(self.logger, "Block {} at height {} connected with {} txn matched", header_hash, height, txn_matched.len());
 let _ = self.total_consistency_lock.read().unwrap();
 let mut failed_channels = Vec::new();
Expand DownExpand Up@@ -3200,7 +3199,7 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 self.finish_force_close_channel(failure);
 }
 self.latest_block_height.fetch_sub(1, Ordering::AcqRel);
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.bitcoin_hash();
 *self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header.block_hash();
	}
}

Expand Down

5 changes: 2 additions & 3 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::consensus::encode;
use bitcoin::util::hash::BitcoinHash;

use bitcoin::hashes::Hash;
use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -203,7 +202,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
 C::Target: ChainWatchInterface,
{
	fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], _indexes_of_txn_matched: &[usize]) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
Expand All@@ -219,7 +218,7 @@ impl<Key : Send + cmp::Eq + hash::Hash, ChanSigner: ChannelKeys, T: Deref + Sync
	}

	fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let block_hash = header.bitcoin_hash();
 let block_hash = header.block_hash();
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 monitor.block_disconnected(disconnected_height, &block_hash, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
Expand Down

7 changes: 3 additions & 4 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ use util::errors::APIError;
use util::config::UserConfig;
use util::ser::{ReadableArgs, Writeable, Readable};

use bitcoin::util::hash::BitcoinHash;
use bitcoin::blockdata::block::BlockHeader;
use bitcoin::blockdata::transaction::{Transaction, TxOut};
use bitcoin::network::constants::Network;
Expand All@@ -50,7 +49,7 @@ pub fn confirm_transaction<'a, 'b: 'a>(notifier: &'a chaininterface::BlockNotifi
	let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, 1, &[tx; 1], &[chan_id as usize; 1]);
	for i in 2..CHAN_CONFIRM_DEPTH {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, i, &vec![], &[0; 0]);
	}
}
Expand All@@ -59,10 +58,10 @@ pub fn connect_blocks<'a, 'b>(notifier: &'a chaininterface::BlockNotifierRef<'b,
	let mut header = BlockHeader { version: 0x2000000, prev_blockhash: if parent { prev_blockhash } else { Default::default() }, merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
	notifier.block_connected_checked(&header, height + 1, &Vec::new(), &Vec::new());
	for i in 2..depth + 1 {
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 notifier.block_connected_checked(&header, height + i, &Vec::new(), &Vec::new());
	}
	header.bitcoin_hash()
	header.block_hash()
}

pub struct TestChanMonCfg {
Expand Down
Loading