Merge pull request #5 from TheBlueMatt/main

Trivial Usability Fixes

Author: jkczyz

Cargo.lock

@@ -8,36 +8,26 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-# lightning-background-processor = { git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" }
-lightning-background-processor = { git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d4d322580994857b1222488f8467311d6db61482" }
-# lightning-background-processor = { path = "../rust-lightning/lightning-background-processor" }
+lightning = "0.0.14"
+lightning-block-sync = { version = "0.0.14", features = [ "rpc-client" ] }
+lightning-invoice = "0.5"
+lightning-net-tokio = "0.0.14"
+lightning-persister = "0.0.14"
+lightning-background-processor = "0.0.14"
+
 base64 = "0.13.0"
 bitcoin = "0.26"
 bitcoin-bech32 = "0.7"
 bech32 = "0.7"
 hex = "0.3"
 
-# lightning = { git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" }
-lightning = { git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d4d322580994857b1222488f8467311d6db61482" }
-# lightning = { path = "../rust-lightning/lightning" }
-
-# lightning-block-sync = { git = "https://github.com/rust-bitcoin/rust-lightning", features = ["rpc-client"], branch = "main" }
-lightning-block-sync = { git = "https://github.com/rust-bitcoin/rust-lightning", features = ["rpc-client"], rev = "d4d322580994857b1222488f8467311d6db61482" }
-# lightning-block-sync = { path = "../rust-lightning/lightning-block-sync", features = ["rpc-client"] }
-
-# lightning-invoice = { git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" }
-lightning-invoice = { git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d4d322580994857b1222488f8467311d6db61482" }
-# lightning-invoice = { path = "../rust-lightning/lightning-invoice" }
-
-# lightning-net-tokio = { git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" }
-lightning-net-tokio = { git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d4d322580994857b1222488f8467311d6db61482" }
-# lightning-net-tokio = { path = "../rust-lightning/lightning-net-tokio" }
-
-# lightning-persister = { git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" }
-lightning-persister = { git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d4d322580994857b1222488f8467311d6db61482" }
-# lightning-persister = { path = "../rust-lightning/lightning-persister" }
-
 time = "0.2"
 rand = "0.4"
 serde_json = { version = "1.0" }
 tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] }
+
+[profile.release]
+panic = "abort"
+
+[profile.dev]
+panic = "abort"

Cargo.toml

@@ -67,7 +67,14 @@ impl BitcoindClient {
 		let http_endpoint = HttpEndpoint::for_host(host.clone()).with_port(port);
 		let rpc_credentials =
 			base64::encode(format!("{}:{}", rpc_user.clone(), rpc_password.clone()));
-		let bitcoind_rpc_client = RpcClient::new(&rpc_credentials, http_endpoint)?;
+		let mut bitcoind_rpc_client = RpcClient::new(&rpc_credentials, http_endpoint)?;
+		let _dummy = bitcoind_rpc_client
+			.call_method::<BlockchainInfo>("getblockchaininfo", &vec![])
+			.await
+			.map_err(|_| {
+				std::io::Error::new(std::io::ErrorKind::PermissionDenied,
+				"Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
+			})?;
 		let mut fees: HashMap<Target, AtomicU32> = HashMap::new();
 		fees.insert(Target::Background, AtomicU32::new(253));
 		fees.insert(Target::Normal, AtomicU32::new(2000));

src/bitcoind_client.rs

@@ -103,7 +103,9 @@ pub(crate) async fn poll_for_user_input(
 	event_notifier: mpsc::Sender<()>, ldk_data_dir: String, logger: Arc<FilesystemLogger>,
 	network: Network,
 ) {
-	println!("LDK startup successful. To view available commands: \"help\".\nLDK logs are available at <your-supplied-ldk-data-dir-path>/.ldk/logs");
+	println!("LDK startup successful. To view available commands: \"help\".");
+	println!("LDK logs are available at <your-supplied-ldk-data-dir-path>/.ldk/logs");
+	println!("Local Node ID is {}.", channel_manager.get_our_node_id());
 	let stdin = io::stdin();
 	print!("> ");
 	io::stdout().flush().unwrap(); // Without flushing, the `>` doesn't print

src/cli.rs

@@ -72,6 +72,7 @@ impl TryInto<FeeResponse> for JsonResponse {
 pub struct BlockchainInfo {
 	pub latest_height: usize,
 	pub latest_blockhash: BlockHash,
+	pub chain: String,
 }
 
 impl TryInto<BlockchainInfo> for JsonResponse {
@@ -81,6 +82,7 @@ impl TryInto<BlockchainInfo> for JsonResponse {
 			latest_height: self.0["blocks"].as_u64().unwrap() as usize,
 			latest_blockhash: BlockHash::from_hex(self.0["bestblockhash"].as_str().unwrap())
 				.unwrap(),
+			chain: self.0["chain"].as_str().unwrap().to_string(),
 		})
 	}
 }

src/convert.rs

@@ -168,10 +168,10 @@ async fn handle_ldk_events(
 					let status = match loop_channel_manager.claim_funds(payment_preimage.unwrap()) {
 						true => {
 							println!(
-					          		    "\nEVENT: received payment from payment hash {} of {} millisatoshis",
-					          		    hex_utils::hex_str(&payment_hash.0),
-					          		    amt
-					              );
+								"\nEVENT: received payment from payment hash {} of {} millisatoshis",
+								hex_utils::hex_str(&payment_hash.0),
+								amt
+							);
 							print!("> ");
 							io::stdout().flush().unwrap();
 							HTLCStatus::Succeeded
@@ -290,6 +290,22 @@ async fn start_ldk() {
 		}
 	};
 
+	// Check that the bitcoind we've connected to is running the network we expect
+	let bitcoind_chain = bitcoind_client.get_blockchain_info().await.chain;
+	if bitcoind_chain
+		!= match args.network {
+			bitcoin::Network::Bitcoin => "main",
+			bitcoin::Network::Testnet => "test",
+			bitcoin::Network::Regtest => "regtest",
+			bitcoin::Network::Signet => "signet",
+		} {
+		println!(
+			"Chain argument ({}) didn't match bitcoind chain ({})",
+			args.network, bitcoind_chain
+		);
+		return;
+	}
+
 	// ## Setup
 	// Step 1: Initialize the FeeEstimator