0.2-rc1 backports

fuzz/src/fs_store.rs

@@ -78,7 +78,7 @@ async fn do_test_internal<Out: test_logger::Output>(data: &[u8], _out: Out) {
 			Some(b) => b[0],
 			None => break,
 		};
-		match v % 12 {
+		match v % 13 {
 			// Sync write
 			0 => {
 				let data_value = get_next_data_value();
@@ -96,7 +96,8 @@ async fn do_test_internal<Out: test_logger::Output>(data: &[u8], _out: Out) {
 			},
 			// Sync remove
 			1 => {
-				KVStoreSync::remove(fs_store, primary_namespace, secondary_namespace, key).unwrap();
+				KVStoreSync::remove(fs_store, primary_namespace, secondary_namespace, key, false)
+					.unwrap();
 
 				current_data = None;
 			},
@@ -130,8 +131,10 @@ async fn do_test_internal<Out: test_logger::Output>(data: &[u8], _out: Out) {
 				handles.push(handle);
 			},
 			// Async remove
-			10 => {
-				let fut = KVStore::remove(fs_store, primary_namespace, secondary_namespace, key);
+			10 | 11 => {
+				let lazy = v == 10;
+				let fut =
+					KVStore::remove(fs_store, primary_namespace, secondary_namespace, key, lazy);
 
 				// Already set the current_data, even though writing hasn't finished yet. This supports the call-time
 				// ordering semantics.
@@ -141,7 +144,7 @@ async fn do_test_internal<Out: test_logger::Output>(data: &[u8], _out: Out) {
 				handles.push(handle);
 			},
 			// Join tasks.
-			11 => {
+			12 => {
 				for handle in handles.drain(..) {
 					let _ = handle.await.unwrap();
 				}

lightning-background-processor/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.2.0-beta1"
 authors = ["Valentine Wallace <[email protected]>"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/lightningdevkit/rust-lightning"
+readme = "../README.md"
 description = """
 Utilities to perform required background tasks for Rust Lightning.
 """

lightning-background-processor/src/lib.rs

@@ -748,14 +748,14 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
 /// # impl lightning::util::persist::KVStoreSync for StoreSync {
 /// #     fn read(&self, primary_namespace: &str, secondary_namespace: &str, key: &str) -> io::Result<Vec<u8>> { Ok(Vec::new()) }
 /// #     fn write(&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>) -> io::Result<()> { Ok(()) }
-/// #     fn remove(&self, primary_namespace: &str, secondary_namespace: &str, key: &str) -> io::Result<()> { Ok(()) }
+/// #     fn remove(&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool) -> io::Result<()> { Ok(()) }
 /// #     fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> { Ok(Vec::new()) }
 /// # }
 /// # struct Store {}
 /// # impl lightning::util::persist::KVStore for Store {
 /// #     fn read(&self, primary_namespace: &str, secondary_namespace: &str, key: &str) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + 'static + Send>> { todo!() }
 /// #     fn write(&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> { todo!() }
-/// #     fn remove(&self, primary_namespace: &str, secondary_namespace: &str, key: &str) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> { todo!() }
+/// #     fn remove(&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> { todo!() }
 /// #     fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> Pin<Box<dyn Future<Output = Result<Vec<String>, io::Error>> + 'static + Send>> { todo!() }
 /// # }
 /// # use core::time::Duration;
@@ -2144,9 +2144,9 @@ mod tests {
 		}
 
 		fn remove(
-			&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
+			&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
 		) -> lightning::io::Result<()> {
-			self.kv_store.remove(primary_namespace, secondary_namespace, key)
+			self.kv_store.remove(primary_namespace, secondary_namespace, key, lazy)
 		}
 
 		fn list(

lightning-block-sync/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.2.0-beta1"
 authors = ["Jeffrey Czyz", "Matt Corallo"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/lightningdevkit/rust-lightning"
+readme = "../README.md"
 description = """
 Utilities to fetch the chain data from a block source and feed them into Rust Lightning.
 """

lightning-custom-message/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.2.0-beta1"
 authors = ["Jeffrey Czyz"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/lightningdevkit/rust-lightning"
+readme = "../README.md"
 description = """
 Utilities for supporting custom peer-to-peer messages in LDK.
 """

lightning-dns-resolver/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.3.0-beta1"
 authors = ["Matt Corallo"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/lightningdevkit/rust-lightning/"
+readme = "../README.md"
 description = "A crate which implements DNSSEC resolution for lightning clients over bLIP 32 using `tokio` and the `dnssec-prover` crate."
 edition = "2021"
 

lightning-liquidity/src/lsps2/service.rs

@@ -1834,6 +1834,7 @@ where
 								LIQUIDITY_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
 								LSPS2_SERVICE_PERSISTENCE_SECONDARY_NAMESPACE,
 								&key,
+								true,
 							));
 						} else {
 							// If the peer got new state, force a re-persist of the current state.

lightning-liquidity/src/lsps5/event.rs

@@ -15,7 +15,6 @@ use alloc::vec::Vec;
 use bitcoin::secp256k1::PublicKey;
 
 use lightning::impl_writeable_tlv_based_enum;
-use lightning::util::hash_tables::HashMap;
 
 use super::msgs::LSPS5AppName;
 use super::msgs::LSPS5Error;
@@ -70,7 +69,7 @@ pub enum LSPS5ServiceEvent {
 		/// - `"x-lsps5-timestamp"`: with the timestamp in RFC3339 format (`"YYYY-MM-DDThh:mm:ss.uuuZ"`).
 		/// - `"x-lsps5-signature"`: with the signature of the notification payload, signed using the LSP's node ID.
 		/// Other custom headers may also be included as needed.
-		headers: HashMap<String, String>,
+		headers: Vec<(String, String)>,
 	},
 }
 

lightning-liquidity/src/lsps5/msgs.rs

@@ -541,34 +541,29 @@ pub struct WebhookNotification {
 }
 
 impl WebhookNotification {
-	/// Create a new webhook notification.
-	pub fn new(method: WebhookNotificationMethod) -> Self {
-		Self { method }
-	}
-
 	/// Create a webhook_registered notification.
 	pub fn webhook_registered() -> Self {
-		Self::new(WebhookNotificationMethod::LSPS5WebhookRegistered)
+		Self { method: WebhookNotificationMethod::LSPS5WebhookRegistered }
 	}
 
 	/// Create a payment_incoming notification.
 	pub fn payment_incoming() -> Self {
-		Self::new(WebhookNotificationMethod::LSPS5PaymentIncoming)
+		Self { method: WebhookNotificationMethod::LSPS5PaymentIncoming }
 	}
 
 	/// Create an expiry_soon notification.
 	pub fn expiry_soon(timeout: u32) -> Self {
-		Self::new(WebhookNotificationMethod::LSPS5ExpirySoon { timeout })
+		Self { method: WebhookNotificationMethod::LSPS5ExpirySoon { timeout } }
 	}
 
 	/// Create a liquidity_management_request notification.
 	pub fn liquidity_management_request() -> Self {
-		Self::new(WebhookNotificationMethod::LSPS5LiquidityManagementRequest)
+		Self { method: WebhookNotificationMethod::LSPS5LiquidityManagementRequest }
 	}
 
 	/// Create an onion_message_incoming notification.
 	pub fn onion_message_incoming() -> Self {
-		Self::new(WebhookNotificationMethod::LSPS5OnionMessageIncoming)
+		Self { method: WebhookNotificationMethod::LSPS5OnionMessageIncoming }
 	}
 }
 

lightning-liquidity/src/lsps5/service.rs

@@ -297,6 +297,7 @@ where
 								LIQUIDITY_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
 								LSPS5_SERVICE_PERSISTENCE_SECONDARY_NAMESPACE,
 								&key,
+								true,
 							));
 						} else {
 							// If the peer was re-added, force a re-persist of the current state.
@@ -629,12 +630,12 @@ where
 
 		let signature_hex = self.sign_notification(&notification, &timestamp)?;
 
-		let mut headers: HashMap<String, String> = [("Content-Type", "application/json")]
+		let mut headers: Vec<(String, String)> = [("Content-Type", "application/json")]
 			.into_iter()
 			.map(|(k, v)| (k.to_string(), v.to_string()))
 			.collect();
-		headers.insert("x-lsps5-timestamp".into(), timestamp.to_rfc3339());
-		headers.insert("x-lsps5-signature".into(), signature_hex);
+		headers.push(("x-lsps5-timestamp".into(), timestamp.to_rfc3339()));
+		headers.push(("x-lsps5-signature".into(), signature_hex));
 
 		event_queue_notifier.enqueue(LSPS5ServiceEvent::SendWebhookNotification {
 			counterparty_node_id,

lightning-liquidity/tests/lsps5_integration_tests.rs

@@ -17,7 +17,7 @@ use lightning::ln::functional_test_utils::{
 };
 use lightning::ln::msgs::Init;
 use lightning::ln::peer_handler::CustomMessageHandler;
-use lightning::util::hash_tables::{HashMap, HashSet};
+use lightning::util::hash_tables::HashSet;
 use lightning::util::test_utils::TestStore;
 use lightning_liquidity::events::LiquidityEvent;
 use lightning_liquidity::lsps0::ser::LSPSDateTime;
@@ -288,15 +288,20 @@ impl TimeProvider for MockTimeProvider {
 	}
 }
 
-fn extract_ts_sig(headers: &HashMap<String, String>) -> (LSPSDateTime, String) {
+fn extract_ts_sig(headers: &Vec<(String, String)>) -> (LSPSDateTime, String) {
 	let timestamp = headers
-		.get("x-lsps5-timestamp")
+		.iter()
+		.find_map(|(key, value)| (key == "x-lsps5-timestamp").then(|| value))
 		.expect("missing x-lsps5-timestamp header")
 		.parse::<LSPSDateTime>()
 		.expect("failed to parse x-lsps5-timestamp header");
 
-	let signature =
-		headers.get("x-lsps5-signature").expect("missing x-lsps5-signature header").to_owned();
+	let signature = headers
+		.iter()
+		.find(|(key, _)| key == "x-lsps5-signature")
+		.expect("missing x-lsps5-signature header")
+		.1
+		.clone();
 	(timestamp, signature)
 }
 

lightning-net-tokio/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.2.0-beta1"
 authors = ["Matt Corallo"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/lightningdevkit/rust-lightning/"
+readme = "../README.md"
 description = """
 Implementation of the rust-lightning network stack using Tokio.
 For Rust-Lightning clients which wish to make direct connections to Lightning P2P nodes, this is a simple alternative to implementing the required network stack, especially for those already using Tokio.

lightning-persister/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.2.0-beta1"
 authors = ["Valentine Wallace", "Matt Corallo"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/lightningdevkit/rust-lightning"
+readme = "../README.md"
 description = """
 Utilities for LDK data persistence and retrieval.
 """