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
6 changes: 3 additions & 3 deletions types/src/v26/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ pub use self::{
blockchain::{GetTxOutSetInfo, GetTxOutSetInfoError},
control::Logging,
mining::{GetPrioritisedTransactions, PrioritisedTransaction},
network::GetPeerInfo,
network::{GetPeerInfo, PeerInfo},
raw_transactions::{
DescriptorProcessPsbt, DescriptorProcessPsbtError, SubmitPackage, SubmitPackageError,
SubmitPackageTxResult, SubmitPackageTxResultError, SubmitPackageTxResultFees,
Expand Down Expand Up @@ -315,8 +315,8 @@ pub use crate::{
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetBlockchainInfoError,
GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors, GetMempoolAncestorsVerbose,
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
SetWalletFlag, Softfork, SoftforkType,
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
Softfork, SoftforkType,
},
v20::GenerateToDescriptor,
v21::{
Expand Down
8 changes: 5 additions & 3 deletions types/src/v26/network.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: CC0-1.0

//! The JSON-RPC API for Bitcoin Core `v23` - network.
//! The JSON-RPC API for Bitcoin Core `v26` - network.
//!
//! Types for methods found under the `== Network ==` section of the API docs.

Expand Down Expand Up @@ -32,8 +32,10 @@ pub struct PeerInfo {
/// Local address as reported by the peer.
#[serde(rename = "addrlocal")]
pub address_local: Option<String>,
/// Network (ipv4, ipv6, or onion) the peer connected through.
pub network: Option<String>,
/// Network (ipv4, ipv6, onion, i2p, cjdns, not_publicly_routable) the peer connected through.
pub network: String,
/// Mapped AS (Autonomous System) number at the end of the BGP route to the peer, used for diversifying peer selection (only displayed if the -asmap config option is set).
pub mapped_as: Option<u32>,
/// The services offered.
pub services: String,
/// The services offered, in human-readable form. v0.19 and later only.
Expand Down
8 changes: 4 additions & 4 deletions types/src/v27/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ pub use crate::{
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetBlockchainInfoError,
GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors, GetMempoolAncestorsVerbose,
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
SetWalletFlag, Softfork, SoftforkType,
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
Softfork, SoftforkType,
},
v20::GenerateToDescriptor,
v21::{
Expand All @@ -317,8 +317,8 @@ pub use crate::{
CreateWallet, DescriptorProcessPsbt, DescriptorProcessPsbtError, GetBalances,
GetBalancesError, GetPeerInfo, GetPrioritisedTransactions, GetTransaction,
GetTransactionError, GetTxOutSetInfo, GetTxOutSetInfoError, LastProcessedBlock,
LastProcessedBlockError, LoadWallet, Logging, PrioritisedTransaction, SubmitPackage,
SubmitPackageError, SubmitPackageTxResult, SubmitPackageTxResultError,
LastProcessedBlockError, LoadWallet, Logging, PeerInfo, PrioritisedTransaction,
SubmitPackage, SubmitPackageError, SubmitPackageTxResult, SubmitPackageTxResultError,
SubmitPackageTxResultFees, SubmitPackageTxResultFeesError, UnloadWallet,
},
};
6 changes: 3 additions & 3 deletions types/src/v28/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@ pub use crate::{
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetBlockchainInfoError,
GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors, GetMempoolAncestorsVerbose,
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
SetWalletFlag, Softfork, SoftforkType,
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
Softfork, SoftforkType,
},
v20::GenerateToDescriptor,
v21::{
Expand All @@ -338,6 +338,6 @@ pub use crate::{
CreateWallet, DescriptorProcessPsbt, DescriptorProcessPsbtError, GetBalances,
GetBalancesError, GetPeerInfo, GetPrioritisedTransactions, GetTransactionError,
GetTxOutSetInfo, GetTxOutSetInfoError, LastProcessedBlock, LastProcessedBlockError,
LoadWallet, PrioritisedTransaction, UnloadWallet,
LoadWallet, PeerInfo, PrioritisedTransaction, UnloadWallet,
},
};
12 changes: 6 additions & 6 deletions types/src/v29/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ pub use crate::{
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetChainTxStats,
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError, MempoolEntry,
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo, SetWalletFlag,
Softfork, SoftforkType,
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag, Softfork,
SoftforkType,
},
v20::GenerateToDescriptor,
v21::{
Expand All @@ -334,12 +334,12 @@ pub use crate::{
v25::{GenerateBlock, GenerateBlockError, GetBlockStats, ListDescriptors},
v26::{
CreateWallet, DescriptorProcessPsbt, DescriptorProcessPsbtError, GetBalances,
GetBalancesError, GetPrioritisedTransactions, GetTransactionError, GetTxOutSetInfo,
GetTxOutSetInfoError, LastProcessedBlock, LastProcessedBlockError, LoadWallet,
PrioritisedTransaction, UnloadWallet,
GetBalancesError, GetPeerInfo, GetPrioritisedTransactions, GetTransactionError,
GetTxOutSetInfo, GetTxOutSetInfoError, LastProcessedBlock, LastProcessedBlockError,
LoadWallet, PeerInfo, PrioritisedTransaction, UnloadWallet,
},
v28::{
GetNetworkInfo, GetPeerInfo, GetTransaction, Logging, SubmitPackage, SubmitPackageError,
GetNetworkInfo, GetTransaction, Logging, SubmitPackage, SubmitPackageError,
SubmitPackageTxResult, SubmitPackageTxResultError, SubmitPackageTxResultFees,
SubmitPackageTxResultFeesError,
},
Expand Down