Submit packages via esplora

Author: tankyleo

Cargo.toml

@@ -151,3 +151,6 @@ harness = false
 #lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
 #lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
 #lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
+
+[patch.crates-io]
+esplora-client = { git = 'https://github.com/acidbunny21/rust-esplora-client.git', branch = 'submit-tx-pkg-clients' }

src/chain/esplora.rs

@@ -365,15 +365,17 @@ impl EsploraChainSource {
 	}
 
 	pub(crate) async fn process_broadcast_package(&self, package: Vec<Transaction>) {
-		for tx in &package {
+		if package.len() == 1 {
+			let tx = &package[0];
 			let txid = tx.compute_txid();
 			let timeout_fut = tokio::time::timeout(
 				Duration::from_secs(TX_BROADCAST_TIMEOUT_SECS),
 				self.esplora_client.broadcast(tx),
 			);
 			match timeout_fut.await {
 				Ok(res) => match res {
-					Ok(()) => {
+					Ok(id) => {
+						debug_assert_eq!(id, txid);
 						log_trace!(self.logger, "Successfully broadcast transaction {}", txid);
 					},
 					Err(e) => match e {
@@ -432,6 +434,76 @@ impl EsploraChainSource {
 					);
 				},
 			}
+		} else if package.len() > 1 {
+			let txids: Vec<_> = package.iter().map(|tx| tx.compute_txid()).collect();
+			let timeout_fut = tokio::time::timeout(
+				Duration::from_secs(TX_BROADCAST_TIMEOUT_SECS),
+				self.esplora_client.submit_package(&package, None, None),
+			);
+			match timeout_fut.await {
+				Ok(res) => match res {
+					Ok(result) => {
+						// TODO: We'd like to debug assert here the txids, but we sometimes
+						// get 0 txids back
+						log_trace!(
+							self.logger,
+							"Package broadcast result {:?}",
+							result,
+						);
+					},
+					Err(e) => match e {
+						esplora_client::Error::HttpResponse { status, message } => {
+							if status == 400 {
+								// Log 400 at lesser level, as this often just means bitcoind already knows the
+								// transaction.
+								// FIXME: We can further differentiate here based on the error
+								// message which will be available with rust-esplora-client 0.7 and
+								// later.
+								log_trace!(
+									self.logger,
+									"Failed to broadcast due to HTTP connection error: {}",
+									message
+								);
+							} else {
+								log_error!(
+									self.logger,
+									"Failed to broadcast due to HTTP connection error: {} - {}",
+									status,
+									message
+								);
+							}
+							log_trace!(self.logger, "Failed broadcast package bytes:");
+							for tx in package {
+								log_trace!(self.logger, "{}", log_bytes!(tx.encode()));
+							}
+						},
+						_ => {
+							log_error!(
+								self.logger,
+								"Failed to broadcast package {:?}: {}",
+								txids,
+								e
+							);
+							log_trace!(self.logger, "Failed broadcast package bytes:");
+							for tx in package {
+								log_trace!(self.logger, "{}", log_bytes!(tx.encode()));
+							}
+						},
+					},
+				},
+				Err(e) => {
+					log_error!(
+						self.logger,
+						"Failed to broadcast package due to timeout {:?}: {}",
+						txids,
+						e
+					);
+					log_trace!(self.logger, "Failed broadcast transaction bytes:");
+					for tx in package {
+						log_trace!(self.logger, "{}", log_bytes!(tx.encode()));
+					}
+				},
+			}
 		}
 	}
 }