Merge #270: add combine raw transaction

7a8bec6 add combine raw transaction (thesimplekid)

Pull request description:

ACKs for top commit:
  apoelstra:
    ACK 7a8bec6

Tree-SHA512: 222b93c4df45f9b99aef89446a6400f601f8409f3b391a3f6ce87bbe713c204f34f7017e746c3631187b75c398ce1eaa9f46b433b2fd11700fd36ef37e9563af

Author: apoelstra

client/src/client.rs

@@ -1139,6 +1139,10 @@ pub trait RpcApi: Sized {
         self.call("combinepsbt", &[into_json(psbts)?])
     }
 
+    fn combine_raw_transaction(&self, hex_strings: &[String]) -> Result<String> {
+        self.call("combinerawtransaction", &[into_json(hex_strings)?])
+    }
+
     fn finalize_psbt(&self, psbt: &str, extract: Option<bool>) -> Result<json::FinalizePsbtResult> {
         let mut args = [into_json(psbt)?, opt_into_json(extract)?];
         self.call("finalizepsbt", handle_defaults(&mut args, &[true.into()]))

integration_test/src/main.rs

@@ -175,6 +175,7 @@ fn main() {
     test_wallet_process_psbt(&cl);
     test_join_psbt(&cl);
     test_combine_psbt(&cl);
+    test_combine_raw_transaction(&cl);
     test_create_psbt(&cl);
     test_finalize_psbt(&cl);
     test_list_received_by_address(&cl);
@@ -849,6 +850,27 @@ fn test_combine_psbt(cl: &Client) {
     assert!(!psbt.is_empty());
 }
 
+fn test_combine_raw_transaction(cl: &Client) {
+    let options = json::ListUnspentQueryOptions {
+        minimum_amount: Some(btc(2)),
+        ..Default::default()
+    };
+    let unspent = cl.list_unspent(Some(6), None, None, None, Some(options)).unwrap();
+    let unspent = unspent.into_iter().nth(0).unwrap();
+    let input = json::CreateRawTransactionInput {
+        txid: unspent.txid,
+        vout: unspent.vout,
+        sequence: None,
+    };
+    let mut output = HashMap::new();
+    output.insert(RANDOM_ADDRESS.to_string(), btc(1));
+    let tx = cl.create_raw_transaction_hex(&[input.clone()], &output, Some(500_000), None).unwrap();
+
+    let transaction = cl.combine_raw_transaction(&[tx.clone(), tx]).unwrap();
+
+    assert!(!transaction.is_empty());
+}
+
 fn test_create_psbt(cl: &Client) {
     let options = json::ListUnspentQueryOptions {
         minimum_amount: Some(btc(2)),