Improve logging in WalletKeysManager

While we cannot get rid of the panics here, we can make sure the errors
are logged before we (explicitly) panic.

Author: tnull

src/builder.rs

@@ -470,6 +470,7 @@ fn build_with_store_internal<K: KVStore + Sync + Send + 'static>(
 		cur_time.as_secs(),
 		cur_time.subsec_nanos(),
 		Arc::clone(&wallet),
+		Arc::clone(&logger),
 	));
 
 	// Initialize the network graph, scorer, and router

src/wallet.rs

@@ -337,6 +337,7 @@ where
 {
 	inner: KeysManager,
 	wallet: Arc<Wallet<D, L>>,
+	logger: L,
 }
 
 impl<D, L: Deref> WalletKeysManager<D, L>
@@ -350,10 +351,10 @@ where
 	/// `starting_time_nanos`.
 	pub fn new(
 		seed: &[u8; 32], starting_time_secs: u64, starting_time_nanos: u32,
-		wallet: Arc<Wallet<D, L>>,
+		wallet: Arc<Wallet<D, L>>, logger: L,
 	) -> Self {
 		let inner = KeysManager::new(seed, starting_time_secs, starting_time_nanos);
-		Self { inner, wallet }
+		Self { inner, wallet, logger }
 	}
 
 	/// See [`KeysManager::spend_spendable_outputs`] for documentation on this method.
@@ -450,20 +451,35 @@ where
 	}
 
 	fn get_destination_script(&self) -> Script {
-		let address =
-			self.wallet.get_new_address().expect("Failed to retrieve new address from wallet.");
+		let address = self.wallet.get_new_address().unwrap_or_else(|e| {
+			log_error!(self.logger, "Failed to retrieve new address from wallet: {}", e);
+			panic!("Failed to retrieve new address from wallet");
+		});
 		address.script_pubkey()
 	}
 
 	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
-		let address =
-			self.wallet.get_new_address().expect("Failed to retrieve new address from wallet.");
+		let address = self.wallet.get_new_address().unwrap_or_else(|e| {
+			log_error!(self.logger, "Failed to retrieve new address from wallet: {}", e);
+			panic!("Failed to retrieve new address from wallet");
+		});
+
 		match address.payload {
 			bitcoin::util::address::Payload::WitnessProgram { version, program } => {
-				return ShutdownScript::new_witness_program(version, &program)
-					.expect("Invalid shutdown script.");
+				return ShutdownScript::new_witness_program(version, &program).unwrap_or_else(
+					|e| {
+						log_error!(self.logger, "Invalid shutdown script: {:?}", e);
+						panic!("Invalid shutdown script.");
+					},
+				);
+			}
+			_ => {
+				log_error!(
+					self.logger,
+					"Tried to use a non-witness address. This must not ever happen."
+				);
+				panic!("Tried to use a non-witness address. This must not ever happen.");
 			}
-			_ => panic!("Tried to use a non-witness address. This must not ever happen."),
 		}
 	}
 }