From: valentinewallace Date: Tue, 31 Aug 2021 01:32:46 +0000 (-0400) Subject: Merge pull request #34 from lightningdevkit/2021-08-fix-33 X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d10310b213f6c979e96d770963c4f5f8e9eb0212;hp=e87a9e18f6739988b93b6bc38c1ae178c0bdaeb8;p=ldk-sample Merge pull request #34 from lightningdevkit/2021-08-fix-33 Correctly parse args without port but with net --- diff --git a/Cargo.lock b/Cargo.lock index 15fb18a..e0c7e9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -251,8 +251,8 @@ checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" [[package]] name = "lightning" -version = "0.0.99" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +version = "0.0.100" +source = "git+https://github.com/rust-bitcoin/rust-lightning?rev=d523b6e#d523b6e42b5b0fde07a89770906e0193ea987538" dependencies = [ "bitcoin", "secp256k1", @@ -260,8 +260,8 @@ dependencies = [ [[package]] name = "lightning-background-processor" -version = "0.0.99" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +version = "0.0.100" +source = "git+https://github.com/rust-bitcoin/rust-lightning?rev=d523b6e#d523b6e42b5b0fde07a89770906e0193ea987538" dependencies = [ "bitcoin", "lightning", @@ -270,8 +270,8 @@ dependencies = [ [[package]] name = "lightning-block-sync" -version = "0.0.99" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +version = "0.0.100" +source = "git+https://github.com/rust-bitcoin/rust-lightning?rev=d523b6e#d523b6e42b5b0fde07a89770906e0193ea987538" dependencies = [ "bitcoin", "chunked_transfer", @@ -283,8 +283,8 @@ dependencies = [ [[package]] name = "lightning-invoice" -version = "0.7.0" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +version = "0.8.0" +source = "git+https://github.com/rust-bitcoin/rust-lightning?rev=d523b6e#d523b6e42b5b0fde07a89770906e0193ea987538" dependencies = [ "bech32", "bitcoin_hashes", @@ -295,8 +295,8 @@ dependencies = [ [[package]] name = "lightning-net-tokio" -version = "0.0.99" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +version = "0.0.100" +source = "git+https://github.com/rust-bitcoin/rust-lightning?rev=d523b6e#d523b6e42b5b0fde07a89770906e0193ea987538" dependencies = [ "bitcoin", "lightning", @@ -305,8 +305,8 @@ dependencies = [ [[package]] name = "lightning-persister" -version = "0.0.99" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +version = "0.0.100" +source = "git+https://github.com/rust-bitcoin/rust-lightning?rev=d523b6e#d523b6e42b5b0fde07a89770906e0193ea987538" dependencies = [ "bitcoin", "libc", diff --git a/Cargo.toml b/Cargo.toml index e71926d..a477368 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,12 +8,12 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -lightning = { version = "0.0.99", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-block-sync = { version = "0.0.99", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main", features = [ "rpc-client" ] } -lightning-invoice = { version = "0.7", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-net-tokio = { version = "0.0.99", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-persister = { version = "0.0.99", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-background-processor = { version = "0.0.99", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } +lightning = { version = "0.0.100", git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d523b6e" } +lightning-block-sync = { version = "0.0.100", git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d523b6e", features = [ "rpc-client" ] } +lightning-invoice = { version = "0.8.0", git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d523b6e" } +lightning-net-tokio = { version = "0.0.100", git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d523b6e" } +lightning-persister = { version = "0.0.100", git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d523b6e" } +lightning-background-processor = { version = "0.0.100", git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d523b6e" } base64 = "0.13.0" bitcoin = "0.27" diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs index 61e67c2..73ee635 100644 --- a/src/bitcoind_client.rs +++ b/src/bitcoind_client.rs @@ -3,7 +3,7 @@ use base64; use bitcoin::blockdata::block::Block; use bitcoin::blockdata::transaction::Transaction; use bitcoin::consensus::encode; -use bitcoin::hash_types::BlockHash; +use bitcoin::hash_types::{BlockHash, Txid}; use bitcoin::util::address::Address; use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator}; use lightning_block_sync::http::HttpEndpoint; @@ -206,7 +206,7 @@ impl BitcoindClient { let mut rpc = self.bitcoind_rpc_client.lock().await; let raw_tx_json = serde_json::json!(raw_tx.0); - rpc.call_method::("sendrawtransaction", &[raw_tx_json]).await.unwrap(); + rpc.call_method::("sendrawtransaction", &[raw_tx_json]).await.unwrap(); } pub async fn sign_raw_transaction_with_wallet(&self, tx_hex: String) -> SignedTx { @@ -254,7 +254,7 @@ impl BroadcasterInterface for BitcoindClient { let mut rpc = bitcoind_rpc_client.lock().await; // This may error due to RL calling `broadcast_transaction` with the same transaction // multiple times, but the error is safe to ignore. - match rpc.call_method::("sendrawtransaction", &vec![tx_serialized]).await { + match rpc.call_method::("sendrawtransaction", &vec![tx_serialized]).await { Ok(_) => {} Err(e) => { let err_str = e.get_ref().unwrap().to_string();