Add missing fields to getnetworkinfo, getpeerinfo

getnetworkinfo had missing fields in v21 and v28.

getpeerinfo had missing fields in multiple versions.

Redefine the types with the missing fields.  Add the fields to the
`GetNetworkInfo` model and update the into functions. Update the
reexports.

Author: jamillambert

types/src/model/network.rs

@@ -28,6 +28,10 @@ pub struct GetNetworkInfo {
     pub time_offset: isize,
     /// The total number of connections.
     pub connections: usize,
+    /// The number of inbound connections. v28 and later only.
+    pub connections_in: Option<usize>,
+    /// The number of outbound connections. v28 and later only.
+    pub connections_out: Option<usize>,
     /// Whether p2p networking is enabled.
     pub network_active: bool,
     /// Information per network.

types/src/v17/network/into.rs

@@ -21,6 +21,8 @@ impl GetNetworkInfo {
             local_relay: self.local_relay,
             time_offset: self.time_offset,
             connections: self.connections,
+            connections_in: None,
+            connections_out: None,
             network_active: self.network_active,
             networks: self.networks.into_iter().map(|n| n.into_model()).collect(),
             relay_fee,

types/src/v19/network/into.rs

@@ -20,6 +20,8 @@ impl GetNetworkInfo {
             local_relay: self.local_relay,
             time_offset: self.time_offset,
             connections: self.connections,
+            connections_in: None,
+            connections_out: None,
             network_active: self.network_active,
             networks: self.networks.into_iter().map(|n| n.into_model()).collect(),
             relay_fee,

types/src/v21/mod.rs

@@ -233,6 +233,7 @@
 
 // JSON-RPC types by API section.
 mod blockchain;
+mod network;
 mod wallet;
 
 #[doc(inline)]
@@ -241,6 +242,7 @@ pub use self::{
         Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolEntry, GetMempoolInfo, Softfork,
         SoftforkType,
     },
+    network::{GetNetworkInfo, GetPeerInfo},
     wallet::UnloadWallet,
 };
 #[doc(inline)]
@@ -289,7 +291,7 @@ pub use crate::{
         GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError,
         GetBlockchainInfoError, GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors,
         GetMempoolAncestorsVerbose, GetMempoolDescendants, GetMempoolDescendantsVerbose,
-        GetNetworkInfo, GetPeerInfo, GetRpcInfo, MapMempoolEntryError,
+        GetRpcInfo, MapMempoolEntryError,
         MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
     },
     v20::{Banned, CreateMultisig, ListBanned, Logging},

types/src/v21/network/into.rs

@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: CC0-1.0
+
+use super::{GetNetworkInfo, GetNetworkInfoError};
+use crate::model;
+
+impl GetNetworkInfo {
+    /// Converts version specific type to a version nonspecific, more strongly typed type.
+    pub fn into_model(self) -> Result<model::GetNetworkInfo, GetNetworkInfoError> {
+        use GetNetworkInfoError as E;
+
+        let relay_fee = crate::btc_per_kb(self.relay_fee).map_err(E::RelayFee)?;
+        let incremental_fee = crate::btc_per_kb(self.incremental_fee).map_err(E::IncrementalFee)?;
+
+        Ok(model::GetNetworkInfo {
+            version: self.version,
+            subversion: self.subversion,
+            protocol_version: self.protocol_version,
+            local_services: self.local_services,
+            local_services_names: Some(self.local_services_names),
+            local_relay: self.local_relay,
+            time_offset: self.time_offset,
+            connections: self.connections,
+            connections_in: Some(self.connections_in),
+            connections_out: Some(self.connections_out),
+            network_active: self.network_active,
+            networks: self.networks.into_iter().map(|n| n.into_model()).collect(),
+            relay_fee,
+            incremental_fee,
+            local_addresses: self.local_addresses.into_iter().map(|a| a.into_model()).collect(),
+            warnings: vec![self.warnings],
+        })
+    }
+}

types/src/v21/network/mod.rs

@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! The JSON-RPC API for Bitcoin Core `v0.21` - network.
+//!
+//! Types for methods found under the `== Network ==` section of the API docs.
+
+mod into;
+
+use alloc::collections::BTreeMap;
+
+use serde::{Deserialize, Serialize};
+
+use super::{GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork};
+
+/// Result of the JSON-RPC method `getnetworkinfo`.
+///
+/// > getnetworkinfo
+///
+/// > Returns an object containing various state info regarding P2P networking.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct GetNetworkInfo {
+    /// The server version.
+    pub version: usize,
+    /// The server subversion string.
+    pub subversion: String,
+    /// The protocol version.
+    #[serde(rename = "protocolversion")]
+    pub protocol_version: usize,
+    /// 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.
+    #[serde(rename = "localservicesnames")]
+    pub local_services_names: Vec<String>,
+    /// `true` if transaction relay is requested from peers.
+    #[serde(rename = "localrelay")]
+    pub local_relay: bool,
+    /// The time offset.
+    #[serde(rename = "timeoffset")]
+    pub time_offset: isize,
+    /// The total number of connections.
+    pub connections: usize,
+    /// The number of inbound connections. v21 and later only.
+    pub connections_in: usize,
+    /// The number of outbound connections. v21 and later only.
+    pub connections_out: usize,
+    /// Whether p2p networking is enabled.
+    #[serde(rename = "networkactive")]
+    pub network_active: bool,
+    /// Information per network.
+    pub networks: Vec<GetNetworkInfoNetwork>,
+    /// Minimum relay fee rate for transactions in BTC/kB.
+    #[serde(rename = "relayfee")]
+    pub relay_fee: f64,
+    /// Minimum fee rate increment for mempool limiting or replacement in BTC/kB.
+    #[serde(rename = "incrementalfee")]
+    pub incremental_fee: f64,
+    /// List of local addresses.
+    #[serde(rename = "localaddresses")]
+    pub local_addresses: Vec<GetNetworkInfoAddress>,
+    /// Any network and blockchain warnings.
+    pub warnings: String,
+}
+
+/// Result of JSON-RPC method `getpeerinfo`.
+///
+/// > getpeerinfo
+/// >
+/// > Returns data about each connected network node as a json array of objects.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct GetPeerInfo(pub Vec<PeerInfo>);
+
+/// An item from the list returned by the JSON-RPC method `getpeerinfo`.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct PeerInfo {
+    /// Peer index.
+    pub id: u32,
+    /// The IP address and port of the peer ("host:port").
+    #[serde(rename = "addr")]
+    pub address: String,
+    /// Bind address of the connection to the peer ("ip:port").
+    #[serde(rename = "addrbind")]
+    pub address_bind: String,
+    /// 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>,
+    /// The services offered.
+    pub services: String,
+    /// The services offered, in human-readable form. v0.19 and later only.
+    #[serde(rename = "servicesnames")]
+    pub services_names: Vec<String>,
+    /// Whether peer has asked us to relay transactions to it.
+    #[serde(rename = "relaytxes")]
+    pub relay_transactions: bool,
+    /// The time in seconds since epoch (Jan 1 1970 GMT) of the last send.
+    #[serde(rename = "lastsend")]
+    pub last_send: i64,
+    /// 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.
+    pub last_transaction: i64,
+    /// The UNIX epoch time of the last block received from this peer. v21 and later only.
+    pub last_block: i64,
+    /// The total bytes sent.
+    #[serde(rename = "bytessent")]
+    pub bytes_sent: u64,
+    /// The total bytes received.
+    #[serde(rename = "bytesrecv")]
+    pub bytes_received: u64,
+    /// The connection time in seconds since epoch (Jan 1 1970 GMT).
+    #[serde(rename = "conntime")]
+    pub connection_time: i64,
+    /// The time offset in seconds.
+    #[serde(rename = "timeoffset")]
+    pub time_offset: i64,
+    /// Ping time (if available).
+    #[serde(rename = "pingtime")]
+    pub ping_time: Option<f64>,
+    /// Minimum observed ping time (if any at all).
+    #[serde(rename = "minping")]
+    pub minimum_ping: Option<f64>,
+    /// Ping wait (if non-zero).
+    #[serde(rename = "pingwait")]
+    pub ping_wait: Option<f64>,
+    /// The peer version, such as 70001.
+    pub version: u32,
+    /// The string version (e.g. "/Satoshi:0.8.5/").
+    #[serde(rename = "subver")]
+    pub subversion: String,
+    /// Inbound (true) or Outbound (false).
+    pub inbound: bool,
+    /// Whether connection was due to addnode/-connect or if it was an automatic/inbound connection.
+    #[serde(rename = "addnode")]
+    pub add_node: Option<bool>,
+    /// The starting height (block) of the peer.
+    #[serde(rename = "startingheight")]
+    pub starting_height: i64,
+    /// The ban score.
+    #[serde(rename = "banscore")]
+    pub ban_score: Option<i64>,
+    /// The last header we have in common with this peer.
+    pub synced_headers: i64,
+    /// The last block we have in common with this peer.
+    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.
+    pub addr_processed: usize,
+    /// The total number of addresses dropped due to rate limiting. v21 and later only.
+    pub addr_rate_limited: usize,
+    /// Any special permissions that have been granted to this peer. v0.19 and later only.
+    pub permissions: Vec<String>,
+    /// The minimum fee rate for transactions this peer accepts. v0.19 and later only.
+    #[serde(rename = "minfeefilter")]
+    pub minimum_fee_filter: f64,
+    /// Whether the peer is whitelisted (deprecated in v0.21).
+    pub whitelisted: Option<bool>,
+    /// The total bytes sent aggregated by message type.
+    #[serde(rename = "bytessent_per_msg")]
+    pub bytes_sent_per_message: BTreeMap<String, u64>,
+    /// The total bytes received aggregated by message type.
+    #[serde(rename = "bytesrecv_per_msg")]
+    pub bytes_received_per_message: BTreeMap<String, u64>,
+    /// Type of connection.
+    pub connection_type: Option<String>,
+}

types/src/v22/mod.rs

@@ -251,7 +251,7 @@ mod network;
 pub use self::{
     blockchain::GetMempoolInfo,
     control::Logging,
-    network::{Banned, ListBanned},
+    network::{Banned, GetPeerInfo, ListBanned},
 };
 #[doc(inline)]
 pub use crate::{
@@ -299,13 +299,13 @@ pub use crate::{
         GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError,
         GetBlockchainInfoError, GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors,
         GetMempoolAncestorsVerbose, GetMempoolDescendants, GetMempoolDescendantsVerbose,
-        GetNetworkInfo, GetPeerInfo, GetRpcInfo, MapMempoolEntryError,
+        GetRpcInfo, MapMempoolEntryError,
         MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
     },
     v20::CreateMultisig,
     v21::{
         Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolEntry, Softfork, SoftforkType,
-        UnloadWallet,
+        UnloadWallet, GetNetworkInfo,
     },
     ScriptPubkey,
 };