From 0fe8f1b0f2f8b9facb9b8ac69179748f777440fd Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Tue, 26 Aug 2025 13:49:19 +0100 Subject: [PATCH 1/2] Test getzmqnotifications The RPC struct exists but there is no client macro or test. The return changes in v18 and then stays the same up to v29. Add an updated struct for v18. Add the client macro, test and update the types table. --- client/src/client_sync/v17/mod.rs | 4 ++++ client/src/client_sync/v17/zmq.rs | 15 +++++++++++++++ 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/zmq.rs | 22 ++++++++++++++++++++++ types/src/v17/mod.rs | 2 +- types/src/v18/mod.rs | 6 ++++-- types/src/v18/zmq.rs | 24 ++++++++++++++++++++++++ types/src/v19/mod.rs | 6 +++--- types/src/v20/mod.rs | 6 +++--- types/src/v21/mod.rs | 6 +++--- types/src/v22/mod.rs | 6 +++--- types/src/v23/mod.rs | 6 +++--- types/src/v24/mod.rs | 6 +++--- types/src/v25/mod.rs | 6 +++--- types/src/v26/mod.rs | 6 +++--- types/src/v27/mod.rs | 6 +++--- types/src/v28/mod.rs | 6 +++--- types/src/v29/mod.rs | 6 +++--- 29 files changed, 139 insertions(+), 36 deletions(-) create mode 100644 client/src/client_sync/v17/zmq.rs create mode 100644 integration_test/tests/zmq.rs create mode 100644 types/src/v18/zmq.rs diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs index 240f14f0..58215d5c 100644 --- a/client/src/client_sync/v17/mod.rs +++ b/client/src/client_sync/v17/mod.rs @@ -12,6 +12,7 @@ pub mod network; pub mod raw_transactions; pub mod util; pub mod wallet; +pub mod zmq; use std::collections::{BTreeMap, HashMap}; use std::path::Path; @@ -159,6 +160,9 @@ crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); + /// Argument to the `Client::get_new_address_with_type` function. /// /// For Core versions 0.17 through to v22. For Core v23 and onwards use `v23::AddressType`. diff --git a/client/src/client_sync/v17/zmq.rs b/client/src/client_sync/v17/zmq.rs new file mode 100644 index 00000000..60125dfd --- /dev/null +++ b/client/src/client_sync/v17/zmq.rs @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: CC0-1.0 + +//! Macros for implementing JSON-RPC methods for the `== Zmq ==` section (v0.17). + +/// Implements Bitcoin Core JSON-RPC API method `getzmqnotifications`. +#[macro_export] +macro_rules! impl_client_v17__get_zmq_notifications { + () => { + impl Client { + pub fn get_zmq_notifications(&self) -> Result> { + self.call("getzmqnotifications", &[]) + } + } + }; +} diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs index b5ad837f..7a806ccd 100644 --- a/client/src/client_sync/v18/mod.rs +++ b/client/src/client_sync/v18/mod.rs @@ -175,3 +175,6 @@ crate::impl_client_v17__wallet_lock!(); crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); + +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs index 153ea3f8..7cf1d16e 100644 --- a/client/src/client_sync/v19/mod.rs +++ b/client/src/client_sync/v19/mod.rs @@ -172,3 +172,6 @@ crate::impl_client_v17__wallet_lock!(); crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); + +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs index 1e2bd38e..21424320 100644 --- a/client/src/client_sync/v20/mod.rs +++ b/client/src/client_sync/v20/mod.rs @@ -172,3 +172,6 @@ crate::impl_client_v17__wallet_lock!(); crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); + +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs index 9f54068b..c6ddf9f2 100644 --- a/client/src/client_sync/v21/mod.rs +++ b/client/src/client_sync/v21/mod.rs @@ -186,6 +186,9 @@ crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); + /// Request object for the `importdescriptors` method. #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] #[serde(deny_unknown_fields)] diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs index bfa0c1e0..d65eeeb1 100644 --- a/client/src/client_sync/v22/mod.rs +++ b/client/src/client_sync/v22/mod.rs @@ -188,3 +188,6 @@ crate::impl_client_v17__wallet_lock!(); crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); + +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs index 96272f7f..c0230fb4 100644 --- a/client/src/client_sync/v23/mod.rs +++ b/client/src/client_sync/v23/mod.rs @@ -194,6 +194,9 @@ crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); + /// Argument to the `Client::get_new_address_with_type` function. /// /// For Core v23 and onwards. For earlier versions use `v17::AddressType`. diff --git a/client/src/client_sync/v24/mod.rs b/client/src/client_sync/v24/mod.rs index ed063ec8..b629c6f9 100644 --- a/client/src/client_sync/v24/mod.rs +++ b/client/src/client_sync/v24/mod.rs @@ -197,3 +197,6 @@ crate::impl_client_v17__wallet_lock!(); crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); + +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); diff --git a/client/src/client_sync/v25/mod.rs b/client/src/client_sync/v25/mod.rs index 0eb9c5b6..f25658b4 100644 --- a/client/src/client_sync/v25/mod.rs +++ b/client/src/client_sync/v25/mod.rs @@ -198,3 +198,6 @@ crate::impl_client_v17__wallet_lock!(); crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); + +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs index bae0cb3c..da68a44d 100644 --- a/client/src/client_sync/v26/mod.rs +++ b/client/src/client_sync/v26/mod.rs @@ -207,3 +207,6 @@ crate::impl_client_v17__wallet_lock!(); crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); + +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); diff --git a/client/src/client_sync/v27/mod.rs b/client/src/client_sync/v27/mod.rs index 0a75a1c8..5f383785 100644 --- a/client/src/client_sync/v27/mod.rs +++ b/client/src/client_sync/v27/mod.rs @@ -201,3 +201,6 @@ crate::impl_client_v17__wallet_lock!(); crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); + +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs index 45011ec5..bad5dfa3 100644 --- a/client/src/client_sync/v28/mod.rs +++ b/client/src/client_sync/v28/mod.rs @@ -206,3 +206,6 @@ crate::impl_client_v17__wallet_lock!(); crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); + +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); diff --git a/client/src/client_sync/v29/mod.rs b/client/src/client_sync/v29/mod.rs index 696beece..3ff9ddda 100644 --- a/client/src/client_sync/v29/mod.rs +++ b/client/src/client_sync/v29/mod.rs @@ -207,6 +207,9 @@ crate::impl_client_v17__wallet_passphrase!(); crate::impl_client_v17__wallet_passphrase_change!(); crate::impl_client_v17__wallet_process_psbt!(); +// == Zmq == +crate::impl_client_v17__get_zmq_notifications!(); + /// Arg for the `getblocktemplate` method. (v29+). #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default)] pub struct TemplateRequest { diff --git a/integration_test/tests/zmq.rs b/integration_test/tests/zmq.rs new file mode 100644 index 00000000..fc1e1c30 --- /dev/null +++ b/integration_test/tests/zmq.rs @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: CC0-1.0 + +//! Tests for methods found under the `== Zmq ==` section of the API docs. + +#![allow(non_snake_case)] // Test names intentionally use double underscore. +#![allow(unused_imports)] // Because of feature gated tests. + +use integration_test::{Node, Wallet, NodeExt as _}; +use node::vtype::*; // All the version specific types. + +#[test] +#[cfg(not(feature = "v17"))] +fn zmq__get_zmq_notifications__modelled() { + // Start node with a ZMQ notification enabled so we have at least one entry. + // Using hashblock as it is lightweight. + let node = Node::with_wallet(Wallet::Default, &["-zmqpubhashblock=tcp://127.0.0.1:29000"]); + + let list: Vec = node.client.get_zmq_notifications().expect("getzmqnotifications"); + let zmq_notification = &list[0]; + assert_eq!(zmq_notification.type_, "pubhashblock"); + assert_eq!(zmq_notification.address, "tcp://127.0.0.1:29000"); +} diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs index a60a275d..c7f64972 100644 --- a/types/src/v17/mod.rs +++ b/types/src/v17/mod.rs @@ -216,7 +216,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index 62dda715..dcc7c080 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -218,7 +218,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -229,6 +229,7 @@ mod network; mod raw_transactions; mod util; mod wallet; +mod zmq; #[doc(inline)] pub use self::{ @@ -249,6 +250,7 @@ pub use self::{ ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, }, + zmq::GetZmqNotifications, }; #[doc(inline)] pub use crate::v17::{ @@ -271,7 +273,7 @@ pub use crate::v17::{ GetRawTransactionVerboseError, GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, diff --git a/types/src/v18/zmq.rs b/types/src/v18/zmq.rs new file mode 100644 index 00000000..85492fe0 --- /dev/null +++ b/types/src/v18/zmq.rs @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: CC0-1.0 + +//! The JSON-RPC API for Bitcoin Core `v0.18` - zmq. +//! +//! Types for methods found under the `== Zmq ==` section of the API docs. + +use serde::{Deserialize, Serialize}; + +/// Result of JSON-RPC method `getzmqnotifications`. +/// +///> getzmqnotifications +///> +///> Returns information about the active ZeroMQ notifications. +#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[serde(deny_unknown_fields)] +pub struct GetZmqNotifications { + /// Type of notification. + #[serde(rename = "type")] + pub type_: String, + /// Address of the publisher. + pub address: String, + /// Outbound message high water mark. + pub hwm: u64, +} diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs index b23e23c8..25fa8ddf 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -220,7 +220,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -269,7 +269,7 @@ pub use crate::v17::{ GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetail, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, @@ -288,5 +288,5 @@ pub use crate::v18::{ GetAddressInfoError, GetNodeAddresses, GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, - NodeAddress, UtxoUpdatePsbt, + NodeAddress, UtxoUpdatePsbt, GetZmqNotifications, }; diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index db662c99..de8bc09c 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -221,7 +221,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -263,7 +263,7 @@ pub use crate::{ GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, @@ -282,7 +282,7 @@ pub use crate::{ GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, - NodeAddress, UtxoUpdatePsbt, + NodeAddress, UtxoUpdatePsbt, GetZmqNotifications, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index 9b404038..b7baffc0 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -227,7 +227,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -279,7 +279,7 @@ pub use crate::{ GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, @@ -298,7 +298,7 @@ pub use crate::{ GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, - NodeAddress, UtxoUpdatePsbt, + NodeAddress, UtxoUpdatePsbt, GetZmqNotifications, }, v19::{ Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, GetBalancesError, GetBalancesMine, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index 95f6225e..4579bea3 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -238,7 +238,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -281,7 +281,7 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, - GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications, + GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, @@ -299,7 +299,7 @@ pub use crate::{ AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, - ListUnspentItem, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, + ListUnspentItem, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, }, v19::{ Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, GetBalancesError, GetBalancesMine, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index 2d7b6e48..c51e3872 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -231,7 +231,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -279,7 +279,7 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, - GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, @@ -297,7 +297,7 @@ pub use crate::{ AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, - ListUnspentItem, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, + ListUnspentItem, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index 2a9fbd3f..60aee9b8 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -235,7 +235,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -281,7 +281,7 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, - GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, @@ -299,7 +299,7 @@ pub use crate::{ AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, + ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index a49d4743..e6af2d5c 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -236,7 +236,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -277,7 +277,7 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, - GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, @@ -295,7 +295,7 @@ pub use crate::{ AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, + ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index 31af8770..dc0b83f9 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -244,7 +244,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -293,7 +293,7 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, @@ -310,7 +310,7 @@ pub use crate::{ AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, + ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index 9fbebc08..3e0ceeaa 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -244,7 +244,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -271,7 +271,7 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, @@ -288,7 +288,7 @@ pub use crate::{ AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, + ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index 3e300966..b9c301cb 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -246,7 +246,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -291,7 +291,7 @@ pub use crate::{ GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, @@ -308,7 +308,7 @@ pub use crate::{ AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, + ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index 295bff69..b46d2dbf 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -247,7 +247,7 @@ //! //! | JSON-RPC Method Name | Returns | Notes | //! |:-----------------------------------|:---------------:|:--------------------------------------:| -//! | getzmqnotifications | version | UNTESTED | +//! | getzmqnotifications | version | | //! //! @@ -288,7 +288,7 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, @@ -305,7 +305,7 @@ pub use crate::{ AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, + ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, From c7ea6e4c57585e60c4d70ff14bcc0f47f20f4435 Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Tue, 26 Aug 2025 16:13:32 +0100 Subject: [PATCH 2/2] Run the formatter Reordering of the reexports only. --- types/src/v18/mod.rs | 4 ++-- types/src/v19/mod.rs | 12 ++++++------ types/src/v20/mod.rs | 30 +++++++++++++++--------------- types/src/v21/mod.rs | 29 ++++++++++++++--------------- types/src/v22/mod.rs | 31 ++++++++++++++++--------------- types/src/v23/mod.rs | 7 ++++--- types/src/v24/mod.rs | 6 +++--- types/src/v25/mod.rs | 6 +++--- types/src/v26/mod.rs | 28 ++++++++++++++-------------- types/src/v27/mod.rs | 28 ++++++++++++++-------------- types/src/v28/mod.rs | 28 ++++++++++++++-------------- types/src/v29/mod.rs | 28 ++++++++++++++-------------- 12 files changed, 119 insertions(+), 118 deletions(-) diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index dcc7c080..cec767dc 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -273,8 +273,8 @@ pub use crate::v17::{ GetRawTransactionVerboseError, GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, - ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned, + ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs index 25fa8ddf..9d84c4bf 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -269,8 +269,8 @@ pub use crate::v17::{ GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetail, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, - ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned, + ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, @@ -285,8 +285,8 @@ pub use crate::v17::{ pub use crate::v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfo, GetAddressInfoEmbedded, - GetAddressInfoError, GetNodeAddresses, GetReceivedByLabel, ImportMulti, ImportMultiEntry, - JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, - ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, - NodeAddress, UtxoUpdatePsbt, GetZmqNotifications, + GetAddressInfoError, GetNodeAddresses, GetReceivedByLabel, GetZmqNotifications, ImportMulti, + ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, + ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, + ListWalletDirWallet, NodeAddress, UtxoUpdatePsbt, }; diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index de8bc09c..8cb7813d 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -263,26 +263,26 @@ pub use crate::{ GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, - ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, - ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, - LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, - RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction, - SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, - TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, - VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, + ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, + ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, + Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, + SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, + SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, + UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, + VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetNodeAddresses, - GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, - ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, + GetReceivedByLabel, GetZmqNotifications, ImportMulti, ImportMultiEntry, JoinPsbts, + JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, - NodeAddress, UtxoUpdatePsbt, GetZmqNotifications, + NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index b7baffc0..59afc41c 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -279,26 +279,25 @@ pub use crate::{ GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, - ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, - ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, - LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, - RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction, - SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, - UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, - VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, + ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, + ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, + Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, + SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, + SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, + ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, + WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetNodeAddresses, - GetReceivedByLabel, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, - ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, + GetReceivedByLabel, GetZmqNotifications, ImportMulti, ImportMultiEntry, JoinPsbts, + JsonRpcError, ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, - NodeAddress, UtxoUpdatePsbt, GetZmqNotifications, + NodeAddress, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, GetBalancesError, GetBalancesMine, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index 4579bea3..a92cc1a0 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -281,25 +281,26 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, - GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, - ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, - ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, - ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, - Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, - SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, - SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, - ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, - WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, + GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, ListAddressGroupings, + ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent, + ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, + ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, + ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, + ListWallets, LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, + RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, + SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, + SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, + TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, + VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, + WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, - ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, - ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, - ListUnspentItem, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, + GetZmqNotifications, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, + ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, + ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, + UtxoUpdatePsbt, }, v19::{ Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, GetBalancesError, GetBalancesMine, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index c51e3872..06a4077e 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -295,9 +295,10 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, - ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, - ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListUnspent, - ListUnspentItem, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, + GetZmqNotifications, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, + ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, + ListReceivedByLabelError, ListUnspent, ListUnspentItem, ListWalletDir, ListWalletDirWallet, + UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index 60aee9b8..9f2d87c6 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -297,9 +297,9 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, - ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, - ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, + GetZmqNotifications, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, + ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index e6af2d5c..ccb755a7 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -293,9 +293,9 @@ pub use crate::{ v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, - ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, - ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, + GetZmqNotifications, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, + ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index dc0b83f9..19ebbbad 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -293,24 +293,24 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, - ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, - ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, - LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, - RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction, - SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, - UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, - VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, + ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, + ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, + SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, + SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, + ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, + WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, - ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, - ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, + GetZmqNotifications, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, + ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index 3e0ceeaa..c39824a9 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -271,24 +271,24 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, - ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, - ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, - LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, - RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction, - SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, - UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, - VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, + ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, + ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, + SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, + SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, + ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, + WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, - ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, - ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, + GetZmqNotifications, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, + ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index b9c301cb..53e80181 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -291,24 +291,24 @@ pub use crate::{ GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, - ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, - ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, - LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, - RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction, - SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, SoftforkReject, TransactionCategory, - UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, - VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, + ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, + ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, + SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, + SignRawTransactionError, SoftforkReject, TransactionCategory, UploadTarget, + ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, + WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, - ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, - ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, + GetZmqNotifications, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, + ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index b46d2dbf..6fa994fa 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -288,24 +288,24 @@ pub use crate::{ GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, - ListAddressGroupings, ListAddressGroupingsError, - ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem, - ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, - ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, - ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, - LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, - RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction, - SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, TransactionCategory, UploadTarget, - ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, - WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WitnessUtxo, + ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, + ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, + ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, + ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, + SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, + SignRawTransactionError, TransactionCategory, UploadTarget, ValidateAddress, + ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, AnalyzePsbtInputMissingError, DeriveAddresses, GetAddressInfoError, GetReceivedByLabel, - ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, ListReceivedByAddress, - ListReceivedByAddressItem, ListReceivedByLabel, ListReceivedByLabelError, ListWalletDir, - ListWalletDirWallet, UtxoUpdatePsbt, GetZmqNotifications, + GetZmqNotifications, ImportMulti, ImportMultiEntry, JoinPsbts, JsonRpcError, + ListReceivedByAddress, ListReceivedByAddressItem, ListReceivedByLabel, + ListReceivedByLabelError, ListWalletDir, ListWalletDirWallet, UtxoUpdatePsbt, }, v19::{ Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine,