Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions types/src/v19/blockchain/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ pub struct GetMempoolEntry(pub MempoolEntry);
pub struct MempoolEntry {
/// Virtual transaction size as defined in BIP 141.
///
/// This is different from actual serialized size for witness transactions as witness data is discounted. v0.19 and later only.
/// This is different from actual serialized size for witness transactions as witness data is discounted.
pub vsize: i64,
/// DEPRECATED: same as vsize. Only returned if bitcoind is started with -deprecatedrpc=size
/// size will be completely removed in v0.20.
Expand Down Expand Up @@ -319,7 +319,7 @@ pub struct MempoolEntryFees {
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
#[cfg_attr(feature = "serde-deny-unknown-fields", serde(deny_unknown_fields))]
pub struct GetMempoolInfo {
/// True if the mempool is fully loaded. v0.19 and later only.
/// True if the mempool is fully loaded.
pub loaded: bool,
/// Current transaction count.
pub size: i64,
Expand Down
2 changes: 1 addition & 1 deletion types/src/v19/network/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ pub struct PeerInfo {
pub synced_blocks: i64,
/// The heights of blocks we're currently asking from this peer.
pub inflight: Vec<u64>,
/// Any special permissions that have been granted to this peer. v0.19 and later only.
/// Any special permissions that have been granted to this peer.
pub permissions: Vec<String>,
/// Whether the peer is whitelisted.
pub whitelisted: Option<bool>,
Expand Down
2 changes: 1 addition & 1 deletion types/src/v19/wallet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ pub struct GetTransaction {
pub details: Vec<GetTransactionDetail>,
/// Raw data for transaction.
pub hex: String,
/// The decoded transaction (only present when `verbose` is passed). v19 and later only.
/// The decoded transaction (only present when `verbose` is passed).
pub decoded: Option<Transaction>,
}

Expand Down
8 changes: 4 additions & 4 deletions types/src/v20/wallet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,14 @@ pub struct GetTransaction {
pub fee: Option<f64>,
/// The number of confirmations.
pub confirmations: i64,
/// Only present if the transaction's only input is a coinbase one. v20 and later only.
/// Only present if the transaction's only input is a coinbase one.
pub generated: Option<bool>,
/// Whether we consider the outputs of this unconfirmed transaction safe to spend.
pub trusted: Option<bool>,
/// The block hash.
#[serde(rename = "blockhash")]
pub block_hash: Option<String>,
/// The block height containing the transaction. v20 and later only.
/// The block height containing the transaction.
#[serde(rename = "blockheight")]
pub block_height: Option<i64>,
/// The index of the transaction in the block that includes it.
Expand Down Expand Up @@ -220,15 +220,15 @@ pub struct GetTransaction {
pub details: Vec<GetTransactionDetail>,
/// Raw data for transaction.
pub hex: String,
/// The decoded transaction (only present when `verbose` is passed). v19 and later only.
/// The decoded transaction (only present when `verbose` is passed).
pub decoded: Option<Transaction>,
}

/// Transaction detail. Part of the `gettransaction`.
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
#[cfg_attr(feature = "serde-deny-unknown-fields", serde(deny_unknown_fields))]
pub struct GetTransactionDetail {
/// Only returns true if imported addresses were involved in transaction. v20 and later only.
/// Only returns true if imported addresses were involved in transaction.
#[serde(rename = "involvesWatchonly")]
pub involves_watch_only: Option<bool>,
/// DEPRECATED. The account name involved in the transaction, can be "" for the default account.
Expand Down
8 changes: 4 additions & 4 deletions types/src/v21/blockchain/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pub struct Bip9SoftforkInfo {
pub timeout: i64,
/// Height of the first block to which the status applies.
pub since: i64,
/// Minimum height of blocks for which the rules may be enforced. v0.21 and later only.
/// Minimum height of blocks for which the rules may be enforced.
pub min_activation_height: i64,
/// Numeric statistics about BIP-9 signalling for a softfork (only for "started" status).
pub statistics: Option<Bip9SoftforkStatistics>,
Expand Down Expand Up @@ -169,7 +169,7 @@ pub struct GetMempoolEntry(pub MempoolEntry);
pub struct MempoolEntry {
/// Virtual transaction size as defined in BIP 141.
///
/// This is different from actual serialized size for witness transactions as witness data is discounted. v0.19 and later only.
/// This is different from actual serialized size for witness transactions as witness data is discounted.
pub vsize: i64,
/// Transaction weight as defined in BIP 141.
pub weight: i64,
Expand Down Expand Up @@ -225,7 +225,7 @@ pub struct MempoolEntry {
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
#[cfg_attr(feature = "serde-deny-unknown-fields", serde(deny_unknown_fields))]
pub struct GetMempoolInfo {
/// True if the mempool is fully loaded. v0.19 and later only.
/// True if the mempool is fully loaded.
pub loaded: bool,
/// Current transaction count.
pub size: i64,
Expand All @@ -246,7 +246,7 @@ pub struct GetMempoolInfo {
/// Current minimum relay fee for transactions.
#[serde(rename = "minrelaytxfee")]
pub min_relay_tx_fee: f64,
/// Current number of transactions that haven't passed initial broadcast yet. v21 and later only.
/// Current number of transactions that haven't passed initial broadcast yet.
#[serde(rename = "unbroadcastcount")]
pub unbroadcast_count: i64,
}
Expand Down
17 changes: 8 additions & 9 deletions types/src/v21/network/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub struct GetNetworkInfo {
/// The services we offer to the network (hex string).
#[serde(rename = "localservices")]
pub local_services: String,
/// The services we offer to the network. v0.19 and later only.
/// The services we offer to the network.
#[serde(rename = "localservicesnames")]
pub local_services_names: Vec<String>,
/// `true` if transaction relay is requested from peers.
Expand All @@ -41,9 +41,9 @@ pub struct GetNetworkInfo {
pub time_offset: isize,
/// The total number of connections.
pub connections: usize,
/// The number of inbound connections. v21 and later only.
/// The number of inbound connections.
pub connections_in: usize,
/// The number of outbound connections. v21 and later only.
/// The number of outbound connections.
pub connections_out: usize,
/// Whether p2p networking is enabled.
#[serde(rename = "networkactive")]
Expand Down Expand Up @@ -103,9 +103,9 @@ pub struct PeerInfo {
/// The time in seconds since epoch (Jan 1 1970 GMT) of the last receive.
#[serde(rename = "lastrecv")]
pub last_received: i64,
/// The UNIX epoch time of the last valid transaction received from this peer. v21 and later only.
/// The UNIX epoch time of the last valid transaction received from this peer.
pub last_transaction: i64,
/// The UNIX epoch time of the last block received from this peer. v21 and later only.
/// The UNIX epoch time of the last block received from this peer.
pub last_block: i64,
/// The total bytes sent.
#[serde(rename = "bytessent")]
Expand Down Expand Up @@ -147,14 +147,13 @@ pub struct PeerInfo {
pub synced_blocks: i64,
/// The heights of blocks we're currently asking from this peer.
pub inflight: Vec<u64>,
/// The total number of addresses processed, excluding those dropped due to rate limiting. v21 and
/// later only.
/// The total number of addresses processed, excluding those dropped due to rate limiting.
#[serde(rename = "addr_processed")]
pub addresses_processed: usize,
/// The total number of addresses dropped due to rate limiting. v21 and later only.
/// The total number of addresses dropped due to rate limiting.
#[serde(rename = "addr_rate_limited")]
pub addresses_rate_limited: usize,
/// Any special permissions that have been granted to this peer. v0.19 and later only.
/// Any special permissions that have been granted to this peer.
pub permissions: Vec<String>,
/// Whether the peer is whitelisted.
pub whitelisted: Option<bool>,
Expand Down
7 changes: 3 additions & 4 deletions types/src/v22/blockchain/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub use super::GetMempoolInfoError;
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
#[cfg_attr(feature = "serde-deny-unknown-fields", serde(deny_unknown_fields))]
pub struct GetMempoolInfo {
/// True if the mempool is fully loaded. v0.19 and later only.
/// True if the mempool is fully loaded.
pub loaded: bool,
/// Current transaction count.
pub size: i64,
Expand All @@ -28,8 +28,7 @@ pub struct GetMempoolInfo {
pub bytes: i64,
/// Total memory usage for the mempool.
pub usage: i64,
/// Total fees for the mempool in BTC, ignoring modified fees through prioritisetransaction. v23
/// and later only.
/// Total fees for the mempool in BTC, ignoring modified fees through prioritisetransaction.
pub total_fee: f64,
/// Maximum memory usage for the mempool.
#[serde(rename = "maxmempool")]
Expand All @@ -42,7 +41,7 @@ pub struct GetMempoolInfo {
/// Current minimum relay fee for transactions.
#[serde(rename = "minrelaytxfee")]
pub min_relay_tx_fee: f64,
/// Current number of transactions that haven't passed initial broadcast yet. v21 and later only.
/// Current number of transactions that haven't passed initial broadcast yet.
#[serde(rename = "unbroadcastcount")]
pub unbroadcast_count: i64,
}
11 changes: 5 additions & 6 deletions types/src/v22/network.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ pub struct PeerInfo {
/// The time in seconds since epoch (Jan 1 1970 GMT) of the last receive.
#[serde(rename = "lastrecv")]
pub last_received: i64,
/// The UNIX epoch time of the last valid transaction received from this peer. v21 and later only.
/// The UNIX epoch time of the last valid transaction received from this peer.
pub last_transaction: i64,
/// The UNIX epoch time of the last block received from this peer. v21 and later only.
/// The UNIX epoch time of the last block received from this peer.
pub last_block: i64,
/// The total bytes sent.
#[serde(rename = "bytessent")]
Expand Down Expand Up @@ -123,14 +123,13 @@ pub struct PeerInfo {
pub synced_blocks: i64,
/// The heights of blocks we're currently asking from this peer.
pub inflight: Vec<u64>,
/// The total number of addresses processed, excluding those dropped due to rate limiting. v21 and
/// later only.
/// The total number of addresses processed, excluding those dropped due to rate limiting.
#[serde(rename = "addr_processed")]
pub addresses_processed: usize,
/// The total number of addresses dropped due to rate limiting. v21 and later only.
/// The total number of addresses dropped due to rate limiting.
#[serde(rename = "addr_rate_limited")]
pub addresses_rate_limited: usize,
/// Any special permissions that have been granted to this peer. v0.19 and later only.
/// Any special permissions that have been granted to this peer.
pub permissions: Vec<String>,
/// Whether the peer is whitelisted.
pub whitelisted: Option<bool>,
Expand Down
4 changes: 2 additions & 2 deletions types/src/v22/raw_transactions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub struct DecodeScript {
/// The output type.
#[serde(rename = "type")]
pub type_: String,
/// Bitcoin address (only if a well-defined address exists). v22 and later only.
/// Bitcoin address (only if a well-defined address exists).
pub address: Option<String>,
/// The required signatures.
#[serde(rename = "reqSigs")]
Expand All @@ -55,7 +55,7 @@ pub struct DecodeScriptSegwit {
/// The output type.
#[serde(rename = "type")]
pub type_: String,
/// Bitcoin address (only if a well-defined address exists). v22 and later only.
/// Bitcoin address (only if a well-defined address exists).
pub address: Option<String>,
/// The required signatures.
#[serde(rename = "reqSigs")]
Expand Down
4 changes: 2 additions & 2 deletions types/src/v23/blockchain/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub struct GetBlockchainInfo {
pub best_block_hash: String,
/// The current difficulty.
pub difficulty: f64,
/// The block time expressed in UNIX epoch time. v23 and later only.
/// The block time expressed in UNIX epoch time.
pub time: i64,
/// Median time for the current best block.
#[serde(rename = "mediantime")]
Expand Down Expand Up @@ -195,7 +195,7 @@ pub struct MempoolEntry {
/// Virtual transaction size as defined in BIP 141.
///
/// This is different from actual serialized size for witness transactions as witness data is
/// discounted. v0.19 and later only.
/// discounted.
pub vsize: i64,
/// Transaction weight as defined in BIP 141.
pub weight: i64,
Expand Down
12 changes: 6 additions & 6 deletions types/src/v23/control.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ use serde::{Deserialize, Serialize};
pub struct Logging {
pub addrman: bool,
pub bench: bool,
pub blockstorage: bool, // v23 and later only
pub blockstorage: bool,
pub cmpctblock: bool,
pub coindb: bool,
pub estimatefee: bool,
pub http: bool,
pub i2p: bool, // v23 and later only
pub ipc: bool, // v23 and later only
pub i2p: bool,
pub ipc: bool,
pub leveldb: bool,
pub libevent: bool,
pub mempool: bool,
Expand All @@ -36,8 +36,8 @@ pub struct Logging {
pub rpc: bool,
pub selectcoins: bool,
pub tor: bool,
pub util: bool, // v23 to v27 only
pub validation: bool, // v23 and later only
pub walletdb: bool, // v23 and later only
pub util: bool,
pub validation: bool,
pub walletdb: bool,
pub zmq: bool,
}
10 changes: 5 additions & 5 deletions types/src/v23/network.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub struct PeerInfo {
pub network: Option<String>,
/// The services offered.
pub services: String,
/// The services offered, in human-readable form. v0.19 and later only.
/// The services offered, in human-readable form.
#[serde(rename = "servicesnames")]
pub services_names: Vec<String>,
/// Whether peer has asked us to relay transactions to it.
Expand All @@ -48,9 +48,9 @@ pub struct PeerInfo {
/// The time in seconds since epoch (Jan 1 1970 GMT) of the last receive.
#[serde(rename = "lastrecv")]
pub last_received: i64,
/// The UNIX epoch time of the last valid transaction received from this peer. v21 and later only.
/// The UNIX epoch time of the last valid transaction received from this peer.
pub last_transaction: i64,
/// The UNIX epoch time of the last block received from this peer. v21 and later only.
/// The UNIX epoch time of the last block received from this peer.
pub last_block: i64,
/// The total bytes sent.
#[serde(rename = "bytessent")]
Expand Down Expand Up @@ -80,9 +80,9 @@ pub struct PeerInfo {
pub subversion: String,
/// Inbound (true) or Outbound (false).
pub inbound: bool,
/// Whether we selected peer as (compact blocks) high-bandwidth peer. v22 and later only.
/// Whether we selected peer as (compact blocks) high-bandwidth peer.
pub bip152_hb_to: bool,
/// Whether peer selected us as (compact blocks) high-bandwidth peer. v22 and later only.
/// Whether peer selected us as (compact blocks) high-bandwidth peer.
pub bip152_hb_from: bool,
/// Whether connection was due to addnode/-connect or if it was an automatic/inbound connection.
#[serde(rename = "addnode")]
Expand Down
8 changes: 4 additions & 4 deletions types/src/v23/raw_transactions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ pub struct PsbtOutput {
pub struct DecodeScript {
/// Script public key.
pub asm: String,
/// Inferred descriptor for the script. v23 and later only.
/// Inferred descriptor for the script.
#[serde(rename = "desc")]
pub descriptor: Option<String>,
/// The output type.
#[serde(rename = "type")]
pub type_: String,
/// Bitcoin address (only if a well-defined address exists). v22 and later only.
/// Bitcoin address (only if a well-defined address exists).
pub address: Option<String>,
/// The required signatures.
#[serde(rename = "reqSigs")]
Expand All @@ -177,14 +177,14 @@ pub struct DecodeScriptSegwit {
/// The output type.
#[serde(rename = "type")]
pub type_: String,
/// Bitcoin address (only if a well-defined address exists). v22 and later only.
/// Bitcoin address (only if a well-defined address exists).
pub address: Option<String>,
/// The required signatures.
#[serde(rename = "reqSigs")]
pub required_signatures: Option<u64>,
/// List of bitcoin addresses.
pub addresses: Option<Vec<String>>,
/// Inferred descriptor for the script. v23 and later only.
/// Inferred descriptor for the script.
#[serde(rename = "desc")]
pub descriptor: Option<String>,
/// Address of P2SH script wrapping this redeem script (not returned if the script is already a P2SH).
Expand Down
14 changes: 7 additions & 7 deletions types/src/v23/wallet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ pub struct GetTransaction {
pub fee: Option<f64>,
/// The number of confirmations.
pub confirmations: i64,
/// Only present if the transaction's only input is a coinbase one. v20 and later only.
/// Only present if the transaction's only input is a coinbase one.
pub generated: Option<bool>,
/// Whether we consider the outputs of this unconfirmed transaction safe to spend.
pub trusted: Option<bool>,
/// The block hash.
#[serde(rename = "blockhash")]
pub block_hash: Option<String>,
/// The block height containing the transaction. v20 and later only.
/// The block height containing the transaction.
#[serde(rename = "blockheight")]
pub block_height: Option<i64>,
/// The index of the transaction in the block that includes it.
Expand All @@ -83,18 +83,18 @@ pub struct GetTransaction {
/// Confirmed transactions that have been detected by the wallet to conflict with this transaction.
#[serde(rename = "walletconflicts")]
pub wallet_conflicts: Vec<String>,
/// Only if 'category' is 'send'. The txid if this tx was replaced. v23 and later only.
/// Only if 'category' is 'send'. The txid if this tx was replaced.
pub replaced_by_txid: Option<String>,
/// Only if 'category' is 'send'. The txid if this tx replaces another. v23 and later only.
/// Only if 'category' is 'send'. The txid if this tx replaces another.
pub replaces_txid: Option<String>,
/// If a comment to is associated with the transaction. v23 and later only.
/// If a comment to is associated with the transaction.
pub to: Option<String>,
/// The transaction time in seconds since epoch (1 Jan 1970 GMT).
pub time: u32,
/// The time received in seconds since epoch (1 Jan 1970 GMT).
#[serde(rename = "timereceived")]
pub time_received: u32,
/// If a comment is associated with the transaction, only present if not empty. v20 to v24 only.
/// If a comment is associated with the transaction, only present if not empty.
pub comment: Option<String>,
/// Whether this transaction could be replaced due to BIP125 (replace-by-fee);
/// may be unknown for unconfirmed transactions not in the mempool
Expand All @@ -104,7 +104,7 @@ pub struct GetTransaction {
pub details: Vec<GetTransactionDetail>,
/// Raw data for transaction.
pub hex: String,
/// The decoded transaction (only present when `verbose` is passed). v19 and later only.
/// The decoded transaction (only present when `verbose` is passed).
pub decoded: Option<Transaction>,
}

Expand Down
Loading