Merge pull request #28 from delta1/master

Author: bonomat

Cargo.toml

@@ -8,8 +8,8 @@ license = "MIT"
 
 [dependencies]
 base64 = "0.12.3"
-bitcoin = { version = "0.28", features = ["use-serde"] }
-bitcoincore-rpc-json = "0.15"
+bitcoin = { version = "0.29", features = ["serde"] }
+bitcoincore-rpc-json = "0.16"
 futures = "0.3.5"
 hex = "0.4.2"
 jsonrpc_client = { version = "0.7", features = ["reqwest"] }

src/bitcoind_rpc.rs

@@ -79,7 +79,7 @@ impl Client {
     ) -> Result<Txid> {
         let txid = self
             .with_wallet(wallet_name)?
-            .sendtoaddress(address, amount.as_btc())
+            .sendtoaddress(address, amount.to_btc())
             .await?;
         let txid = Txid::from_hex(&txid)?;
 
@@ -131,7 +131,7 @@ impl Client {
         amount: Amount,
     ) -> Result<String> {
         let mut outputs_converted = HashMap::new();
-        outputs_converted.insert(address.to_string(), amount.as_btc());
+        outputs_converted.insert(address.to_string(), amount.to_btc());
         let psbt = self
             .with_wallet(wallet_name)?
             .walletcreatefundedpsbt(inputs, outputs_converted)

src/wallet.rs

@@ -83,7 +83,7 @@ impl Wallet {
         let txid = self
             .client
             .with_wallet(&self.name)?
-            .sendtoaddress(address, amount.as_btc())
+            .sendtoaddress(address, amount.to_btc())
             .await?;
         let txid = Txid::from_hex(&txid)?;
 
@@ -241,7 +241,7 @@ mod test {
         });
         // add shared output with twice the btc to fit change addresses
         outputs.push(TxOut {
-            value: Amount::from_btc(2.0).unwrap().as_sat(),
+            value: Amount::from_btc(2.0).unwrap().to_sat(),
             script_pubkey: joined_address.clone().script_pubkey(),
         });