Merge branch 'lightningdevkit:main' into main

Author: Sharmalm

.github/workflows/build.yml

@@ -86,6 +86,11 @@ jobs:
         run: cargo update -p tokio --precise "1.14.0" --verbose
         env:
           CARGO_NET_GIT_FETCH_WITH_CLI: "true"
+      - name: Pin tokio to 1.26 for Windows
+        if: "matrix.platform == 'windows-latest'"
+        run: cargo update -p tokio --precise "1.26.0" --verbose
+        env:
+          CARGO_NET_GIT_FETCH_WITH_CLI: "true"
       - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
         if: "matrix.build-net-tokio && !matrix.coverage"
         run: cargo build --verbose --color always
@@ -127,18 +132,21 @@ jobs:
           cd lightning-transaction-sync
           cargo build --verbose --color always --features esplora-blocking
           cargo build --verbose --color always --features esplora-async
+          cargo build --verbose --color always --features esplora-async-https
       - name: Build transaction sync clients on Rust ${{ matrix.toolchain }} with features and full code-linking for coverage generation
         if: "matrix.build-tx-sync && matrix.coverage"
         run: |
           cd lightning-transaction-sync
           RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-blocking
           RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async
+          RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always --features esplora-async-https
       - name: Test transaction sync clients on Rust ${{ matrix.toolchain }} with features
         if: "matrix.build-tx-sync"
         run: |
           cd lightning-transaction-sync
           cargo test --verbose --color always --features esplora-blocking
           cargo test --verbose --color always --features esplora-async
+          cargo test --verbose --color always --features esplora-async-https
       - name: Test backtrace-debug builds on Rust ${{ matrix.toolchain }}
         if: "matrix.toolchain == 'stable'"
         shell: bash # Default on Winblows is powershell

CHANGELOG.md

@@ -22,7 +22,7 @@
    missing support for blinded path payments (#1927, #1908, #1926).
  * A `lightning-custom-message` crate has been added to make combining multiple
    custom messages into one enum/handler easier (#1832).
- * `Event::PaymentPathFailure` is now generated for failure to send an HTLC
+ * `Event::PaymentPathFailed` is now generated for failure to send an HTLC
    over the first hop on our local channel (#2014, #2043).
  * `lightning-net-tokio` no longer requires an `Arc` on `PeerManager` (#1968).
  * `ChannelManager::list_recent_payments` was added (#1873).
@@ -40,7 +40,7 @@
    if you downgrade prior to receipt (#1878).
  * `Event::PaymentPathFailed::network_update` will always be `None` if an
    0.0.114-generated event is read by a prior version of LDK (#2043).
- * `Event::PaymentPathFailed::all_paths_removed` will always be false if an
+ * `Event::PaymentPathFailed::all_paths_failed` will always be false if an
    0.0.114-generated event is read by a prior version of LDK. Users who rely on
    it to determine payment retries should migrate to `Event::PaymentFailed`, in
    a separate release prior to upgrading to LDK 0.0.114 if downgrading is

fuzz/src/router.rs

@@ -268,6 +268,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 								inbound_htlc_minimum_msat: None,
 								inbound_htlc_maximum_msat: None,
 								config: None,
+								feerate_sat_per_1000_weight: None,
 							});
 						}
 						Some(&first_hops_vec[..])

lightning-background-processor/src/lib.rs

@@ -349,9 +349,9 @@ macro_rules! define_run_body {
 						log_error!($logger, "Error: Failed to persist network graph, check your disk and permissions {}", e)
 					}
 
-					last_prune_call = $get_timer(NETWORK_PRUNE_TIMER);
 					have_pruned = true;
 				}
+				last_prune_call = $get_timer(NETWORK_PRUNE_TIMER);
 			}
 
 			if $timer_elapsed(&mut last_scorer_persist_call, SCORER_PERSIST_TIMER) {
@@ -757,7 +757,7 @@ mod tests {
 
 	impl Persister {
 		fn new(data_dir: String) -> Self {
-			let filesystem_persister = FilesystemPersister::new(data_dir.clone());
+			let filesystem_persister = FilesystemPersister::new(data_dir);
 			Self { graph_error: None, graph_persistence_notifier: None, manager_error: None, scorer_error: None, filesystem_persister }
 		}
 
@@ -824,7 +824,7 @@ mod tests {
 		}
 
 		fn expect(&mut self, expectation: TestResult) {
-			self.event_expectations.get_or_insert_with(|| VecDeque::new()).push_back(expectation);
+			self.event_expectations.get_or_insert_with(VecDeque::new).push_back(expectation);
 		}
 	}
 
@@ -1226,7 +1226,7 @@ mod tests {
 		// Set up a background event handler for SpendableOutputs events.
 		let (sender, receiver) = std::sync::mpsc::sync_channel(1);
 		let event_handler = move |event: Event| match event {
-			Event::SpendableOutputs { .. } => sender.send(event.clone()).unwrap(),
+			Event::SpendableOutputs { .. } => sender.send(event).unwrap(),
 			Event::ChannelReady { .. } => {},
 			Event::ChannelClosed { .. } => {},
 			_ => panic!("Unexpected event: {:?}", event),
@@ -1274,7 +1274,7 @@ mod tests {
 		let nodes = create_nodes(2, "test_not_pruning_network_graph_until_graph_sync_completion".to_string());
 		let data_dir = nodes[0].persister.get_data_dir();
 		let (sender, receiver) = std::sync::mpsc::sync_channel(1);
-		let persister = Arc::new(Persister::new(data_dir.clone()).with_graph_persistence_notifier(sender));
+		let persister = Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
 		let network_graph = nodes[0].network_graph.clone();
 		let features = ChannelFeatures::empty();
 		network_graph.add_channel_from_partial_announcement(42, 53, features, nodes[0].node.get_our_node_id(), nodes[1].node.get_our_node_id())
@@ -1317,7 +1317,7 @@ mod tests {
 		// this should have added two channels
 		assert_eq!(network_graph.read_only().channels().len(), 3);
 
-		let _ = receiver
+		receiver
 			.recv_timeout(Duration::from_secs(super::FIRST_NETWORK_PRUNE_TIMER * 5))
 			.expect("Network graph not pruned within deadline");
 
@@ -1344,7 +1344,7 @@ mod tests {
 
 		let nodes = create_nodes(1, "test_payment_path_scoring".to_string());
 		let data_dir = nodes[0].persister.get_data_dir();
-		let persister = Arc::new(Persister::new(data_dir.clone()));
+		let persister = Arc::new(Persister::new(data_dir));
 		let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].no_gossip_sync(), nodes[0].peer_manager.clone(), nodes[0].logger.clone(), Some(nodes[0].scorer.clone()));
 
 		let scored_scid = 4242;
@@ -1369,7 +1369,6 @@ mod tests {
 			failure: PathFailure::OnPath { network_update: None },
 			path: path.clone(),
 			short_channel_id: Some(scored_scid),
-			retry: None,
 		});
 		let event = receiver
 			.recv_timeout(Duration::from_secs(EVENT_DEADLINE))
@@ -1389,7 +1388,6 @@ mod tests {
 			failure: PathFailure::OnPath { network_update: None },
 			path: path.clone(),
 			short_channel_id: None,
-			retry: None,
 		});
 		let event = receiver
 			.recv_timeout(Duration::from_secs(EVENT_DEADLINE))
@@ -1431,7 +1429,7 @@ mod tests {
 		nodes[0].node.push_pending_event(Event::ProbeFailed {
 			payment_id: PaymentId([42; 32]),
 			payment_hash: PaymentHash([42; 32]),
-			path: path.clone(),
+			path,
 			short_channel_id: Some(scored_scid),
 		});
 		let event = receiver

lightning-block-sync/Cargo.toml

@@ -28,4 +28,4 @@ chunked_transfer = { version = "1.4", optional = true }
 
 [dev-dependencies]
 lightning = { version = "0.0.114", path = "../lightning", features = ["_test_utils"] }
-tokio = { version = "~1.14", features = [ "macros", "rt" ] }
+tokio = { version = "1.14", features = [ "macros", "rt" ] }

lightning-block-sync/src/init.rs

@@ -181,7 +181,7 @@ pub async fn synchronize_listeners<B: Deref + Sized + Send + Sync, C: Cache, L:
 		let chain_listener = &ChainListenerSet(chain_listeners_at_height);
 		let mut chain_notifier = ChainNotifier { header_cache, chain_listener };
 		chain_notifier.connect_blocks(common_ancestor, most_connected_blocks, &mut chain_poller)
-			.await.or_else(|(e, _)| Err(e))?;
+			.await.map_err(|(e, _)| e)?;
 	}
 
 	Ok(best_header)

lightning-block-sync/src/lib.rs

@@ -414,15 +414,15 @@ impl<'a, C: Cache, L: Deref> ChainNotifier<'a, C, L> where L::Target: chain::Lis
 			let height = header.height;
 			let block_data = chain_poller
 				.fetch_block(&header).await
-				.or_else(|e| Err((e, Some(new_tip))))?;
+				.map_err(|e| (e, Some(new_tip)))?;
 			debug_assert_eq!(block_data.block_hash, header.block_hash);
 
 			match block_data.deref() {
 				BlockData::FullBlock(block) => {
-					self.chain_listener.block_connected(&block, height);
+					self.chain_listener.block_connected(block, height);
 				},
 				BlockData::HeaderOnly(header) => {
-					self.chain_listener.filtered_block_connected(&header, &[], height);
+					self.chain_listener.filtered_block_connected(header, &[], height);
 				},
 			}
 

lightning-block-sync/src/poll.rs

@@ -61,7 +61,7 @@ impl Validate for BlockHeaderData {
 	fn validate(self, block_hash: BlockHash) -> BlockSourceResult<Self::T> {
 		let pow_valid_block_hash = self.header
 			.validate_pow(&self.header.target())
-			.or_else(|e| Err(BlockSourceError::persistent(e)))?;
+			.map_err(BlockSourceError::persistent)?;
 
 		if pow_valid_block_hash != block_hash {
 			return Err(BlockSourceError::persistent("invalid block hash"));
@@ -82,7 +82,7 @@ impl Validate for BlockData {
 
 		let pow_valid_block_hash = header
 			.validate_pow(&header.target())
-			.or_else(|e| Err(BlockSourceError::persistent(e)))?;
+			.map_err(BlockSourceError::persistent)?;
 
 		if pow_valid_block_hash != block_hash {
 			return Err(BlockSourceError::persistent("invalid block hash"));

lightning-block-sync/src/test_utils.rs

@@ -106,7 +106,7 @@ impl Blockchain {
 		BlockHeaderData {
 			chainwork: self.blocks[0].header.work() + Uint256::from_u64(height as u64).unwrap(),
 			height: height as u32,
-			header: self.blocks[height].header.clone(),
+			header: self.blocks[height].header,
 		}
 	}
 
@@ -162,7 +162,7 @@ impl BlockSource for Blockchain {
 					}
 
 					if self.filtered_blocks {
-						return Ok(BlockData::HeaderOnly(block.header.clone()));
+						return Ok(BlockData::HeaderOnly(block.header));
 					} else {
 						return Ok(BlockData::FullBlock(block.clone()));
 					}

lightning-invoice/src/de.rs

@@ -6,7 +6,6 @@ use core::num::ParseIntError;
 use core::str;
 use core::str::FromStr;
 
-use bech32;
 use bech32::{u5, FromBase32};
 
 use bitcoin_hashes::Hash;
@@ -18,7 +17,6 @@ use lightning::routing::router::{RouteHint, RouteHintHop};
 
 use num_traits::{CheckedAdd, CheckedMul};
 
-use secp256k1;
 use secp256k1::ecdsa::{RecoveryId, RecoverableSignature};
 use secp256k1::PublicKey;
 
@@ -323,9 +321,9 @@ impl FromStr for RawHrp {
 		};
 
 		Ok(RawHrp {
-			currency: currency,
+			currency,
 			raw_amount: amount,
-			si_prefix: si_prefix,
+			si_prefix,
 		})
 	}
 }
@@ -342,7 +340,7 @@ impl FromBase32 for RawDataPart {
 		let tagged = parse_tagged_parts(&data[7..])?;
 
 		Ok(RawDataPart {
-			timestamp: timestamp,
+			timestamp,
 			tagged_fields: tagged,
 		})
 	}
@@ -515,7 +513,7 @@ impl FromBase32 for ExpiryTime {
 
 	fn from_base32(field_data: &[u5]) -> Result<ExpiryTime, ParseError> {
 		match parse_int_be::<u64, u5>(field_data, 32)
-			.map(|t| ExpiryTime::from_seconds(t))
+			.map(ExpiryTime::from_seconds)
 		{
 			Some(t) => Ok(t),
 			None => Err(ParseError::IntegerOverflowError),
@@ -540,7 +538,7 @@ impl FromBase32 for Fallback {
 	type Err = ParseError;
 
 	fn from_base32(field_data: &[u5]) -> Result<Fallback, ParseError> {
-		if field_data.len() < 1 {
+		if field_data.is_empty() {
 			return Err(ParseError::UnexpectedEndOfTaggedFields);
 		}
 
@@ -554,7 +552,7 @@ impl FromBase32 for Fallback {
 				}
 
 				Ok(Fallback::SegWitProgram {
-					version: version,
+					version,
 					program: bytes
 				})
 			},