From 4667b26620668f121d6873fc88267829473502bd Mon Sep 17 00:00:00 2001 From: GideonBature Date: Sat, 21 Jun 2025 09:38:13 +0100 Subject: [PATCH 1/2] Implement importmulti method and test Remove redundant code from types and args Add comment and field checks to test Add appropriate type for v17 and v18 Make test more explicit and robust Resolve Bip125Replaceable import issue Resolve assert checks for v17 --- client/src/client_sync/v17/mod.rs | 48 +++++++++++++++++++- client/src/client_sync/v17/wallet.rs | 12 +++++ client/src/client_sync/v18/mod.rs | 3 +- client/src/client_sync/v19/mod.rs | 3 +- client/src/client_sync/v20/mod.rs | 3 +- client/src/client_sync/v21/mod.rs | 3 +- client/src/client_sync/v22/mod.rs | 3 +- client/src/client_sync/v23/mod.rs | 3 +- client/src/client_sync/v24/mod.rs | 3 +- client/src/client_sync/v25/mod.rs | 3 +- client/src/client_sync/v26/mod.rs | 3 +- client/src/client_sync/v27/mod.rs | 3 +- client/src/client_sync/v28/mod.rs | 3 +- client/src/client_sync/v29/mod.rs | 3 +- integration_test/tests/wallet.rs | 66 +++++++++++++++++++++++++++- types/src/v17/mod.rs | 16 +++---- types/src/v17/wallet/mod.rs | 37 ++++++++++++++++ types/src/v18/mod.rs | 33 +++++++------- types/src/v18/wallet/mod.rs | 39 ++++++++++++++++ types/src/v19/mod.rs | 40 ++++++++--------- types/src/v20/mod.rs | 15 ++++--- types/src/v21/mod.rs | 29 ++++++------ types/src/v22/mod.rs | 15 ++++--- types/src/v23/mod.rs | 45 +++++++++---------- types/src/v24/mod.rs | 47 ++++++++++---------- types/src/v25/mod.rs | 35 ++++++++------- types/src/v26/mod.rs | 12 ++--- types/src/v27/mod.rs | 12 ++--- types/src/v28/mod.rs | 12 ++--- types/src/v29/mod.rs | 12 ++--- verify/src/method/v17.rs | 2 +- verify/src/method/v18.rs | 2 +- verify/src/method/v19.rs | 2 +- verify/src/method/v20.rs | 2 +- verify/src/method/v21.rs | 2 +- verify/src/method/v22.rs | 2 +- verify/src/method/v23.rs | 2 +- verify/src/method/v24.rs | 2 +- verify/src/method/v25.rs | 2 +- verify/src/method/v26.rs | 2 +- verify/src/method/v27.rs | 2 +- verify/src/method/v28.rs | 2 +- verify/src/method/v29.rs | 2 +- 43 files changed, 402 insertions(+), 185 deletions(-) diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs index d17bae2c..d77a3089 100644 --- a/client/src/client_sync/v17/mod.rs +++ b/client/src/client_sync/v17/mod.rs @@ -18,7 +18,7 @@ use std::path::Path; use bitcoin::address::{Address, NetworkChecked}; use bitcoin::{sign_message, Amount, Block, BlockHash, PublicKey, Txid}; -use serde::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize, Serializer}; use crate::client_sync::into_json; use crate::types::v17::*; @@ -128,6 +128,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); @@ -247,3 +248,48 @@ pub enum SetBanCommand { Add, Remove, } + +/// Args for the `importmulti` method +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +pub struct ImportMultiRequest { + /// Descriptor to import. If using descriptor, donot also provide address/scriptPubKey, scripts, or pubkeys. + #[serde(skip_serializing_if = "Option::is_none")] + pub desc: Option, // from core v18 onwards. + /// Type of scriptPubKey (string for script, json for address). Should not be provided if using descriptor. + #[serde(rename = "scriptPubKey", skip_serializing_if = "Option::is_none")] + pub script_pub_key: Option, + /// Creation time of the key expressed in UNIX epoch time, or the string "now" to substitute the current synced blockchain time. + pub timestamp: ImportMultiTimestamp, +} + +/// `scriptPubKey` can be a string for script or json for address. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[serde(untagged)] +pub enum ImportMultiScriptPubKey { + /// The script. + Script(String), + /// The address. + Address { address: String }, +} + +/// `timestamp` can be a number (UNIX epoch time) or the string `"now"` +#[derive(Clone, Debug, Deserialize, PartialEq)] +#[serde(untagged)] +pub enum ImportMultiTimestamp { + /// The string "now". + Now, + /// The UNIX timestamp. + Time(u64), +} + +impl Serialize for ImportMultiTimestamp { + fn serialize(&self, serializer: S) -> std::result::Result + where + S: Serializer, + { + match self { + ImportMultiTimestamp::Now => serializer.serialize_str("now"), + ImportMultiTimestamp::Time(t) => serializer.serialize_u64(*t), + } + } +} diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs index cb715fec..5aa4068a 100644 --- a/client/src/client_sync/v17/wallet.rs +++ b/client/src/client_sync/v17/wallet.rs @@ -298,6 +298,18 @@ macro_rules! impl_client_v17__import_address { }; } +/// Implements Bitcoin Core JSON-RPC API method `importmulti` +#[macro_export] +macro_rules! impl_client_v17__import_multi { + () => { + impl Client { + pub fn import_multi( &self, requests: &[ImportMultiRequest]) -> Result { + self.call("importmulti", &[into_json(requests)?]) + } + } + }; +} + /// Implements Bitcoin Core JSON-RPC API method `importprivkey`. #[macro_export] macro_rules! impl_client_v17__import_privkey { diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs index 39a5be97..ece26e58 100644 --- a/client/src/client_sync/v18/mod.rs +++ b/client/src/client_sync/v18/mod.rs @@ -24,7 +24,7 @@ use crate::types::v18::*; pub use crate::client_sync::{ v17::{ AddNodeCommand, AddressType, Input, Output, SetBanCommand, TemplateRequest, - TemplateRules, WalletCreateFundedPsbtInput + TemplateRules, WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, }; @@ -143,6 +143,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs index 80859a7c..2bfe67e9 100644 --- a/client/src/client_sync/v19/mod.rs +++ b/client/src/client_sync/v19/mod.rs @@ -20,7 +20,7 @@ use crate::types::v19::*; pub use crate::client_sync::{ v17::{ AddNodeCommand, AddressType, Input, Output, SetBanCommand, TemplateRequest, - TemplateRules, WalletCreateFundedPsbtInput + TemplateRules, WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, }; @@ -139,6 +139,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs index 3cf59879..2c6bc8f3 100644 --- a/client/src/client_sync/v20/mod.rs +++ b/client/src/client_sync/v20/mod.rs @@ -17,7 +17,7 @@ use crate::types::v20::*; pub use crate::client_sync::{ v17::{ AddressType, AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput + WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, }; @@ -136,6 +136,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs index 23af0098..2454f582 100644 --- a/client/src/client_sync/v21/mod.rs +++ b/client/src/client_sync/v21/mod.rs @@ -19,7 +19,7 @@ use crate::types::v21::*; pub use crate::client_sync::{ v17::{ AddNodeCommand, AddressType, Input, Output, SetBanCommand, TemplateRequest, - TemplateRules, WalletCreateFundedPsbtInput + TemplateRules, WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, }; @@ -138,6 +138,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs index 960b3f7a..77dece5c 100644 --- a/client/src/client_sync/v22/mod.rs +++ b/client/src/client_sync/v22/mod.rs @@ -19,7 +19,7 @@ use crate::types::v22::*; pub use crate::client_sync::{ v17::{ AddNodeCommand, AddressType, Input, Output, SetBanCommand, TemplateRequest, - TemplateRules, WalletCreateFundedPsbtInput + TemplateRules, WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, }; @@ -138,6 +138,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs index 800bf419..cf9fd53e 100644 --- a/client/src/client_sync/v23/mod.rs +++ b/client/src/client_sync/v23/mod.rs @@ -21,7 +21,7 @@ use crate::types::v23::*; pub use crate::client_sync::{ v17::{ AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput + WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, }; @@ -140,6 +140,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v24/mod.rs b/client/src/client_sync/v24/mod.rs index 6459ea89..47251144 100644 --- a/client/src/client_sync/v24/mod.rs +++ b/client/src/client_sync/v24/mod.rs @@ -17,7 +17,7 @@ use crate::types::v24::*; pub use crate::client_sync::{ v17::{ AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput + WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, v23::AddressType, }; @@ -137,6 +137,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v25/mod.rs b/client/src/client_sync/v25/mod.rs index 15625fb7..26e6230f 100644 --- a/client/src/client_sync/v25/mod.rs +++ b/client/src/client_sync/v25/mod.rs @@ -17,7 +17,7 @@ use crate::types::v25::*; pub use crate::client_sync::{ v17::{ AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput + WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, v23::AddressType, }; @@ -137,6 +137,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs index c9b29930..b5b7b035 100644 --- a/client/src/client_sync/v26/mod.rs +++ b/client/src/client_sync/v26/mod.rs @@ -21,7 +21,7 @@ use crate::types::v26::*; pub use crate::client_sync::{ v17::{ AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput + WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, v23::AddressType, }; @@ -143,6 +143,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v27/mod.rs b/client/src/client_sync/v27/mod.rs index e84f7d7c..ad9bff67 100644 --- a/client/src/client_sync/v27/mod.rs +++ b/client/src/client_sync/v27/mod.rs @@ -17,7 +17,7 @@ use crate::types::v27::*; pub use crate::client_sync::{ v17::{ AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput + WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, v23::AddressType, }; @@ -139,6 +139,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs index b0466149..f765913c 100644 --- a/client/src/client_sync/v28/mod.rs +++ b/client/src/client_sync/v28/mod.rs @@ -19,7 +19,7 @@ use crate::types::v28::*; pub use crate::client_sync::{ v17::{ AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput + WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, }, v23::AddressType, }; @@ -141,6 +141,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/client/src/client_sync/v29/mod.rs b/client/src/client_sync/v29/mod.rs index ded13cf7..34c91850 100644 --- a/client/src/client_sync/v29/mod.rs +++ b/client/src/client_sync/v29/mod.rs @@ -19,7 +19,7 @@ use crate::types::v29::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ - v17::{AddNodeCommand, Input, Output, SetBanCommand, WalletCreateFundedPsbtInput}, + v17::{AddNodeCommand, Input, Output, SetBanCommand, WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp,}, v23::AddressType, }; @@ -141,6 +141,7 @@ crate::impl_client_v17__get_transaction!(); crate::impl_client_v17__get_unconfirmed_balance!(); crate::impl_client_v17__get_wallet_info!(); crate::impl_client_v17__import_address!(); +crate::impl_client_v17__import_multi!(); crate::impl_client_v17__import_privkey!(); crate::impl_client_v17__import_pruned_funds!(); crate::impl_client_v17__import_pubkey!(); diff --git a/integration_test/tests/wallet.rs b/integration_test/tests/wallet.rs index bc6b6066..df1aa05b 100644 --- a/integration_test/tests/wallet.rs +++ b/integration_test/tests/wallet.rs @@ -8,7 +8,7 @@ use bitcoin::address::{Address, NetworkChecked}; use bitcoin::{Amount, PrivateKey, PublicKey}; use integration_test::{Node, NodeExt as _, Wallet}; -use node::{mtype,AddressType}; +use node::{mtype, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp}; use node::vtype::*; // All the version specific types. use std::fs; @@ -343,6 +343,70 @@ fn wallet__list_received_by_label__modelled() { assert!(model.0.iter().any(|item| item.label == label)); } +#[test] +fn wallet__import_multi() { + let node = match () { + #[cfg(feature = "v22_and_below")] + () => Node::with_wallet(Wallet::Default, &[]), + #[cfg(not(feature = "v22_and_below"))] + () => { + let node = Node::with_wallet(Wallet::None, &["-deprecatedrpc=create_bdb"]); + node.client.create_legacy_wallet("wallet_name").expect("createlegacywallet"); + node + } + }; + + let dummy_script_hex = "76a914aabbccddeeff00112233445566778899aabbccdd88ac"; + let addr = node.client.new_address().expect("newaddress"); + let dummy_desc = "pkh(02c6047f9441ed7d6d3045406e95c07cd85a2a0e5c1e507a7a7e3d2f0d6c3d8ef8)#tp9h0863"; + + // Uses scriptPubKey (valid): success - true, without warnings nor error. + // NOTE: On v17, use a wallet-generated address (not raw script) + // to ensure import succeeds, since the wallet already knows the key. + let req1 = ImportMultiRequest { + desc: None, + script_pub_key: Some(ImportMultiScriptPubKey::Script(dummy_script_hex.to_string())), + timestamp: ImportMultiTimestamp::Now, + }; + + // Uses an address (valid): success - false, with JSON-RPC error. + let req2 = ImportMultiRequest { + desc: None, + script_pub_key: Some(ImportMultiScriptPubKey::Address { + address: addr.to_string(), + }), + timestamp: ImportMultiTimestamp::Now, + }; + + // Uses descriptor (valid): success - true + // on v18 onwards, it will return a watch-only warning. + // NOTE: Works only for v18 onwards, as v17 doesn't support descriptors. + let req3 = ImportMultiRequest { + desc: Some(dummy_desc.to_string()), + script_pub_key: None, + timestamp: ImportMultiTimestamp::Time(1_700_000_000), + }; + + let json: ImportMulti = node.client.import_multi(&[req1, req2, req3]).expect("importmulti"); + + #[cfg(not(feature = "v17"))] + { + // result of req1: should succeed, no error, no warning. + // just any random script doesn't work with v17. + assert!(json.0[0].success); + assert!(json.0[0].error.is_none()); + + // result of req3: should succeed, with warning for v18 onwards + assert!(json.0[2].success); + assert!(json.0[2].error.is_none()); + assert!(json.0[2].warnings.is_some()); + } + + // result of req2: should fail with error (wallet already contains privkey for address/script) + assert!(!json.0[1].success); + assert!(json.0[1].error.is_some()); +} + #[test] fn wallet__import_privkey() { let node = match () { diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs index d67b3d8e..af95c1fc 100644 --- a/types/src/v17/mod.rs +++ b/types/src/v17/mod.rs @@ -173,7 +173,7 @@ //! | getunconfirmedbalance | version + model | UNTESTED | //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -271,13 +271,13 @@ pub use self::{ ValidateAddress, ValidateAddressError, VerifyMessage, }, wallet::{ - AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddressInformation, - Bip125Replaceable, BumpFee, BumpFeeError, CreateWallet, DumpPrivKey, DumpWallet, - EncryptWallet, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, - GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetNewAddress, - GetRawChangeAddress, GetReceivedByAddress, GetTransaction, GetTransactionDetail, - GetTransactionDetailError, GetTransactionError, GetUnconfirmedBalance, GetWalletInfo, - GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError, + AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddressInformation, BumpFee, + Bip125Replaceable, BumpFeeError, CreateWallet, DumpPrivKey, DumpWallet, EncryptWallet, GetAddressInfo, + GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, + GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetNewAddress, GetRawChangeAddress, + GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError, + GetTransactionError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, ImportMulti, + ImportMultiEntry, JsonRpcError, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, diff --git a/types/src/v17/wallet/mod.rs b/types/src/v17/wallet/mod.rs index bda0c483..927f1ec4 100644 --- a/types/src/v17/wallet/mod.rs +++ b/types/src/v17/wallet/mod.rs @@ -547,6 +547,43 @@ pub struct GetWalletInfo { pub private_keys_enabled: bool, } +/// Result of JSON-RPC method `importmulti`. +/// +/// > importmulti requests ( options ) +/// > +/// > Arguments: +/// > 1. requests (json array, required) Data to be imported +/// > [ +/// > { (json object) +/// > "desc": "str", (string, optional) Descriptor to import. If using descriptor, do not also provide address/scriptPubKey, scripts, or pubkeys +/// > "scriptPubKey": "script" | { "address":"address" }, (string / json, required) Type of scriptPubKey (string for script, json for address). Should not be provided if using a descriptor +/// > "timestamp": timestamp | "now", (integer / string, required) Creation time of the key expressed in UNIX epoch time,or the string "now" to substitute the current synced blockchain time. The timestamp of the oldest key will determine how far back blockchain rescans need to begin for missing wallet transactions. "now" can be specified to bypass scanning, for keys which are known to never have been used, and 0 can be specified to scan the entire blockchain. Blocks up to 2 hours before the earliest key creation time of all keys being imported by the importmulti call will be scanned. +/// > }, +/// > ... +/// > ] +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +pub struct ImportMulti(pub Vec); + +/// Represents a single entry in the importmulti result array. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +pub struct ImportMultiEntry { + /// The success. + pub success: bool, + /// The error. + pub error: Option, +} + +/// Represents the error object in a JSON-RPC error response. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +pub struct JsonRpcError { + /// The error code. + pub code: i32, + /// The error message. + pub message: String, + /// The error data. + pub data: Option, // Can hold arbitrary extra information +} + /// Result of the JSON-RPC method `listaddressgroupings`. /// /// > listaddressgroupings diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index c484e625..0ea60124 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -177,7 +177,7 @@ //! | getunconfirmedbalance | version + model | UNTESTED | //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -242,7 +242,7 @@ pub use self::{ util::{DeriveAddresses, GetDescriptorInfo}, wallet::{ GetReceivedByLabel, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, - ListUnspentItem, ListWalletDir, ListWalletDirWallet, + ListUnspentItem, ListWalletDir, ListWalletDirWallet, ImportMulti, ImportMultiEntry, JsonRpcError, }, }; #[doc(inline)] @@ -268,18 +268,19 @@ pub use crate::v17::{ GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, - GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, - ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, - ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, Logging, - MapMempoolEntryError, MempoolAcceptance, MempoolEntryError, MempoolEntryFees, - MempoolEntryFeesError, PruneBlockchain, PsbtInput, PsbtOutput, PsbtScript, RawTransaction, - RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, - SendRawTransaction, SendToAddress, SetNetworkActive, SignFail, SignFailError, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, Softfork, SoftforkReject, - TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, - VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, - WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, + GetWalletInfoError, GetZmqNotifications, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned, + ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, + ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, + ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, + ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, + ListWallets, LoadWallet, Locked, Logging, MapMempoolEntryError, MempoolAcceptance, + MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PruneBlockchain, PsbtInput, + PsbtOutput, PsbtScript, RawTransaction, RawTransactionError, RawTransactionInput, + RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, + SetNetworkActive, SignFail, SignFailError, SignMessage, SignMessageWithPrivKey, + SignRawTransaction, SignRawTransactionError, Softfork, SoftforkReject, TestMempoolAccept, + TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, + VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, + WalletProcessPsbt, WitnessUtxo, }; diff --git a/types/src/v18/wallet/mod.rs b/types/src/v18/wallet/mod.rs index 474d3c21..fd06304f 100644 --- a/types/src/v18/wallet/mod.rs +++ b/types/src/v18/wallet/mod.rs @@ -19,6 +19,45 @@ pub use self::error::ListReceivedByLabelError; #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] pub struct GetReceivedByLabel(pub f64); +/// Result of JSON-RPC method `importmulti`. +/// +/// > importmulti requests ( options ) +/// > +/// > Arguments: +/// > 1. requests (json array, required) Data to be imported +/// > [ +/// > { (json object) +/// > "desc": "str", (string, optional) Descriptor to import. If using descriptor, do not also provide address/scriptPubKey, scripts, or pubkeys +/// > "scriptPubKey": "script" | { "address":"address" }, (string / json, required) Type of scriptPubKey (string for script, json for address). Should not be provided if using a descriptor +/// > "timestamp": timestamp | "now", (integer / string, required) Creation time of the key expressed in UNIX epoch time,or the string "now" to substitute the current synced blockchain time. The timestamp of the oldest key will determine how far back blockchain rescans need to begin for missing wallet transactions. "now" can be specified to bypass scanning, for keys which are known to never have been used, and 0 can be specified to scan the entire blockchain. Blocks up to 2 hours before the earliest key creation time of all keys being imported by the importmulti call will be scanned. +/// > }, +/// > ... +/// > ] +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +pub struct ImportMulti(pub Vec); + +/// Represents a single entry in the importmulti result array. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +pub struct ImportMultiEntry { + /// The success. + pub success: bool, + /// The warnings. + pub warnings: Option>, + /// The error. + pub error: Option, +} + +/// Represents the error object in a JSON-RPC error response. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +pub struct JsonRpcError { + /// The error code. + pub code: i32, + /// The error message. + pub message: String, + /// The error data. + pub data: Option, // Can hold arbitrary extra information +} + /// Result of the JSON-RPC method `listreceivedbylabel`. /// /// > listreceivedbylabel ( minconf include_empty include_watchonly ) diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs index d4844e04..b5122c64 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -178,7 +178,7 @@ //! | getunconfirmedbalance | version + model | UNTESTED | //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -251,24 +251,24 @@ pub use self::{ #[doc(inline)] pub use crate::v17::{ AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress, - AddressInformation, Banned, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, - ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, - CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet, - DecodePsbt, DecodePsbtError, DecodeRawTransaction, DecodeScript, DecodeScriptError, - DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, - FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, - GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, - GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, - GetBlockHash, GetBlockHeader, GetBlockHeaderError, GetBlockHeaderVerbose, - GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, GetBlockTemplate, - GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, GetBlockVerboseZero, - GetChainTips, GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats, - GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, - GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, - GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, - GetReceivedByAddress, GetTransactionDetail, GetTransactionDetailError, GetTransactionError, - GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, - GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, + AddressInformation, Banned, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, + CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, + CreatePsbt, CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, + DecodeRawTransaction, DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, EncryptWallet, + EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, + Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, + GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, + GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader, GetBlockHeaderError, + GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, + GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, + GetBlockVerboseZero, GetChainTips, GetChainTxStatsError, GetConnectionCount, GetDifficulty, + GetMemoryInfoStats, GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, + GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, + GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, + GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetail, + GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, + GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, + GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, @@ -286,5 +286,5 @@ pub use crate::v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, - ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }; diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index b105b31a..0d92575f 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -179,7 +179,7 @@ //! | getunconfirmedbalance | version + model | UNTESTED | //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -257,11 +257,12 @@ pub use crate::{ GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, - GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, - GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, - ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, - ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, + GetRawTransactionVerboseError, GetReceivedByAddress, + GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, + GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, + GetZmqNotifications, ListAddressGroupings, + ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, + ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, @@ -277,7 +278,7 @@ pub use crate::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index 34820009..c1fbb361 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -182,7 +182,7 @@ //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | //! | importdescriptors | version | TODO | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -266,24 +266,25 @@ pub use crate::{ GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, - ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, - ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, - PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, - SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, - SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, - ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, - WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, + GetZmqNotifications, ListAddressGroupings, + ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, + ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, + ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, + ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, + ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, + LoadWallet, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, + RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, + SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, + SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, + UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, + VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }, v19::{ Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, GetBalancesError, GetBalancesMine, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index c1ec64ad..e0cb08aa 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -191,7 +191,7 @@ //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | //! | importdescriptors | version | TODO | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -273,11 +273,12 @@ pub use crate::{ GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, - GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, - GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, - ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, - ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, + GetRawTransactionVerboseError, GetReceivedByAddress, + GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, + GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, + GetZmqNotifications, ListAddressGroupings, + ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, + ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, @@ -293,7 +294,7 @@ pub use crate::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }, v19::{ Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, GetBalancesError, GetBalancesMine, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index f59bee8c..6aff842f 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -182,7 +182,7 @@ //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | //! | importdescriptors | version | TODO | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -259,26 +259,27 @@ pub use self::{ pub use crate::{ v17::{ AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress, - AddressInformation, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, - ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, - CreatePsbt, CreateRawTransaction, CreateWallet, DecodeRawTransaction, DumpPrivKey, - DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, - FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, - GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, - GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, - GetBlockHash, GetBlockHeader, GetBlockHeaderError, GetBlockHeaderVerbose, - GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, GetBlockTemplate, - GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, GetBlockVerboseZero, - GetChainTips, GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats, - GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, - GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, - GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, - GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, - GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, - ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + AddressInformation, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, + CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, + CreatePsbt, CreateRawTransaction, CreateWallet, DecodeRawTransaction, + DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, + FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, + GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, + GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, + GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader, + GetBlockHeaderError, GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats, + GetBlockStatsError, GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne, + GetBlockVerboseOneError, GetBlockVerboseZero, GetChainTips, GetChainTxStatsError, + GetConnectionCount, GetDifficulty, GetMemoryInfoStats, GetMempoolInfoError, GetMiningInfo, + GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, + GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, + GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, + GetTransactionDetailError, + GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, + GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, + ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, + ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, + ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, @@ -292,7 +293,7 @@ pub use crate::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index c9f3d0e6..dc4c8ad4 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -183,7 +183,7 @@ //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | //! | importdescriptors | version | TODO | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -261,26 +261,27 @@ pub use self::{ pub use crate::{ v17::{ AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress, - AddressInformation, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, - ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, - CreatePsbt, CreateRawTransaction, CreateWallet, DecodeRawTransaction, DumpPrivKey, - DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, - FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, - GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, - GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, - GetBlockHash, GetBlockHeader, GetBlockHeaderError, GetBlockHeaderVerbose, - GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, GetBlockTemplate, - GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, GetBlockVerboseZero, - GetChainTips, GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats, - GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, - GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, - GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, - GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, - GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, - ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + AddressInformation, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, + CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, + CreatePsbt, CreateRawTransaction, CreateWallet, DecodeRawTransaction, + DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, + FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, + GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, + GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, + GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader, + GetBlockHeaderError, GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats, + GetBlockStatsError, GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne, + GetBlockVerboseOneError, GetBlockVerboseZero, GetChainTips, GetChainTxStatsError, + GetConnectionCount, GetDifficulty, GetMemoryInfoStats, GetMempoolInfoError, GetMiningInfo, + GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, + GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, + GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, + GetTransactionDetailError, + GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, + GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, + ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, + ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, + ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, @@ -293,8 +294,8 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, + ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index af35157b..d833b6c4 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -184,7 +184,7 @@ //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | //! | importdescriptors | version | TODO | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -268,26 +268,27 @@ pub use crate::{ GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, - GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, - GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, - ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, - ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, Locked, PruneBlockchain, - RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, - SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, - TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, - VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + GetRawTransactionVerboseError, GetReceivedByAddress, + GetTransactionDetailError, GetTxOut, GetTxOutError, GetTxOutSetInfo, + GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, + GetZmqNotifications, ListAddressGroupings, + ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, + ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, + ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, + ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, + ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, + ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, + ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index 87797764..72dee967 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -192,7 +192,7 @@ //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | //! | importdescriptors | version | TODO | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -289,9 +289,9 @@ pub use crate::{ GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, - GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetRawTransactionVerboseError, GetReceivedByAddress, + GetTransactionDetailError, GetTxOut, GetTxOutError, + GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, @@ -307,8 +307,8 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, + ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index 6cceca81..578f4a0f 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -192,7 +192,7 @@ //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | //! | importdescriptors | version | TODO | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -266,9 +266,9 @@ pub use crate::{ GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, - GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetRawTransactionVerboseError, GetReceivedByAddress, + GetTransactionDetailError, GetTxOut, GetTxOutError, + GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, @@ -284,8 +284,8 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, + ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index 8c232899..c96ffeea 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -194,7 +194,7 @@ //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | //! | importdescriptors | version | TODO | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -287,9 +287,9 @@ pub use crate::{ GetMempoolInfoError, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, - GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetRawTransactionVerboseError, GetReceivedByAddress, + GetTransactionDetailError, GetTxOut, GetTxOutError, + GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, @@ -305,8 +305,8 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, + ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index 1e338443..c0ea9ac2 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -195,7 +195,7 @@ //! | getwalletinfo | version + model | UNTESTED | //! | importaddress | returns nothing | | //! | importdescriptors | version | TODO | -//! | importmulti | returns nothing | | +//! | importmulti | version | | //! | importprivkey | returns nothing | | //! | importprunedfunds | returns nothing | | //! | importpubkey | returns nothing | | @@ -285,9 +285,9 @@ pub use crate::{ GetMemoryInfoStats, GetMempoolInfoError, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, - GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetRawTransactionVerboseError, GetReceivedByAddress, + GetTransactionDetailError, GetTxOut, GetTxOutError, + GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, @@ -303,8 +303,8 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, + JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, + ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/verify/src/method/v17.rs b/verify/src/method/v17.rs index 810fdeb8..b915dc4e 100644 --- a/verify/src/method/v17.rs +++ b/verify/src/method/v17.rs @@ -113,7 +113,7 @@ pub const METHODS: &[Method] = &[ ), Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_addressss"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v18.rs b/verify/src/method/v18.rs index d763d884..04fb2d65 100644 --- a/verify/src/method/v18.rs +++ b/verify/src/method/v18.rs @@ -117,7 +117,7 @@ pub const METHODS: &[Method] = &[ ), Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_addressss"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v19.rs b/verify/src/method/v19.rs index dc5e5f4a..f6b2d266 100644 --- a/verify/src/method/v19.rs +++ b/verify/src/method/v19.rs @@ -118,7 +118,7 @@ pub const METHODS: &[Method] = &[ ), Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_addressss"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v20.rs b/verify/src/method/v20.rs index ecfa408f..a37aa350 100644 --- a/verify/src/method/v20.rs +++ b/verify/src/method/v20.rs @@ -119,7 +119,7 @@ pub const METHODS: &[Method] = &[ ), Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_addressss"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v21.rs b/verify/src/method/v21.rs index b8a848ac..8f530539 100644 --- a/verify/src/method/v21.rs +++ b/verify/src/method/v21.rs @@ -122,7 +122,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_address"), Method::new_no_model("importdescriptors", "ImportDescriptors", "import_descriptors"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v22.rs b/verify/src/method/v22.rs index 7b196786..da9217b6 100644 --- a/verify/src/method/v22.rs +++ b/verify/src/method/v22.rs @@ -124,7 +124,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_address"), Method::new_no_model("importdescriptors", "ImportDescriptors", "import_descriptors"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v23.rs b/verify/src/method/v23.rs index 5da40e87..752ffa98 100644 --- a/verify/src/method/v23.rs +++ b/verify/src/method/v23.rs @@ -120,7 +120,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_address"), Method::new_no_model("importdescriptors", "ImportDescriptors", "import_descriptors"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v24.rs b/verify/src/method/v24.rs index 97a75c9e..9c1fdcb7 100644 --- a/verify/src/method/v24.rs +++ b/verify/src/method/v24.rs @@ -121,7 +121,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_address"), Method::new_no_model("importdescriptors", "ImportDescriptors", "import_descriptors"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v25.rs b/verify/src/method/v25.rs index a7b6c73f..a7fdd1aa 100644 --- a/verify/src/method/v25.rs +++ b/verify/src/method/v25.rs @@ -122,7 +122,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_address"), Method::new_no_model("importdescriptors", "ImportDescriptors", "import_descriptors"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v26.rs b/verify/src/method/v26.rs index 8a3f86fd..3ed7d971 100644 --- a/verify/src/method/v26.rs +++ b/verify/src/method/v26.rs @@ -129,7 +129,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_address"), Method::new_no_model("importdescriptors", "ImportDescriptors", "import_descriptors"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v27.rs b/verify/src/method/v27.rs index befb3012..7143a1ad 100644 --- a/verify/src/method/v27.rs +++ b/verify/src/method/v27.rs @@ -132,7 +132,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_address"), Method::new_no_model("importdescriptors", "ImportDescriptors", "import_descriptors"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v28.rs b/verify/src/method/v28.rs index f9c1a9af..ab2efb98 100644 --- a/verify/src/method/v28.rs +++ b/verify/src/method/v28.rs @@ -134,7 +134,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_address"), Method::new_no_model("importdescriptors", "ImportDescriptors", "import_descriptors"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), diff --git a/verify/src/method/v29.rs b/verify/src/method/v29.rs index 75972b0b..921f10e6 100644 --- a/verify/src/method/v29.rs +++ b/verify/src/method/v29.rs @@ -135,7 +135,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), Method::new_nothing("importaddress", "import_address"), Method::new_no_model("importdescriptors", "ImportDescriptors", "import_descriptors"), - Method::new_nothing("importmulti", "import_multi"), + Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_nothing("importprivkey", "import_priv_key"), Method::new_nothing("importprunedfunds", "import_pruned_funds"), Method::new_nothing("importpubkey", "import_pubkey"), From ec244207f7380d827c84a822fb1e57c14f051159 Mon Sep 17 00:00:00 2001 From: GideonBature Date: Sat, 21 Jun 2025 09:45:19 +0100 Subject: [PATCH 2/2] Format code Format code changes Format code Format code --- client/src/client_sync/v17/wallet.rs | 2 +- client/src/client_sync/v18/mod.rs | 4 +-- client/src/client_sync/v19/mod.rs | 4 +-- client/src/client_sync/v20/mod.rs | 4 +-- client/src/client_sync/v21/mod.rs | 4 +-- client/src/client_sync/v22/mod.rs | 4 +-- client/src/client_sync/v23/mod.rs | 4 +-- client/src/client_sync/v24/mod.rs | 4 +-- client/src/client_sync/v25/mod.rs | 4 +-- client/src/client_sync/v26/mod.rs | 4 +-- client/src/client_sync/v27/mod.rs | 4 +-- client/src/client_sync/v28/mod.rs | 4 +-- client/src/client_sync/v29/mod.rs | 2 +- types/src/v17/mod.rs | 29 +++++++++--------- types/src/v18/mod.rs | 33 ++++++++++---------- types/src/v19/mod.rs | 43 +++++++++++++------------- types/src/v20/mod.rs | 16 +++++----- types/src/v21/mod.rs | 30 +++++++++--------- types/src/v22/mod.rs | 16 +++++----- types/src/v23/mod.rs | 46 ++++++++++++++-------------- types/src/v24/mod.rs | 45 +++++++++++++-------------- types/src/v25/mod.rs | 33 ++++++++++---------- types/src/v26/mod.rs | 10 +++--- types/src/v27/mod.rs | 10 +++--- types/src/v28/mod.rs | 10 +++--- types/src/v29/mod.rs | 10 +++--- 26 files changed, 189 insertions(+), 190 deletions(-) diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs index 5aa4068a..7b314769 100644 --- a/client/src/client_sync/v17/wallet.rs +++ b/client/src/client_sync/v17/wallet.rs @@ -303,7 +303,7 @@ macro_rules! impl_client_v17__import_address { macro_rules! impl_client_v17__import_multi { () => { impl Client { - pub fn import_multi( &self, requests: &[ImportMultiRequest]) -> Result { + pub fn import_multi(&self, requests: &[ImportMultiRequest]) -> Result { self.call("importmulti", &[into_json(requests)?]) } } diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs index ece26e58..e33f4573 100644 --- a/client/src/client_sync/v18/mod.rs +++ b/client/src/client_sync/v18/mod.rs @@ -23,8 +23,8 @@ use crate::types::v18::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddNodeCommand, AddressType, Input, Output, SetBanCommand, TemplateRequest, - TemplateRules, WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, + TemplateRules, WalletCreateFundedPsbtInput, }, }; diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs index 2bfe67e9..65371fed 100644 --- a/client/src/client_sync/v19/mod.rs +++ b/client/src/client_sync/v19/mod.rs @@ -19,8 +19,8 @@ use crate::types::v19::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddNodeCommand, AddressType, Input, Output, SetBanCommand, TemplateRequest, - TemplateRules, WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, + TemplateRules, WalletCreateFundedPsbtInput, }, }; diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs index 2c6bc8f3..9ba29706 100644 --- a/client/src/client_sync/v20/mod.rs +++ b/client/src/client_sync/v20/mod.rs @@ -16,8 +16,8 @@ use crate::types::v20::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddressType, AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddressType, AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput, }, }; diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs index 2454f582..c86360f4 100644 --- a/client/src/client_sync/v21/mod.rs +++ b/client/src/client_sync/v21/mod.rs @@ -18,8 +18,8 @@ use crate::types::v21::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddNodeCommand, AddressType, Input, Output, SetBanCommand, TemplateRequest, - TemplateRules, WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, + TemplateRules, WalletCreateFundedPsbtInput, }, }; diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs index 77dece5c..90cc4ee0 100644 --- a/client/src/client_sync/v22/mod.rs +++ b/client/src/client_sync/v22/mod.rs @@ -18,8 +18,8 @@ use crate::types::v22::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddNodeCommand, AddressType, Input, Output, SetBanCommand, TemplateRequest, - TemplateRules, WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, + TemplateRules, WalletCreateFundedPsbtInput, }, }; diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs index cf9fd53e..06bdb5f9 100644 --- a/client/src/client_sync/v23/mod.rs +++ b/client/src/client_sync/v23/mod.rs @@ -20,8 +20,8 @@ use crate::types::v23::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput, }, }; diff --git a/client/src/client_sync/v24/mod.rs b/client/src/client_sync/v24/mod.rs index 47251144..b29da857 100644 --- a/client/src/client_sync/v24/mod.rs +++ b/client/src/client_sync/v24/mod.rs @@ -16,8 +16,8 @@ use crate::types::v24::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput, }, v23::AddressType, }; diff --git a/client/src/client_sync/v25/mod.rs b/client/src/client_sync/v25/mod.rs index 26e6230f..c977fca0 100644 --- a/client/src/client_sync/v25/mod.rs +++ b/client/src/client_sync/v25/mod.rs @@ -16,8 +16,8 @@ use crate::types::v25::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput, }, v23::AddressType, }; diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs index b5b7b035..8a9a6141 100644 --- a/client/src/client_sync/v26/mod.rs +++ b/client/src/client_sync/v26/mod.rs @@ -20,8 +20,8 @@ use crate::types::v26::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput, }, v23::AddressType, }; diff --git a/client/src/client_sync/v27/mod.rs b/client/src/client_sync/v27/mod.rs index ad9bff67..4b1caab6 100644 --- a/client/src/client_sync/v27/mod.rs +++ b/client/src/client_sync/v27/mod.rs @@ -16,8 +16,8 @@ use crate::types::v27::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput, }, v23::AddressType, }; diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs index f765913c..cca5a698 100644 --- a/client/src/client_sync/v28/mod.rs +++ b/client/src/client_sync/v28/mod.rs @@ -18,8 +18,8 @@ use crate::types::v28::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ v17::{ - AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, + AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput, }, v23::AddressType, }; diff --git a/client/src/client_sync/v29/mod.rs b/client/src/client_sync/v29/mod.rs index 34c91850..b0ffad20 100644 --- a/client/src/client_sync/v29/mod.rs +++ b/client/src/client_sync/v29/mod.rs @@ -19,7 +19,7 @@ use crate::types::v29::*; #[rustfmt::skip] // Keep public re-exports separate. pub use crate::client_sync::{ - v17::{AddNodeCommand, Input, Output, SetBanCommand, WalletCreateFundedPsbtInput, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp,}, + v17::{AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, WalletCreateFundedPsbtInput,}, v23::AddressType, }; diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs index af95c1fc..cb783703 100644 --- a/types/src/v17/mod.rs +++ b/types/src/v17/mod.rs @@ -271,20 +271,21 @@ pub use self::{ ValidateAddress, ValidateAddressError, VerifyMessage, }, wallet::{ - AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddressInformation, BumpFee, - Bip125Replaceable, BumpFeeError, CreateWallet, DumpPrivKey, DumpWallet, EncryptWallet, GetAddressInfo, - GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, - GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetNewAddress, GetRawChangeAddress, - GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError, - GetTransactionError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, ImportMulti, - ImportMultiEntry, JsonRpcError, ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, - ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, - ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets, - LoadWallet, RescanBlockchain, SendMany, SendToAddress, SignMessage, TransactionCategory, - WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, + AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddressInformation, + Bip125Replaceable, BumpFee, BumpFeeError, CreateWallet, DumpPrivKey, DumpWallet, + EncryptWallet, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, + GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetNewAddress, + GetRawChangeAddress, GetReceivedByAddress, GetTransaction, GetTransactionDetail, + GetTransactionDetailError, GetTransactionError, GetUnconfirmedBalance, GetWalletInfo, + GetWalletInfoError, ImportMulti, ImportMultiEntry, JsonRpcError, ListAddressGroupings, + ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, + ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, + ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, + ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, + ListTransactionsItem, ListTransactionsItemError, ListUnspent, ListUnspentItem, + ListUnspentItemError, ListWallets, LoadWallet, RescanBlockchain, SendMany, SendToAddress, + SignMessage, TransactionCategory, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, + WalletProcessPsbt, }, zmq::GetZmqNotifications, }; diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index 0ea60124..5fc9ab18 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -241,8 +241,8 @@ pub use self::{ }, util::{DeriveAddresses, GetDescriptorInfo}, wallet::{ - GetReceivedByLabel, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, - ListUnspentItem, ListWalletDir, ListWalletDirWallet, ImportMulti, ImportMultiEntry, JsonRpcError, + GetReceivedByLabel, ImportMulti, ImportMultiEntry, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, }, }; #[doc(inline)] @@ -268,19 +268,18 @@ pub use crate::v17::{ GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, - GetWalletInfoError, GetZmqNotifications, - ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned, - ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, - ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, - ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, - ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, - ListWallets, LoadWallet, Locked, Logging, MapMempoolEntryError, MempoolAcceptance, - MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PruneBlockchain, PsbtInput, - PsbtOutput, PsbtScript, RawTransaction, RawTransactionError, RawTransactionInput, - RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, - SetNetworkActive, SignFail, SignFailError, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, Softfork, SoftforkReject, TestMempoolAccept, - TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, - VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupingsItem, ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, + ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, + ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, Logging, + MapMempoolEntryError, MempoolAcceptance, MempoolEntryError, MempoolEntryFees, + MempoolEntryFeesError, PruneBlockchain, PsbtInput, PsbtOutput, PsbtScript, RawTransaction, + RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, + SendRawTransaction, SendToAddress, SetNetworkActive, SignFail, SignFailError, SignMessage, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, Softfork, SoftforkReject, + TestMempoolAccept, TransactionCategory, 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 b5122c64..9456e240 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -251,24 +251,24 @@ pub use self::{ #[doc(inline)] pub use crate::v17::{ AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress, - AddressInformation, Banned, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, - CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, - CreatePsbt, CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, - DecodeRawTransaction, DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, EncryptWallet, - EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, - Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, - GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, - GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader, GetBlockHeaderError, - GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, - GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, - GetBlockVerboseZero, GetChainTips, GetChainTxStatsError, GetConnectionCount, GetDifficulty, - GetMemoryInfoStats, GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, - GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, - GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetail, - GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, - GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, + AddressInformation, Banned, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, + ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, + CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet, + DecodePsbt, DecodePsbtError, DecodeRawTransaction, DecodeScript, DecodeScriptError, + DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, + FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, + GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, + GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, + GetBlockHash, GetBlockHeader, GetBlockHeaderError, GetBlockHeaderVerbose, + GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, GetBlockTemplate, + GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, GetBlockVerboseZero, + GetChainTips, GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats, + GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, + GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, + GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, + GetReceivedByAddress, GetTransactionDetail, GetTransactionDetailError, GetTransactionError, + GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, + GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, @@ -284,7 +284,8 @@ pub use crate::v17::{ #[doc(inline)] pub use crate::v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, - AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, JoinPsbts, - ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, - ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, + NodeAddress, UtxoUpdatePsbt, }; diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index 0d92575f..054c1369 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -257,12 +257,11 @@ pub use crate::{ GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, - GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, - GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, - ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, - ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, + GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, + GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, + GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, + ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, @@ -277,8 +276,9 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, + NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index c1fbb361..2f6bee5a 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -266,25 +266,25 @@ pub use crate::{ GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, - ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, - ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, - ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, - ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, - ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, - LoadWallet, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, - RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, - SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, - SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, - UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, - VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, + GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, + ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, + ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, + ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, + NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, GetBalancesError, GetBalancesMine, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index e0cb08aa..7eb7f5ba 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -273,12 +273,11 @@ pub use crate::{ GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, - GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, - GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, - ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, - ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, + GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, + GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, + GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, + ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, @@ -293,8 +292,9 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, + NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, GetBalancesError, GetBalancesMine, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index 6aff842f..1acdee03 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -259,27 +259,26 @@ pub use self::{ pub use crate::{ v17::{ AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress, - AddressInformation, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, - CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, - CreatePsbt, CreateRawTransaction, CreateWallet, DecodeRawTransaction, - DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, - FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, - GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, - GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, - GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader, - GetBlockHeaderError, GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats, - GetBlockStatsError, GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne, - GetBlockVerboseOneError, GetBlockVerboseZero, GetChainTips, GetChainTxStatsError, - GetConnectionCount, GetDifficulty, GetMemoryInfoStats, GetMempoolInfoError, GetMiningInfo, - GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, - GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, - GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, - GetTransactionDetailError, - GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, - GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, - ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, - ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, - ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + AddressInformation, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, + ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, + CreatePsbt, CreateRawTransaction, CreateWallet, DecodeRawTransaction, DumpPrivKey, + DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, + FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, + GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, + GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, + GetBlockHash, GetBlockHeader, GetBlockHeaderError, GetBlockHeaderVerbose, + GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, GetBlockTemplate, + GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, GetBlockVerboseZero, + GetChainTips, GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats, + GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, + GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, + GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, + GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, + GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, + GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, + ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, + ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, @@ -292,8 +291,9 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, + NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index dc4c8ad4..248b48c0 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -261,27 +261,26 @@ pub use self::{ pub use crate::{ v17::{ AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress, - AddressInformation, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, - CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, - CreatePsbt, CreateRawTransaction, CreateWallet, DecodeRawTransaction, - DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, - FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, - GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, - GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, - GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader, - GetBlockHeaderError, GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats, - GetBlockStatsError, GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne, - GetBlockVerboseOneError, GetBlockVerboseZero, GetChainTips, GetChainTxStatsError, - GetConnectionCount, GetDifficulty, GetMemoryInfoStats, GetMempoolInfoError, GetMiningInfo, - GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, - GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, - GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, - GetTransactionDetailError, - GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, - GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, - ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, - ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, - ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + AddressInformation, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, + ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, + CreatePsbt, CreateRawTransaction, CreateWallet, DecodeRawTransaction, DumpPrivKey, + DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, + FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, + GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, + GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, + GetBlockHash, GetBlockHeader, GetBlockHeaderError, GetBlockHeaderVerbose, + GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, GetBlockTemplate, + GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, GetBlockVerboseZero, + GetChainTips, GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats, + GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, + GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, + GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, + GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, + GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, + GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, + ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, + ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, @@ -294,8 +293,8 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index d833b6c4..59beb831 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -268,27 +268,26 @@ pub use crate::{ GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, - GetTransactionDetailError, GetTxOut, GetTxOutError, GetTxOutSetInfo, - GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, - ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, - ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, - ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, - ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, - ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, Locked, - PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, - SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, - SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, - ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, - WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, + GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, + GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, + GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, + ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, + ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, + ListTransactionsItemError, ListUnspentItemError, ListWallets, Locked, PruneBlockchain, + RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, + SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, + SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, + TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, + VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, + WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index 72dee967..096d9676 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -289,9 +289,9 @@ pub use crate::{ GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, - GetTransactionDetailError, GetTxOut, GetTxOutError, - GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, + GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, + GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, @@ -307,8 +307,8 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index 578f4a0f..e1b33499 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -266,9 +266,9 @@ pub use crate::{ GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, - GetTransactionDetailError, GetTxOut, GetTxOutError, - GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, + GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, + GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, @@ -284,8 +284,8 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index c96ffeea..9fa32960 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -287,9 +287,9 @@ pub use crate::{ GetMempoolInfoError, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, - GetTransactionDetailError, GetTxOut, GetTxOutError, - GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, + GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, + GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, @@ -305,8 +305,8 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index c0ea9ac2..7638cf52 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -285,9 +285,9 @@ pub use crate::{ GetMemoryInfoStats, GetMempoolInfoError, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, - GetRawTransactionVerboseError, GetReceivedByAddress, - GetTransactionDetailError, GetTxOut, GetTxOutError, - GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, + GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, + GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, @@ -303,8 +303,8 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetNodeAddresses, GetReceivedByLabel, - JoinPsbts, ListReceivedByLabel, ListReceivedByLabelError, - ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, ImportMulti, ImportMultiEntry, JsonRpcError, + ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine,