Test walletprocesspsbt

jamillambert · jamillambert · commit e0d928c1632e · 2025-08-21T22:55:46.000+01:00
The RPC was implemented for v17 but has a return change in v26 and is 
untested.

Update the struct in v26.

Add a test and update the types table.
diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs
@@ -765,7 +765,11 @@ macro_rules! impl_client_v17__wallet_process_psbt {
     () => {
         impl Client {
             pub fn wallet_process_psbt(&self, psbt: &bitcoin::Psbt) -> Result<WalletProcessPsbt> {
-                self.call("walletprocesspsbt", &[into_json(psbt)?])
+                // Core expects the PSBT as a base64 string argument (same representation
+                // used by `finalizepsbt`). Serializing the struct with `into_json` produced
+                // an object which Core rejected ("Expected type string, got object").
+                let psbt = format!("{}", psbt);
+                self.call("walletprocesspsbt", &[psbt.into()])
             }
         }
     };
diff --git a/integration_test/tests/wallet.rs b/integration_test/tests/wallet.rs
@@ -1009,6 +1009,29 @@ fn wallet__wallet_create_funded_psbt__modelled() {
     assert!(!psbt.psbt.inputs.is_empty());
 }
 
+#[test]
+fn wallet__wallet_process_psbt__modelled() {
+    let node = Node::with_wallet(Wallet::Default, &[]);
+    node.fund_wallet();
+
+    let addr = node.client.new_address().expect("newaddress");
+    let outputs = BTreeMap::from([(addr, Amount::from_sat(50_000))]);
+    let funded_psbt: WalletCreateFundedPsbt = node
+        .client
+        .wallet_create_funded_psbt(vec![], vec![outputs])
+        .expect("walletcreatefundedpsbt");
+    let funded_psbt_model: mtype::WalletCreateFundedPsbt = funded_psbt.into_model().unwrap();
+
+    let json: WalletProcessPsbt = node
+        .client
+        .wallet_process_psbt(&funded_psbt_model.psbt)
+        .expect("walletprocesspsbt");
+    let model: Result<mtype::WalletProcessPsbt, _> = json.into_model();
+    let processed = model.unwrap();
+
+    assert_eq!(processed.psbt.inputs.len(), funded_psbt_model.psbt.inputs.len());
+}
+
 #[test]
 fn wallet__wallet_lock() {
     let node = Node::with_wallet(Wallet::Default, &[]);
diff --git a/types/src/model/wallet.rs b/types/src/model/wallet.rs
@@ -867,4 +867,6 @@ pub struct WalletProcessPsbt {
     pub psbt: Psbt,
     /// If the transaction has a complete set of signatures.
     pub complete: bool,
+    /// The hex-encoded network transaction if complete.
+    pub hex: Option<Transaction>,
 }
diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs
@@ -207,7 +207,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
diff --git a/types/src/v17/wallet/into.rs b/types/src/v17/wallet/into.rs
@@ -763,6 +763,10 @@ impl WalletProcessPsbt {
     /// Converts version specific type to a version nonspecific, more strongly typed type.
     pub fn into_model(self) -> Result<model::WalletProcessPsbt, PsbtParseError> {
         let psbt = self.psbt.parse::<Psbt>()?;
-        Ok(model::WalletProcessPsbt { psbt, complete: self.complete })
+        Ok(model::WalletProcessPsbt {
+            psbt,
+            complete: self.complete,
+            hex: None, // v26 and later only.
+        })
     }
 }
diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs
@@ -209,7 +209,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs
@@ -211,7 +211,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs
@@ -212,7 +212,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs
@@ -218,7 +218,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs
@@ -229,7 +229,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs
@@ -222,7 +222,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs
@@ -226,7 +226,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs
@@ -227,7 +227,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs
@@ -235,7 +235,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
@@ -272,6 +272,7 @@ pub use self::{
     wallet::{
         CreateWallet, GetBalances, GetBalancesError, GetTransaction, GetTransactionError,
         LastProcessedBlock, LastProcessedBlockError, LoadWallet, UnloadWallet,
+        WalletProcessPsbt,
     },
 };
 #[doc(inline)]
@@ -303,7 +304,7 @@ pub use crate::{
         SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey,
         SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory,
         UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage,
-        VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt,
+        VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError,
         WitnessUtxo,
     },
     v18::{
diff --git a/types/src/v26/wallet/error.rs b/types/src/v26/wallet/error.rs
@@ -4,7 +4,7 @@ use core::fmt;
 
 use bitcoin::amount::ParseAmountError;
 use bitcoin::consensus::encode;
-use bitcoin::hex;
+use bitcoin::{hex, psbt};
 
 use super::GetTransactionDetailError;
 use crate::error::write_err;
@@ -167,3 +167,31 @@ impl std::error::Error for LastProcessedBlockError {
 impl From<NumericError> for LastProcessedBlockError {
     fn from(e: NumericError) -> Self { Self::Height(e) }
 }
+
+/// Error when converting a `WalletProcessPsbt` type into the model type.
+#[derive(Debug)]
+pub enum WalletProcessPsbtError {
+    /// Conversion of the `psbt` field failed.
+    Psbt(psbt::PsbtParseError),
+    /// Conversion of the `hex` field failed.
+    Hex(encode::FromHexError),
+}
+
+impl fmt::Display for WalletProcessPsbtError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            WalletProcessPsbtError::Psbt(e) => write!(f, "psbt parse error: {}", e),
+            WalletProcessPsbtError::Hex(e) => write!(f, "hex decode error: {}", e),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for WalletProcessPsbtError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match self {
+            WalletProcessPsbtError::Psbt(e) => Some(e),
+            WalletProcessPsbtError::Hex(e) => Some(e),
+        }
+    }
+}
diff --git a/types/src/v26/wallet/into.rs b/types/src/v26/wallet/into.rs
@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: CC0-1.0
 
 use bitcoin::consensus::encode;
-use bitcoin::{BlockHash, SignedAmount, Transaction, Txid};
+use bitcoin::{BlockHash, Psbt, SignedAmount, Transaction, Txid};
 
 use super::{
     CreateWallet, GetBalances, GetBalancesError, GetTransaction, GetTransactionError,
     LastProcessedBlock, LastProcessedBlockError, LoadWallet, UnloadWallet,
+    WalletProcessPsbt, WalletProcessPsbtError,
 };
 use crate::model;
 
@@ -133,3 +134,19 @@ impl UnloadWallet {
         model::UnloadWallet { warnings: self.warnings.unwrap_or_default() }
     }
 }
+
+impl WalletProcessPsbt {
+    /// Converts version specific type to a version nonspecific, more strongly typed type.
+    pub fn into_model(self) -> Result<model::WalletProcessPsbt, WalletProcessPsbtError> {
+        use WalletProcessPsbtError as E;
+
+        let psbt = self.psbt.parse::<Psbt>().map_err(E::Psbt)?;
+        let hex =
+            self.hex.as_ref().map(|h| encode::deserialize_hex(h)).transpose().map_err(E::Hex)?;
+        Ok(model::WalletProcessPsbt {
+            psbt,
+            complete: self.complete,
+            hex,
+        })
+    }
+}
diff --git a/types/src/v26/wallet/mod.rs b/types/src/v26/wallet/mod.rs
@@ -10,7 +10,7 @@ mod into;
 use bitcoin::Transaction;
 use serde::{Deserialize, Serialize};
 
-pub use self::error::{GetBalancesError, GetTransactionError, LastProcessedBlockError};
+pub use self::error::{GetBalancesError, GetTransactionError, LastProcessedBlockError, WalletProcessPsbtError};
 pub use super::{
     Bip125Replaceable, GetBalancesMine, GetBalancesWatchOnly, GetTransactionDetail,
     GetTransactionDetailError,
@@ -179,3 +179,24 @@ pub struct UnloadWallet {
     /// Warning messages, if any, related to loading the wallet.
     pub warnings: Option<Vec<String>>,
 }
+
+/// Result of the JSON-RPC method `walletprocesspsbt`.
+///
+/// > walletprocesspsbt "psbt" ( sign "sighashtype" bip32derivs )
+/// >
+/// > Update a PSBT with input information from our wallet and then sign inputs
+/// > that we can sign for.
+/// >
+/// >
+/// > Arguments:
+/// > 1. "psbt"                      (string, required) The transaction base64 string
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct WalletProcessPsbt {
+    /// The base64-encoded partially signed transaction.
+    pub psbt: String,
+    /// If the transaction has a complete set of signatures.
+    pub complete: bool,
+    /// The hex-encoded network transaction if complete.
+    pub hex: Option<String>,
+}
diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs
@@ -235,7 +235,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
@@ -281,7 +281,7 @@ pub use crate::{
         SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey,
         SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory,
         UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage,
-        VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt,
+        VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError,
         WitnessUtxo,
     },
     v18::{
@@ -332,5 +332,6 @@ pub use crate::{
         LastProcessedBlockError, LoadTxOutSet, LoadTxOutSetError, LoadWallet, Logging, PeerInfo,
         SubmitPackage, SubmitPackageError, SubmitPackageTxResult, SubmitPackageTxResultError,
         SubmitPackageTxResultFees, SubmitPackageTxResultFeesError, UnloadWallet,
+        WalletProcessPsbt,
     },
 };
diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs
@@ -237,7 +237,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
@@ -301,7 +301,7 @@ pub use crate::{
         SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey,
         SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory,
         UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage,
-        VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt,
+        VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError,
         WitnessUtxo,
     },
     v18::{
@@ -350,6 +350,7 @@ pub use crate::{
         GetBalancesError, GetChainStates, GetChainStatesError, GetPeerInfo, GetTransactionError,
         GetTxOutSetInfo, GetTxOutSetInfoError, LastProcessedBlock, LastProcessedBlockError,
         LoadTxOutSet, LoadTxOutSetError, LoadWallet, PeerInfo, UnloadWallet,
+        WalletProcessPsbt,
     },
     v27::{GetPrioritisedTransactions, PrioritisedTransaction},
 };
diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs
@@ -238,7 +238,7 @@
 //! | walletlock                         | returns nothing |                                        |
 //! | walletpassphrase                   | returns nothing |                                        |
 //! | walletpassphrasechange             | returns nothing |                                        |
-//! | walletprocesspsbt                  | version + model | UNTESTED                               |
+//! | walletprocesspsbt                  | version + model |                                        |
 //!
 //! </details>
 //!
@@ -298,7 +298,7 @@ pub use crate::{
         SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey,
         SignRawTransaction, SignRawTransactionError, TransactionCategory, UploadTarget,
         ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof,
-        WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
+        WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo,
     },
     v18::{
         ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,
@@ -345,7 +345,7 @@ pub use crate::{
         DumpTxOutSet, DumpTxOutSetError, GetAddrManInfo, GetBalances, GetBalancesError,
         GetPeerInfo, GetTransactionError, GetTxOutSetInfo, GetTxOutSetInfoError,
         LastProcessedBlock, LastProcessedBlockError, LoadTxOutSet, LoadTxOutSetError, LoadWallet,
-        PeerInfo, UnloadWallet,
+        PeerInfo, UnloadWallet, WalletProcessPsbt,
     },
     v27::{GetPrioritisedTransactions, PrioritisedTransaction},
     v28::{

Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,11 @@ macro_rules! impl_client_v17__wallet_process_psbt {`
`765`	`765`	`() => {`
`766`	`766`	`impl Client {`
`767`	`767`	`pub fn wallet_process_psbt(&self, psbt: &bitcoin::Psbt) -> Result<WalletProcessPsbt> {`
`768`		`- self.call("walletprocesspsbt", &[into_json(psbt)?])`
	`768`	`+ // Core expects the PSBT as a base64 string argument (same representation`
	`769`	+ // used by `finalizepsbt`). Serializing the struct with `into_json` produced
	`770`	`+ // an object which Core rejected ("Expected type string, got object").`
	`771`	`+ let psbt = format!("{}", psbt);`
	`772`	`+ self.call("walletprocesspsbt", &[psbt.into()])`
`769`	`773`	`}`
`770`	`774`	`}`
`771`	`775`	`};`
Original file line number	Diff line number	Diff line change
`@@ -867,4 +867,6 @@ pub struct WalletProcessPsbt {`
`867`	`867`	`pub psbt: Psbt,`
`868`	`868`	`/// If the transaction has a complete set of signatures.`
`869`	`869`	`pub complete: bool,`
	`870`	`+ /// The hex-encoded network transaction if complete.`
	`871`	`+ pub hex: Option<Transaction>,`
`870`	`872`	`}`
Original file line number	Diff line number	Diff line change
`@@ -763,6 +763,10 @@ impl WalletProcessPsbt {`
`763`	`763`	`/// Converts version specific type to a version nonspecific, more strongly typed type.`
`764`	`764`	`pub fn into_model(self) -> Result<model::WalletProcessPsbt, PsbtParseError> {`
`765`	`765`	`let psbt = self.psbt.parse::<Psbt>()?;`
`766`		`- Ok(model::WalletProcessPsbt { psbt, complete: self.complete })`
	`766`	`+ Ok(model::WalletProcessPsbt {`
	`767`	`+ psbt,`
	`768`	`+ complete: self.complete,`
	`769`	`+ hex: None, // v26 and later only.`
	`770`	`+ })`
`767`	`771`	`}`
`768`	`772`	`}`