Use new concrete types for block header version and bits fields

Author: wpaulino

lightning-block-sync/src/convert.rs

@@ -89,13 +89,17 @@ impl TryFrom<serde_json::Value> for BlockHeaderData {
 
 		Ok(BlockHeaderData {
 			header: Header {
-				version: get_field!("version", as_i64).try_into().map_err(|_| ())?,
+				version: bitcoin::blockdata::block::Version::from_consensus(
+					get_field!("version", as_i64).try_into().map_err(|_| ())?
+				),
 				prev_blockhash: if let Some(hash_str) = response.get("previousblockhash") {
 						BlockHash::from_hex(hash_str.as_str().ok_or(())?).map_err(|_| ())?
 					} else { BlockHash::all_zeros() },
 				merkle_root: TxMerkleNode::from_hex(get_field!("merkleroot", as_str)).map_err(|_| ())?,
 				time: get_field!("time", as_u64).try_into().map_err(|_| ())?,
-				bits: u32::from_be_bytes(<[u8; 4]>::from_hex(get_field!("bits", as_str)).map_err(|_| ())?),
+				bits: bitcoin::CompactTarget::from_consensus(
+					u32::from_be_bytes(<[u8; 4]>::from_hex(get_field!("bits", as_str)).map_err(|_| ())?)
+				),
 				nonce: get_field!("nonce", as_u64).try_into().map_err(|_| ())?,
 			},
 			chainwork: hex_to_work(get_field!("chainwork", as_str)).map_err(|_| ())?,
@@ -300,7 +304,7 @@ pub(crate) mod tests {
 			serde_json::json!({
 				"chainwork": chainwork.to_string()["0x".len()..],
 				"height": height,
-				"version": header.version,
+				"version": header.version.to_consensus(),
 				"merkleroot": header.merkle_root.to_hex(),
 				"time": header.time,
 				"nonce": header.nonce,

lightning-block-sync/src/poll.rs

@@ -301,8 +301,7 @@ mod tests {
 		let best_known_chain_tip = chain.at_height(0);
 
 		// Invalidate the tip by changing its target.
-		chain.blocks.last_mut().unwrap().header.bits =
-			BlockHeader::compact_target_from_u256(&Target::from_be_bytes([0; 32]));
+		chain.blocks.last_mut().unwrap().header.bits = Target::from_be_bytes([0; 32]).to_compact_lossy();
 
 		let poller = ChainPoller::new(&chain, Network::Bitcoin);
 		match poller.poll_chain_tip(best_known_chain_tip).await {

lightning-block-sync/src/test_utils.rs

@@ -1,7 +1,7 @@
 use crate::{AsyncBlockSourceResult, BlockData, BlockHeaderData, BlockSource, BlockSourceError, UnboundedCache};
 use crate::poll::{Validate, ValidatedBlockHeader};
 
-use bitcoin::blockdata::block::{Block, Header};
+use bitcoin::blockdata::block::{Block, Header, Version};
 use bitcoin::blockdata::constants::genesis_block;
 use bitcoin::blockdata::locktime::absolute::LockTime;
 use bitcoin::hash_types::{BlockHash, TxMerkleNode};
@@ -35,7 +35,7 @@ impl Blockchain {
 
 	pub fn with_height(mut self, height: usize) -> Self {
 		self.blocks.reserve_exact(height);
-		let bits = Header::compact_target_from_u256(&Target::from_be_bytes([0xff; 32]));
+		let bits = Target::from_be_bytes([0xff; 32]).to_compact_lossy();
 		for i in 1..=height {
 			let prev_block = &self.blocks[i - 1];
 			let prev_blockhash = prev_block.block_hash();
@@ -53,7 +53,7 @@ impl Blockchain {
 			let merkle_root = TxMerkleNode::from_raw_hash(coinbase.txid().as_hash()).unwrap();
 			self.blocks.push(Block {
 				header: Header {
-					version: 0,
+					version: Version::NO_SOFT_FORK_SIGNALLING,
 					prev_blockhash,
 					merkle_root,
 					time,

lightning/src/ln/functional_test_utils.rs

@@ -33,13 +33,14 @@ use crate::util::ser::{ReadableArgs, Writeable};
 #[cfg(test)]
 use crate::util::logger::Logger;
 
-use bitcoin::blockdata::block::{Block, Header};
+use bitcoin::blockdata::block::{Block, Header, Version};
 use bitcoin::blockdata::locktime::absolute::LockTime;
 use bitcoin::blockdata::transaction::{Transaction, TxIn, TxOut};
 use bitcoin::hash_types::{BlockHash, TxMerkleNode};
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash as _;
 use bitcoin::network::constants::Network;
+use bitcoin::pow::CompactTarget;
 use bitcoin::secp256k1::{PublicKey, SecretKey};
 
 use crate::io;
@@ -80,7 +81,14 @@ pub fn mine_transactions<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, txn: &[&Tra
 pub fn mine_transaction_without_consistency_checks<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, tx: &Transaction) {
 	let height = node.best_block_info().1 + 1;
 	let mut block = Block {
-		header: Header { version: 0x20000000, prev_blockhash: node.best_block_hash(), merkle_root: TxMerkleNode::all_zeros(), time: height, bits: 42, nonce: 42 },
+		header: Header {
+			version: Version::NO_SOFT_FORK_SIGNALLING,
+			prev_blockhash: node.best_block_hash(),
+			merkle_root: TxMerkleNode::all_zeros(),
+			time: height,
+			bits: CompactTarget::from_consensus(42),
+			nonce: 42,
+		},
 		txdata: Vec::new(),
 	};
 	for _ in 0..*node.network_chan_count.borrow() { // Make sure we don't end up with channels at the same short id by offsetting by chan_count
@@ -206,11 +214,11 @@ impl ConnectStyle {
 
 pub fn create_dummy_header(prev_blockhash: BlockHash, time: u32) -> Header {
 	Header {
-		version: 0x2000_0000,
+		version: Version::NO_SOFT_FORK_SIGNALLING,
 		prev_blockhash,
 		merkle_root: TxMerkleNode::all_zeros(),
 		time,
-		bits: 42,
+		bits: CompactTarget::from_consensus(42),
 		nonce: 42,
 	}
 }