From e0f1311ee5ac415fc1a6a9011f2907ee40953460 Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Fri, 12 Sep 2025 11:40:02 +0100 Subject: [PATCH 1/3] Type alias SignRawTransaction Both `signrawtransactionwithkey` and `signrawtransactionwithwallet` use the type `SignRawTransaction` in types and model. Add aliases for these two RPC methods and a note in the docs explaining why. --- types/src/model/mod.rs | 4 ++-- types/src/model/raw_transactions.rs | 6 ++++++ types/src/model/wallet.rs | 8 ++++++++ types/src/v17/mod.rs | 3 ++- types/src/v17/raw_transactions/mod.rs | 20 +++++++++++++++++++- types/src/v17/wallet/mod.rs | 16 ++++++++++++++++ types/src/v18/mod.rs | 1 + types/src/v19/mod.rs | 1 + types/src/v20/mod.rs | 2 +- types/src/v21/mod.rs | 1 + types/src/v22/mod.rs | 2 +- types/src/v23/mod.rs | 2 +- types/src/v24/mod.rs | 2 +- types/src/v25/mod.rs | 2 +- types/src/v26/mod.rs | 2 +- types/src/v27/mod.rs | 2 +- types/src/v28/mod.rs | 2 +- types/src/v29/mod.rs | 1 + 18 files changed, 65 insertions(+), 12 deletions(-) diff --git a/types/src/model/mod.rs b/types/src/model/mod.rs index 5f67f899..2a5b552a 100644 --- a/types/src/model/mod.rs +++ b/types/src/model/mod.rs @@ -44,7 +44,7 @@ pub use self::{ DecodeScript, DescriptorProcessPsbt, FinalizePsbt, FundRawTransaction, GetRawTransaction, GetRawTransactionVerbose, JoinPsbts, MempoolAcceptance, MempoolAcceptanceFees, SendRawTransaction, SignFail, SignRawTransaction, SubmitPackage, SubmitPackageTxResult, - SubmitPackageTxResultFees, TestMempoolAccept, UtxoUpdatePsbt, + SubmitPackageTxResultFees, TestMempoolAccept, UtxoUpdatePsbt, SignRawTransactionWithKey, }, util::{ CreateMultisig, DeriveAddresses, DeriveAddressesMultipath, EstimateSmartFee, @@ -62,6 +62,6 @@ pub use self::{ ListUnspent, ListUnspentItem, ListWallets, LoadWallet, PsbtBumpFee, RescanBlockchain, ScriptType, Send, SendAll, SendMany, SendManyVerbose, SendToAddress, SignMessage, SimulateRawTransaction, TransactionCategory, TransactionItem, UnloadWallet, - WalletCreateFundedPsbt, WalletDisplayAddress, WalletProcessPsbt, + WalletCreateFundedPsbt, WalletDisplayAddress, WalletProcessPsbt, SignRawTransactionWithWallet, }, }; diff --git a/types/src/model/raw_transactions.rs b/types/src/model/raw_transactions.rs index a21c4a0e..b322880b 100644 --- a/types/src/model/raw_transactions.rs +++ b/types/src/model/raw_transactions.rs @@ -202,6 +202,12 @@ pub struct SignRawTransaction { pub errors: Vec, } +/// Models the result of JSON-RPC method `signrawtransactionwithkey`. +/// +/// **Note:** This is a type alias of [`SignRawTransaction`] because the RPC response +/// shape is identical, and our policy is to have a return type for every RPC method. +pub type SignRawTransactionWithKey = SignRawTransaction; + /// A script verification error. Part of `signrawtransaction`. #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] #[serde(deny_unknown_fields)] diff --git a/types/src/model/wallet.rs b/types/src/model/wallet.rs index f30c8e8a..ae2a3fb2 100644 --- a/types/src/model/wallet.rs +++ b/types/src/model/wallet.rs @@ -16,6 +16,8 @@ use bitcoin::{ }; use serde::{Deserialize, Serialize}; +use super::SignRawTransaction; + /// The purpose of an address. Part of `getaddressesbylabel`. #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub enum AddressPurpose { @@ -828,6 +830,12 @@ pub struct SendToAddress { #[derive(Clone, Debug, PartialEq, Eq)] pub struct SignMessage(pub sign_message::MessageSignature); +/// Models the result of JSON-RPC method `signrawtransactionwithwallet`. +/// +/// **Note:** This is a type alias of [`SignRawTransaction`] because the RPC response +/// shape is identical, and our policy is to have a return type for every RPC method. +pub type SignRawTransactionWithWallet = SignRawTransaction; + /// Models the result of JSON-RPC method `simulaterawtransaction`. #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] #[serde(deny_unknown_fields)] diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs index 9caf7a40..d65009a1 100644 --- a/types/src/v17/mod.rs +++ b/types/src/v17/mod.rs @@ -264,7 +264,7 @@ pub use self::{ GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, MempoolAcceptance, PsbtInput, PsbtInputError, PsbtOutput, PsbtOutputError, SendRawTransaction, SignFail, SignFailError, SignRawTransaction, SignRawTransactionError, - TestMempoolAccept, + TestMempoolAccept, SignRawTransactionWithKey, }, util::{ CreateMultisig, CreateMultisigError, EstimateSmartFee, SignMessageWithPrivKey, @@ -285,6 +285,7 @@ pub use self::{ LoadWallet, LockUnspent, RescanBlockchain, ScriptType, SendMany, SendToAddress, SetTxFee, SignMessage, TransactionCategory, TransactionItem, TransactionItemError, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, + SignRawTransactionWithWallet, }, zmq::GetZmqNotifications, }; diff --git a/types/src/v17/raw_transactions/mod.rs b/types/src/v17/raw_transactions/mod.rs index 59818c86..4a7dfe97 100644 --- a/types/src/v17/raw_transactions/mod.rs +++ b/types/src/v17/raw_transactions/mod.rs @@ -396,7 +396,7 @@ pub struct SendRawTransaction( pub String, ); -/// Result of JSON-RPC method `signrawtransactionwithkey` (and deprecated `signrawtransaction`). +/// Result of JSON-RPC method `signrawtransaction`. /// /// > signrawtransaction "hexstring" ( [{"txid":"id","vout":n,"scriptPubKey":"hex","redeemScript":"hex"},...] ["privatekey1",...] sighashtype ) /// > @@ -420,6 +420,24 @@ pub struct SignRawTransaction { pub errors: Option>, } +/// Result of JSON-RPC method `signrawtransactionwithkey`. +/// +/// > signrawtransactionwithkey "hexstring" ["privatekey1",...] ( [{"txid":"id","vout":n,"scriptPubKey":"hex","redeemScript":"hex"},...] sighashtype ) +/// > +/// > Sign inputs for raw transaction (serialized, hex-encoded). +/// > The second argument is an array of base58-encoded private +/// > keys that will be the only keys used to sign the transaction. +/// > The third optional argument (may be null) is an array of previous transaction outputs that +/// > this transaction depends on but may not yet be in the block chain. +/// > +/// > Arguments: +/// > 1. "hexstring" (string, required) The transaction hex string +/// > 2. "privkeys" (string, required) A json array of base58-encoded private keys for signing +/// +/// **Note:** This is a type alias of [`SignRawTransaction`] because the RPC response +/// shape is identical, and our policy is to have a return type for every RPC method. +pub type SignRawTransactionWithKey = SignRawTransaction; + /// A script verification error. Part of `signrawtransaction`. #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] #[serde(deny_unknown_fields)] diff --git a/types/src/v17/wallet/mod.rs b/types/src/v17/wallet/mod.rs index 6016df86..130ef1a5 100644 --- a/types/src/v17/wallet/mod.rs +++ b/types/src/v17/wallet/mod.rs @@ -16,6 +16,7 @@ use serde::{Deserialize, Serialize}; // TODO: Remove wildcard, use explicit types. pub use self::error::*; +use super::SignRawTransaction; /// Result of JSON-RPC method `abortrescan`. /// @@ -961,6 +962,21 @@ pub struct SignMessage( pub String, ); +/// Result of JSON-RPC method `signrawtransactionwithwallet`. +/// +/// > signrawtransactionwithwallet "hexstring" ( [{"txid":"id","vout":n,"scriptPubKey":"hex","redeemScript":"hex"},...] sighashtype ) +/// > +/// > Sign inputs for raw transaction (serialized, hex-encoded). +/// > The second optional argument (may be null) is an array of previous transaction outputs that +/// > this transaction depends on but may not yet be in the block chain. +/// > +/// > Arguments: +/// > 1. "hexstring" (string, required) The transaction hex string +/// +/// **Note:** This is a type alias of [`SignRawTransaction`] because the RPC response +/// shape is identical, and our policy is to have a return type for every RPC method. +pub type SignRawTransactionWithWallet = SignRawTransaction; + /// Result of the JSON-RPC method `walletcreatefundedpsbt`. /// /// > walletcreatefundedpsbt [{"txid":"id","vout":n},...] [{"address":amount},{"data":"hex"},...] ( locktime ) ( replaceable ) ( options bip32derivs ) diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index f25896f7..649e3b97 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -285,4 +285,5 @@ pub use crate::v17::{ TransactionItem, TransactionItemError, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, + SignRawTransactionWithKey, SignRawTransactionWithWallet, }; diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs index 248b9665..c9196718 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -279,6 +279,7 @@ pub use crate::v17::{ TestMempoolAccept, TransactionCategory, TransactionItem, TransactionItemError, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, + SignRawTransactionWithKey, SignRawTransactionWithWallet, }; #[doc(inline)] pub use crate::v18::{ diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index 83a3493f..7041d8bb 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -273,7 +273,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, + WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index e5b072ba..f2e567d9 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -289,6 +289,7 @@ pub use crate::{ SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, + SignRawTransactionWithKey, SignRawTransactionWithWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index fa688af6..a8ef37a4 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -290,7 +290,7 @@ pub use crate::{ SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + WalletProcessPsbt, WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index c24c9792..5f2730cf 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -292,7 +292,7 @@ pub use crate::{ SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + WalletProcessPsbt, WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index 4f624515..ece6f927 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -291,7 +291,7 @@ pub use crate::{ SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + WalletProcessPsbt, WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index 8bdca58b..7eefee2a 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -286,7 +286,7 @@ pub use crate::{ SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + WalletProcessPsbt, WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index bd55a6e2..72a365f5 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -303,7 +303,7 @@ pub use crate::{ SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WitnessUtxo, + WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index 6e51d3d4..5f718ab4 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -279,7 +279,7 @@ pub use crate::{ SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WitnessUtxo, + WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index 165514db..d6278d0b 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -300,7 +300,7 @@ pub use crate::{ SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WitnessUtxo, + WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index ed3cd234..da3bdcf0 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -293,6 +293,7 @@ pub use crate::{ SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo, + SignRawTransactionWithKey, SignRawTransactionWithWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, From c84e07d322cb39b56dbc9aa13d9f77ef8c2c814d Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Fri, 12 Sep 2025 11:40:30 +0100 Subject: [PATCH 2/3] Use the type alias of SignRawTransaction Both `signrawtransactionwithkey` and `signrawtransactionwithwallet` use the type `SignRawTransaction` in types and model. These now have their own type aliases. Use the aliases in client and integration_test. --- .../src/client_sync/v17/raw_transactions.rs | 2 +- client/src/client_sync/v17/wallet.rs | 2 +- integration_test/tests/raw_transactions.rs | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/client/src/client_sync/v17/raw_transactions.rs b/client/src/client_sync/v17/raw_transactions.rs index 4475ef18..c108e055 100644 --- a/client/src/client_sync/v17/raw_transactions.rs +++ b/client/src/client_sync/v17/raw_transactions.rs @@ -213,7 +213,7 @@ macro_rules! impl_client_v17__sign_raw_transaction_with_key { &self, tx: &bitcoin::Transaction, keys: &[bitcoin::PrivateKey], - ) -> Result { + ) -> Result { let hex = bitcoin::consensus::encode::serialize_hex(tx); let keys = keys.iter().map(|k| format!("{}", k)).collect::>(); self.call("signrawtransactionwithkey", &[hex.into(), into_json(keys)?]) diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs index 75f39712..2ca38780 100644 --- a/client/src/client_sync/v17/wallet.rs +++ b/client/src/client_sync/v17/wallet.rs @@ -660,7 +660,7 @@ macro_rules! impl_client_v17__sign_raw_transaction_with_wallet { pub fn sign_raw_transaction_with_wallet( &self, tx: &bitcoin::Transaction, - ) -> Result { + ) -> Result { let hex = bitcoin::consensus::encode::serialize_hex(tx); self.call("signrawtransactionwithwallet", &[into_json(hex)?]) } diff --git a/integration_test/tests/raw_transactions.rs b/integration_test/tests/raw_transactions.rs index 66e8094d..4199c483 100644 --- a/integration_test/tests/raw_transactions.rs +++ b/integration_test/tests/raw_transactions.rs @@ -399,9 +399,9 @@ fn raw_transactions__test_mempool_accept__modelled() { let tx = create_a_raw_transaction(&node); // Sign (but don't broadcast). - let signed: SignRawTransaction = + let signed: SignRawTransactionWithWallet = node.client.sign_raw_transaction_with_wallet(&tx).expect("signrawtransactionwithwallet"); - let signed_model: mtype::SignRawTransaction = + let signed_model: mtype::SignRawTransactionWithWallet = signed.into_model().expect("SignRawTransaction into model"); let signed_tx = signed_model.tx; @@ -474,10 +474,11 @@ fn create_sign_send(node: &Node) { // wallet.rs expects this call to exist, if you change it then you'll need to update the test // `wallet__sign_raw_transaction_with_wallet__modelled`. - let json: SignRawTransaction = + let json: SignRawTransactionWithWallet = node.client.sign_raw_transaction_with_wallet(&tx).expect("signrawtransactionwithwallet"); - let model: Result = json.into_model(); + let model: Result = + json.into_model(); let sign_raw_transaction = model.unwrap(); // The proves we did everything correctly. @@ -533,9 +534,10 @@ fn create_sign_with_key_send(node: &Node) { let model: mtype::DumpPrivKey = json.into_model().expect("DumpPrivKey"); let key = model.0; - let json: SignRawTransaction = + let json: SignRawTransactionWithKey = node.client.sign_raw_transaction_with_key(&tx, &[key]).expect("signrawtransactionwithkey"); - let model: Result = json.into_model(); + let model: Result = + json.into_model(); let sign_raw_transaction = model.unwrap(); // The proves we did everything correctly. @@ -580,12 +582,13 @@ fn create_fund_sign_send(node: &Node) { let funded = json.transaction().unwrap(); // This method is from the wallet section. - let json: SignRawTransaction = node + let json: SignRawTransactionWithWallet = node .client .sign_raw_transaction_with_wallet(&funded) .expect("signrawtransactionwithwallet"); // This proves we did everything correctly. - let model: Result = json.into_model(); + let model: Result = + json.into_model(); let sign_raw_transaction = model.unwrap(); let _ = node.client.send_raw_transaction(&sign_raw_transaction.tx).expect("createrawtransaction"); From 5b3fbcd455ed31c656c6241132161a919cfec113 Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Fri, 12 Sep 2025 11:54:17 +0100 Subject: [PATCH 3/3] Run the formatter --- types/src/model/mod.rs | 8 ++++---- types/src/v17/mod.rs | 8 ++++---- types/src/v18/mod.rs | 10 +++++----- types/src/v19/mod.rs | 10 +++++----- types/src/v20/mod.rs | 8 ++++---- types/src/v21/mod.rs | 8 ++++---- types/src/v22/mod.rs | 5 +++-- types/src/v23/mod.rs | 5 +++-- types/src/v24/mod.rs | 5 +++-- types/src/v25/mod.rs | 5 +++-- types/src/v26/mod.rs | 5 +++-- types/src/v27/mod.rs | 5 +++-- types/src/v28/mod.rs | 5 +++-- types/src/v29/mod.rs | 8 ++++---- 14 files changed, 51 insertions(+), 44 deletions(-) diff --git a/types/src/model/mod.rs b/types/src/model/mod.rs index 2a5b552a..648ce2e7 100644 --- a/types/src/model/mod.rs +++ b/types/src/model/mod.rs @@ -43,8 +43,8 @@ pub use self::{ ConvertToPsbt, CreatePsbt, CreateRawTransaction, DecodePsbt, DecodeRawTransaction, DecodeScript, DescriptorProcessPsbt, FinalizePsbt, FundRawTransaction, GetRawTransaction, GetRawTransactionVerbose, JoinPsbts, MempoolAcceptance, MempoolAcceptanceFees, - SendRawTransaction, SignFail, SignRawTransaction, SubmitPackage, SubmitPackageTxResult, - SubmitPackageTxResultFees, TestMempoolAccept, UtxoUpdatePsbt, SignRawTransactionWithKey, + SendRawTransaction, SignFail, SignRawTransaction, SignRawTransactionWithKey, SubmitPackage, + SubmitPackageTxResult, SubmitPackageTxResultFees, TestMempoolAccept, UtxoUpdatePsbt, }, util::{ CreateMultisig, DeriveAddresses, DeriveAddressesMultipath, EstimateSmartFee, @@ -61,7 +61,7 @@ pub use self::{ ListReceivedByLabel, ListReceivedByLabelItem, ListSinceBlock, ListTransactions, ListUnspent, ListUnspentItem, ListWallets, LoadWallet, PsbtBumpFee, RescanBlockchain, ScriptType, Send, SendAll, SendMany, SendManyVerbose, SendToAddress, SignMessage, - SimulateRawTransaction, TransactionCategory, TransactionItem, UnloadWallet, - WalletCreateFundedPsbt, WalletDisplayAddress, WalletProcessPsbt, SignRawTransactionWithWallet, + SignRawTransactionWithWallet, SimulateRawTransaction, TransactionCategory, TransactionItem, + UnloadWallet, WalletCreateFundedPsbt, WalletDisplayAddress, WalletProcessPsbt, }, }; diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs index d65009a1..44125f64 100644 --- a/types/src/v17/mod.rs +++ b/types/src/v17/mod.rs @@ -264,7 +264,7 @@ pub use self::{ GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, MempoolAcceptance, PsbtInput, PsbtInputError, PsbtOutput, PsbtOutputError, SendRawTransaction, SignFail, SignFailError, SignRawTransaction, SignRawTransactionError, - TestMempoolAccept, SignRawTransactionWithKey, + SignRawTransactionWithKey, TestMempoolAccept, }, util::{ CreateMultisig, CreateMultisigError, EstimateSmartFee, SignMessageWithPrivKey, @@ -283,9 +283,9 @@ pub use self::{ ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListTransactions, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, RescanBlockchain, ScriptType, SendMany, SendToAddress, SetTxFee, - SignMessage, TransactionCategory, TransactionItem, TransactionItemError, - WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - SignRawTransactionWithWallet, + SignMessage, SignRawTransactionWithWallet, TransactionCategory, TransactionItem, + TransactionItemError, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, + WalletProcessPsbt, }, zmq::GetZmqNotifications, }; diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index 649e3b97..24cc75fe 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -281,9 +281,9 @@ pub use crate::v17::{ PsbtScript, RawTransaction, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignFail, SignFailError, SignMessage, SignMessageWithPrivKey, SignRawTransaction, - SignRawTransactionError, Softfork, SoftforkReject, TestMempoolAccept, TransactionCategory, - TransactionItem, TransactionItemError, UploadTarget, ValidateAddress, ValidateAddressError, - VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, - WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, - SignRawTransactionWithKey, SignRawTransactionWithWallet, + SignRawTransactionError, SignRawTransactionWithKey, SignRawTransactionWithWallet, Softfork, + SoftforkReject, TestMempoolAccept, TransactionCategory, TransactionItem, TransactionItemError, + UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, + VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, + WitnessUtxo, }; diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs index c9196718..fbeeb23a 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -275,11 +275,11 @@ pub use crate::v17::{ LockUnspent, Locked, Logging, NumericError, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, - TestMempoolAccept, TransactionCategory, TransactionItem, TransactionItemError, UploadTarget, - ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, - WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, - SignRawTransactionWithKey, SignRawTransactionWithWallet, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SignRawTransactionWithKey, + SignRawTransactionWithWallet, SoftforkReject, TestMempoolAccept, TransactionCategory, + TransactionItem, TransactionItemError, UploadTarget, ValidateAddress, ValidateAddressError, + VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }; #[doc(inline)] pub use crate::v18::{ diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index 7041d8bb..38236039 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -270,10 +270,10 @@ pub use crate::{ PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, - SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, - UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, - VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, + SignRawTransactionError, SignRawTransactionWithKey, SignRawTransactionWithWallet, + SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, + ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index f2e567d9..a03aa47c 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -286,10 +286,10 @@ pub use crate::{ PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, - SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, - VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, - WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, - SignRawTransactionWithKey, SignRawTransactionWithWallet, + SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject, + TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, + VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, + WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index a8ef37a4..512189fd 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -287,10 +287,11 @@ pub use crate::{ LoadWallet, LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, + WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index 5f2730cf..2be1b0a9 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -289,10 +289,11 @@ pub use crate::{ LoadWallet, LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, + WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index ece6f927..859e45de 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -288,10 +288,11 @@ pub use crate::{ LoadWallet, LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, + WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index 7eefee2a..c684c377 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -283,10 +283,11 @@ pub use crate::{ LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, + WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index 72a365f5..2293de99 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -300,10 +300,11 @@ pub use crate::{ LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index 5f718ab4..4939d894 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -276,10 +276,11 @@ pub use crate::{ LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index d6278d0b..dd90925f 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -297,10 +297,11 @@ pub use crate::{ LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WitnessUtxo, SignRawTransactionWithKey, SignRawTransactionWithWallet, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index da3bdcf0..6024b3fe 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -290,10 +290,10 @@ pub use crate::{ LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, TransactionCategory, - UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, - VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo, - SignRawTransactionWithKey, SignRawTransactionWithWallet, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SignRawTransactionWithKey, SignRawTransactionWithWallet, TransactionCategory, UploadTarget, + ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, + WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,