Merge pull request #74 from tnull/2023-12-upgrade-to-LDK-0.0.119

Upgrade LDK to 0.0.119 and rust-bitcoin to 0.30.2

Author: tnull

Cargo.toml

@@ -13,9 +13,9 @@ std = ["lightning/std", "bitcoin/std"]
 no-std = ["hashbrown", "lightning/no-std", "bitcoin/no-std", "core2/alloc"]
 
 [dependencies]
-lightning = { version = "0.0.118", default-features = false, features = ["max_level_trace"] }
-lightning-invoice = "0.26.0"
-bitcoin = { version = "0.29.0", default-features = false }
+lightning = { version = "0.0.119", default-features = false, features = ["max_level_trace"] }
+lightning-invoice = "0.27.0"
+bitcoin = { version = "0.30.2", default-features = false }
 hashbrown = { version = "0.8", optional = true }
 core2 = { version = "0.3.0", optional = true, default-features = false }
 

rustfmt.toml

@@ -2,4 +2,4 @@ hard_tabs = true # use tab characters for indentation, spaces for alignment
 use_field_init_shorthand = true
 max_width = 100
 use_small_heuristics = "Max"
-fn_args_layout = "Compressed"
+fn_params_layout = "Compressed"

src/lsps2/msgs.rs

@@ -69,7 +69,7 @@ impl RawOpeningFeeParams {
 		hmac.input(self.valid_until.to_rfc3339().as_bytes());
 		hmac.input(&self.min_lifetime.to_be_bytes());
 		hmac.input(&self.max_client_to_self_delay.to_be_bytes());
-		let promise_bytes = Hmac::from_engine(hmac).into_inner();
+		let promise_bytes = Hmac::from_engine(hmac).to_byte_array();
 		let promise = utils::hex_str(&promise_bytes[..]);
 		OpeningFeeParams {
 			min_fee_msat: self.min_fee_msat,

src/lsps2/utils.rs

@@ -37,7 +37,7 @@ pub fn is_valid_opening_fee_params(
 	hmac.input(fee_params.valid_until.to_rfc3339().as_bytes());
 	hmac.input(&fee_params.min_lifetime.to_be_bytes());
 	hmac.input(&fee_params.max_client_to_self_delay.to_be_bytes());
-	let promise_bytes = Hmac::from_engine(hmac).into_inner();
+	let promise_bytes = Hmac::from_engine(hmac).to_byte_array();
 	let promise = utils::hex_str(&promise_bytes[..]);
 	promise == fee_params.promise
 }

src/manager.rs

@@ -471,7 +471,7 @@ where
 	C::Target: Filter,
 {
 	fn filtered_block_connected(
-		&self, header: &bitcoin::BlockHeader, txdata: &chain::transaction::TransactionData,
+		&self, header: &bitcoin::block::Header, txdata: &chain::transaction::TransactionData,
 		height: u32,
 	) {
 		if let Some(best_block) = &self.best_block {
@@ -486,7 +486,7 @@ where
 		self.best_block_updated(header, height);
 	}
 
-	fn block_disconnected(&self, header: &bitcoin::BlockHeader, height: u32) {
+	fn block_disconnected(&self, header: &bitcoin::block::Header, height: u32) {
 		let new_height = height - 1;
 		if let Some(best_block) = &self.best_block {
 			let mut best_block = best_block.write().unwrap();
@@ -510,7 +510,7 @@ where
 	C::Target: Filter,
 {
 	fn transactions_confirmed(
-		&self, header: &bitcoin::BlockHeader, txdata: &chain::transaction::TransactionData,
+		&self, header: &bitcoin::block::Header, txdata: &chain::transaction::TransactionData,
 		height: u32,
 	) {
 		// TODO: Call transactions_confirmed on all sub-modules that require it, e.g., LSPS1MessageHandler.
@@ -522,11 +522,11 @@ where
 		// confirmed at a height <= the one we now unconfirmed.
 	}
 
-	fn best_block_updated(&self, header: &bitcoin::BlockHeader, height: u32) {
+	fn best_block_updated(&self, header: &bitcoin::block::Header, height: u32) {
 		// TODO: Call best_block_updated on all sub-modules that require it, e.g., LSPS1MessageHandler.
 	}
 
-	fn get_relevant_txids(&self) -> Vec<(bitcoin::Txid, Option<bitcoin::BlockHash>)> {
+	fn get_relevant_txids(&self) -> Vec<(bitcoin::Txid, u32, Option<bitcoin::BlockHash>)> {
 		// TODO: Collect relevant txids from all sub-modules that, e.g., LSPS1MessageHandler.
 		Vec::new()
 	}