Merge pull request rust-bitcoin#105 from tcharding/03-12-raw-transactions

Implement raw transaction methods

Author: tcharding

client/src/client_sync/mod.rs

@@ -20,6 +20,9 @@ use std::fs::File;
 use std::io::{BufRead, BufReader};
 use std::path::PathBuf;
 
+use bitcoin::Txid;
+use serde::{Deserialize, Serialize};
+
 pub use crate::client_sync::error::Error;
 
 /// Crate-specific Result type.
@@ -220,3 +223,21 @@ fn log_response(method: &str, resp: &Result<jsonrpc::Response>) {
         }
     }
 }
+
+/// Input used as parameter to `create_raw_transaction`.
+#[derive(Debug, Serialize)]
+pub struct Input {
+    /// The txid of the transaction that contains the UTXO.
+    pub txid: bitcoin::Txid,
+    /// The vout for the UTXO.
+    pub vout: u64,
+    /// Sequence number if needed.
+    pub sequence: Option<bitcoin::Sequence>,
+}
+
+/// An element in the `inputs` argument of method `walletcreatefundedpsbt`.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct WalletCreateFundedPsbtInput {
+    txid: Txid,
+    vout: u32,
+}

client/src/client_sync/v17/mod.rs

@@ -21,36 +21,8 @@ use serde::{Deserialize, Serialize};
 use crate::client_sync::into_json;
 use crate::types::v17::*;
 
-/// An element in the `inputs` argument of method `walletcreatefundedpsbt`.
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
-pub struct WalletCreateFundedPsbtInput {
-    txid: Txid,
-    vout: u32,
-}
-
-/// Argument to the `Client::get_new_address_with_type` function.
-///
-/// For Core versions 0.17 through to v22. For Core v23 and onwards use `v23::AddressType`.
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub enum AddressType {
-    Legacy,
-    P2shSegwit,
-    Bech32,
-}
-
-impl fmt::Display for AddressType {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use AddressType::*;
-
-        let s = match *self {
-            Legacy => "legacy",
-            P2shSegwit => "p2sh-segwit",
-            Bech32 => "bech32",
-        };
-        fmt::Display::fmt(s, f)
-    }
-}
+#[rustfmt::skip]                // Keep public re-exports separate.
+pub use crate::client_sync::WalletCreateFundedPsbtInput;
 
 crate::define_jsonrpc_minreq_client!("v17");
 crate::impl_client_check_expected_server_version!({ [170100] });
@@ -96,6 +68,8 @@ crate::impl_client_v17__getnetworkinfo!();
 crate::impl_client_v17__getpeerinfo!();
 
 // == Rawtransactions ==
+crate::impl_client_v17__createrawtransaction!();
+crate::impl_client_v17__fundrawtransaction!();
 crate::impl_client_v17__sendrawtransaction!();
 
 // == Wallet ==
@@ -129,3 +103,27 @@ crate::impl_client_v17__signmessage!();
 crate::impl_client_v17__signrawtransactionwithwallet!();
 crate::impl_client_v17__walletcreatefundedpsbt!();
 crate::impl_client_v17__walletprocesspsbt!();
+
+/// Argument to the `Client::get_new_address_with_type` function.
+///
+/// For Core versions 0.17 through to v22. For Core v23 and onwards use `v23::AddressType`.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum AddressType {
+    Legacy,
+    P2shSegwit,
+    Bech32,
+}
+
+impl fmt::Display for AddressType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use AddressType::*;
+
+        let s = match *self {
+            Legacy => "legacy",
+            P2shSegwit => "p2sh-segwit",
+            Bech32 => "bech32",
+        };
+        fmt::Display::fmt(s, f)
+    }
+}

client/src/client_sync/v17/raw_transactions.rs

@@ -9,6 +9,37 @@
 //!
 //! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
 
+/// Implements Bitcoin Core JSON-RPC API method `createrawtransaction`
+#[macro_export]
+macro_rules! impl_client_v17__createrawtransaction {
+    () => {
+        impl Client {
+            pub fn create_raw_transaction(
+                &self,
+                inputs: &[$crate::client_sync::Input],
+                outputs: &std::collections::BTreeMap<String, f64>, // Map of address to amount.
+            ) -> Result<CreateRawTransaction> {
+                self.call("createrawtransaction", &[into_json(inputs)?, into_json(outputs)?])
+            }
+        }
+    };
+}
+
+/// Implements Bitcoin Core JSON-RPC API method `fundrawtransaction`
+#[macro_export]
+macro_rules! impl_client_v17__fundrawtransaction {
+    () => {
+        impl Client {
+            pub fn fund_raw_transaction(
+                &self,
+                hex: &str, // Hex encoded transaction.
+            ) -> Result<FundRawTransaction> {
+                self.call("fundrawtransaction", &[into_json(hex)?])
+            }
+        }
+    };
+}
+
 /// Implements Bitcoin Core JSON-RPC API method `sendrawtransaction`
 #[macro_export]
 macro_rules! impl_client_v17__sendrawtransaction {

client/src/client_sync/v17/wallet.rs

@@ -439,7 +439,7 @@ macro_rules! impl_client_v17__walletcreatefundedpsbt {
         impl Client {
             pub fn wallet_create_funded_psbt(
                 &self,
-                inputs: Vec<WalletCreateFundedPsbtInput>,
+                inputs: Vec<$crate::client_sync::WalletCreateFundedPsbtInput>,
                 outputs: Vec<BTreeMap<Address, Amount>>,
             ) -> Result<WalletCreateFundedPsbt> {
                 self.call("walletcreatefundedpsbt", &[into_json(inputs)?, into_json(outputs)?])

client/src/client_sync/v18/mod.rs

@@ -6,6 +6,7 @@
 
 pub mod control;
 
+use std::collections::BTreeMap;
 use std::path::Path;
 
 use bitcoin::address::{Address, NetworkChecked};
@@ -15,7 +16,7 @@ use crate::client_sync::into_json;
 use crate::types::v18::*;
 
 #[rustfmt::skip]                // Keep public re-exports separate.
-pub use crate::client_sync::v17::AddressType;
+pub use crate::client_sync::{v17::AddressType, WalletCreateFundedPsbtInput};
 
 crate::define_jsonrpc_minreq_client!("v18");
 crate::impl_client_check_expected_server_version!({ [180100] });
@@ -62,6 +63,8 @@ crate::impl_client_v17__getnetworkinfo!();
 crate::impl_client_v17__getpeerinfo!();
 
 // == Rawtransactions ==
+crate::impl_client_v17__createrawtransaction!();
+crate::impl_client_v17__fundrawtransaction!();
 crate::impl_client_v17__sendrawtransaction!();
 
 // == Wallet ==
@@ -77,9 +80,21 @@ crate::impl_client_v17__getnewaddress!();
 crate::impl_client_v17__getrawchangeaddress!();
 crate::impl_client_v17__getreceivedbyaddress!();
 crate::impl_client_v17__gettransaction!();
-
-// Upto here
-
-// crate::impl_client_v17__unloadwallet!();
+crate::impl_client_v17__getunconfirmedbalance!();
+crate::impl_client_v17__getwalletinfo!();
+crate::impl_client_v17__listaddressgroupings!();
+crate::impl_client_v17__listlabels!();
+crate::impl_client_v17__listlockunspent!();
+crate::impl_client_v17__listreceivedbyaddress!();
+crate::impl_client_v17__listsinceblock!();
+crate::impl_client_v17__listtransactions!();
+crate::impl_client_v17__listunspent!();
+crate::impl_client_v17__listwallets!();
 crate::impl_client_v17__loadwallet!();
+crate::impl_client_v17__rescanblockchain!();
+crate::impl_client_v17__sendmany!();
 crate::impl_client_v17__sendtoaddress!();
+crate::impl_client_v17__signmessage!();
+crate::impl_client_v17__signrawtransactionwithwallet!();
+crate::impl_client_v17__walletcreatefundedpsbt!();
+crate::impl_client_v17__walletprocesspsbt!();

client/src/client_sync/v19/mod.rs

@@ -7,12 +7,18 @@
 pub mod blockchain;
 pub mod wallet;
 
+use std::collections::BTreeMap;
+use std::path::Path;
+
 use bitcoin::address::{Address, NetworkChecked};
-use bitcoin::{Amount, Block, BlockHash, Txid};
+use bitcoin::{Amount, Block, BlockHash, PublicKey, Txid};
 
 use crate::client_sync::into_json;
 use crate::types::v19::*;
 
+#[rustfmt::skip]                // Keep public re-exports separate.
+pub use crate::client_sync::{v17::AddressType, WalletCreateFundedPsbtInput};
+
 crate::define_jsonrpc_minreq_client!("v19");
 
 // == Blockchain ==
@@ -55,16 +61,38 @@ crate::impl_client_v17__getnetworkinfo!();
 crate::impl_client_check_expected_server_version!({ [190100] });
 
 // == Rawtransactions ==
+crate::impl_client_v17__createrawtransaction!();
+crate::impl_client_v17__fundrawtransaction!();
 crate::impl_client_v17__sendrawtransaction!();
 
 // == Wallet ==
+crate::impl_client_v17__addmultisigaddress!();
+crate::impl_client_v17__bumpfee!();
 crate::impl_client_v17__createwallet!();
-//crate::impl_client_v17__unloadwallet!();
-crate::impl_client_v17__loadwallet!();
-crate::impl_client_v17__getnewaddress!();
+crate::impl_client_v17__dumpprivkey!();
+crate::impl_client_v17__dumpwallet!();
+crate::impl_client_v17__getaddressesbylabel!();
+crate::impl_client_v17__getaddressinfo!();
 crate::impl_client_v17__getbalance!();
-crate::impl_client_v19__getbalances!();
-crate::impl_client_v17__sendtoaddress!();
+crate::impl_client_v17__getnewaddress!();
+crate::impl_client_v17__getrawchangeaddress!();
+crate::impl_client_v17__getreceivedbyaddress!();
 crate::impl_client_v17__gettransaction!();
-
-pub use crate::client_sync::v17::AddressType;
+crate::impl_client_v17__getunconfirmedbalance!();
+crate::impl_client_v17__getwalletinfo!();
+crate::impl_client_v17__listaddressgroupings!();
+crate::impl_client_v17__listlabels!();
+crate::impl_client_v17__listlockunspent!();
+crate::impl_client_v17__listreceivedbyaddress!();
+crate::impl_client_v17__listsinceblock!();
+crate::impl_client_v17__listtransactions!();
+crate::impl_client_v17__listunspent!();
+crate::impl_client_v17__listwallets!();
+crate::impl_client_v17__loadwallet!();
+crate::impl_client_v17__rescanblockchain!();
+crate::impl_client_v17__sendmany!();
+crate::impl_client_v17__sendtoaddress!();
+crate::impl_client_v17__signmessage!();
+crate::impl_client_v17__signrawtransactionwithwallet!();
+crate::impl_client_v17__walletcreatefundedpsbt!();
+crate::impl_client_v17__walletprocesspsbt!();

client/src/client_sync/v20.rs

@@ -4,14 +4,17 @@
 //!
 //! We ignore option arguments unless they effect the shape of the returned JSON data.
 
+use std::collections::BTreeMap;
+use std::path::Path;
+
 use bitcoin::address::{Address, NetworkChecked};
-use bitcoin::{Amount, Block, BlockHash, Txid};
+use bitcoin::{Amount, Block, BlockHash, PublicKey, Txid};
 
 use crate::client_sync::into_json;
 use crate::types::v20::*;
 
 #[rustfmt::skip]                // Keep public re-exports separate.
-pub use crate::client_sync::v17::AddressType;
+pub use crate::client_sync::{v17::AddressType, WalletCreateFundedPsbtInput};
 
 crate::define_jsonrpc_minreq_client!("v20");
 
@@ -55,14 +58,39 @@ crate::impl_client_v17__getnetworkinfo!();
 crate::impl_client_check_expected_server_version!({ [200200] });
 
 // == Rawtransactions ==
+crate::impl_client_v17__createrawtransaction!();
+crate::impl_client_v17__fundrawtransaction!();
 crate::impl_client_v17__sendrawtransaction!();
 
 // == Wallet ==
+crate::impl_client_v17__addmultisigaddress!();
+crate::impl_client_v17__bumpfee!();
 crate::impl_client_v17__createwallet!();
-//crate::impl_client_v17__unloadwallet!();
-crate::impl_client_v17__loadwallet!();
-crate::impl_client_v17__getnewaddress!();
+crate::impl_client_v17__dumpprivkey!();
+crate::impl_client_v17__dumpwallet!();
+crate::impl_client_v17__getaddressesbylabel!();
+crate::impl_client_v17__getaddressinfo!();
 crate::impl_client_v17__getbalance!();
 crate::impl_client_v19__getbalances!();
-crate::impl_client_v17__sendtoaddress!();
+crate::impl_client_v17__getnewaddress!();
+crate::impl_client_v17__getrawchangeaddress!();
+crate::impl_client_v17__getreceivedbyaddress!();
 crate::impl_client_v17__gettransaction!();
+crate::impl_client_v17__getunconfirmedbalance!();
+crate::impl_client_v17__getwalletinfo!();
+crate::impl_client_v17__listaddressgroupings!();
+crate::impl_client_v17__listlabels!();
+crate::impl_client_v17__listlockunspent!();
+crate::impl_client_v17__listreceivedbyaddress!();
+crate::impl_client_v17__listsinceblock!();
+crate::impl_client_v17__listtransactions!();
+crate::impl_client_v17__listunspent!();
+crate::impl_client_v17__listwallets!();
+crate::impl_client_v17__loadwallet!();
+crate::impl_client_v17__rescanblockchain!();
+crate::impl_client_v17__sendmany!();
+crate::impl_client_v17__sendtoaddress!();
+crate::impl_client_v17__signmessage!();
+crate::impl_client_v17__signrawtransactionwithwallet!();
+crate::impl_client_v17__walletcreatefundedpsbt!();
+crate::impl_client_v17__walletprocesspsbt!();

client/src/client_sync/v21.rs

@@ -4,14 +4,17 @@
 //!
 //! We ignore option arguments unless they effect the shape of the returned JSON data.
 
+use std::collections::BTreeMap;
+use std::path::Path;
+
 use bitcoin::address::{Address, NetworkChecked};
-use bitcoin::{Amount, Block, BlockHash, Txid};
+use bitcoin::{Amount, Block, BlockHash, PublicKey, Txid};
 
 use crate::client_sync::into_json;
 use crate::types::v21::*;
 
 #[rustfmt::skip]                // Keep public re-exports separate.
-pub use crate::client_sync::v17::AddressType;
+pub use crate::client_sync::{v17::AddressType, WalletCreateFundedPsbtInput};
 
 crate::define_jsonrpc_minreq_client!("v21");
 
@@ -55,13 +58,39 @@ crate::impl_client_v17__getnetworkinfo!();
 crate::impl_client_check_expected_server_version!({ [210200] });
 
 // == Rawtransactions ==
+crate::impl_client_v17__createrawtransaction!();
+crate::impl_client_v17__fundrawtransaction!();
 crate::impl_client_v17__sendrawtransaction!();
 
 // == Wallet ==
+crate::impl_client_v17__addmultisigaddress!();
+crate::impl_client_v17__bumpfee!();
 crate::impl_client_v17__createwallet!();
-crate::impl_client_v17__loadwallet!();
-crate::impl_client_v17__getnewaddress!();
+crate::impl_client_v17__dumpprivkey!();
+crate::impl_client_v17__dumpwallet!();
+crate::impl_client_v17__getaddressesbylabel!();
+crate::impl_client_v17__getaddressinfo!();
 crate::impl_client_v17__getbalance!();
 crate::impl_client_v19__getbalances!();
-crate::impl_client_v17__sendtoaddress!();
+crate::impl_client_v17__getnewaddress!();
+crate::impl_client_v17__getrawchangeaddress!();
+crate::impl_client_v17__getreceivedbyaddress!();
 crate::impl_client_v17__gettransaction!();
+crate::impl_client_v17__getunconfirmedbalance!();
+crate::impl_client_v17__getwalletinfo!();
+crate::impl_client_v17__listaddressgroupings!();
+crate::impl_client_v17__listlabels!();
+crate::impl_client_v17__listlockunspent!();
+crate::impl_client_v17__listreceivedbyaddress!();
+crate::impl_client_v17__listsinceblock!();
+crate::impl_client_v17__listtransactions!();
+crate::impl_client_v17__listunspent!();
+crate::impl_client_v17__listwallets!();
+crate::impl_client_v17__loadwallet!();
+crate::impl_client_v17__rescanblockchain!();
+crate::impl_client_v17__sendmany!();
+crate::impl_client_v17__sendtoaddress!();
+crate::impl_client_v17__signmessage!();
+crate::impl_client_v17__signrawtransactionwithwallet!();
+crate::impl_client_v17__walletcreatefundedpsbt!();
+crate::impl_client_v17__walletprocesspsbt!();