Merge pull request #152 from jharveyb/add_walletprocesspsbt

add walletprocesspsbt

Author: stevenroose

client/src/client.rs

@@ -964,6 +964,27 @@ pub trait RpcApi: Sized {
         )
     }
 
+    fn wallet_process_psbt(
+        &self,
+        psbt: &str,
+        sign: Option<bool>,
+        sighash_type: Option<json::SigHashType>,
+        bip32derivs: Option<bool>,
+    ) -> Result<json::WalletProcessPsbtResult> {
+        let mut args = [
+            into_json(psbt)?,
+            opt_into_json(sign)?,
+            opt_into_json(sighash_type)?,
+            opt_into_json(bip32derivs)?,
+        ];
+        let defaults = [
+            true.into(),
+            into_json(json::SigHashType::from(bitcoin::SigHashType::All))?,
+            true.into(),
+        ];
+        self.call("walletprocesspsbt", handle_defaults(&mut args, &defaults))
+    }
+
     fn get_descriptor_info(&self, desc: &str) -> Result<json::GetDescriptorInfoResult> {
         self.call("getdescriptorinfo", &[desc.to_string().into()])
     }

integration_test/src/main.rs

@@ -156,6 +156,7 @@ fn main() {
     test_fund_raw_transaction(&cl);
     test_test_mempool_accept(&cl);
     test_wallet_create_funded_psbt(&cl);
+    test_wallet_process_psbt(&cl);
     test_combine_psbt(&cl);
     test_finalize_psbt(&cl);
     test_list_received_by_address(&cl);
@@ -705,6 +706,28 @@ fn test_wallet_create_funded_psbt(cl: &Client) {
     assert!(!psbt.psbt.is_empty());
 }
 
+fn test_wallet_process_psbt(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 psbt = cl
+        .wallet_create_funded_psbt(&[input.clone()], &output, Some(500_000), None, Some(true))
+        .unwrap();
+
+    let res = cl.wallet_process_psbt(&psbt.psbt, Some(true), None, Some(true)).unwrap();
+    assert!(res.complete);
+}
+
 fn test_combine_psbt(cl: &Client) {
     let options = json::ListUnspentQueryOptions {
         minimum_amount: Some(btc(2)),

json/src/lib.rs

@@ -1019,6 +1019,13 @@ pub struct WalletCreateFundedPsbtResult {
     pub change_position: i32,
 }
 
+/// Models the result of "walletprocesspsbt"
+#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
+pub struct WalletProcessPsbtResult {
+    pub psbt: String,
+    pub complete: bool,
+}
+
 /// Models the request for "walletcreatefundedpsbt"
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize, Default)]
 pub struct WalletCreateFundedPsbtOptions {