feat(graphql): expand daemonStatus

Author: Adrian Nagy

node/native/src/graphql/constants.rs

@@ -1,8 +1,8 @@
 use juniper::GraphQLObject;
 use node::{
     rpc::{
-        ConsensusTimeQuery, PeerConnectionStatus, RpcConsensusTimeGetResponse, RpcPeerInfo,
-        RpcRequest,
+        ConsensusTimeQuery, PeerConnectionStatus, RpcConsensusTimeGetResponse,
+        RpcNodeStatusNetworkInfo, RpcPeerInfo, RpcRequest,
     },
     BuildEnv,
 };
@@ -156,7 +156,6 @@ impl GraphQLDaemonStatus {
         }
     }
 
-    // highestUnvalidatedBlockLengthReceived
     async fn highest_unvalidated_block_length_received(
         &self,
         context: &Context,
@@ -177,7 +176,6 @@ impl GraphQLDaemonStatus {
         }))
     }
 
-    //highestBlockLengthReceived
     async fn highest_block_length_received(
         &self,
         context: &Context,
@@ -197,6 +195,62 @@ impl GraphQLDaemonStatus {
                 })
         }))
     }
+
+    async fn addrs_and_ports(
+        &self,
+        context: &Context,
+    ) -> juniper::FieldResult<GraphQLAddrsAndPorts> {
+        let status = context.get_or_fetch_status().await;
+
+        match status {
+            Some(status) => Ok(GraphQLAddrsAndPorts::from(&status.network_info)),
+            None => Ok(Default::default()),
+        }
+    }
+
+    async fn block_production_keys(&self, context: &Context) -> juniper::FieldResult<Vec<String>> {
+        let status = context.get_or_fetch_status().await;
+        Ok(status.map_or(vec![], |status| {
+            status
+                .block_producer
+                .map_or(vec![], |key| vec![key.to_string()])
+        }))
+    }
+
+    async fn coinbase_receiver(&self, context: &Context) -> juniper::FieldResult<Option<String>> {
+        let status = context.get_or_fetch_status().await;
+        Ok(status.and_then(|status| status.coinbase_receiver.map(|key| key.to_string())))
+    }
+}
+
+#[derive(GraphQLObject, Clone, Debug)]
+pub struct GraphQLAddrsAndPorts {
+    pub bind_ip: String,
+    pub external_ip: Option<String>,
+    pub client_port: Option<i32>,
+    pub libp2p_port: Option<i32>,
+}
+
+impl Default for GraphQLAddrsAndPorts {
+    fn default() -> Self {
+        Self {
+            bind_ip: "0.0.0.0".to_string(),
+            external_ip: None,
+            client_port: None,
+            libp2p_port: None,
+        }
+    }
+}
+
+impl From<&RpcNodeStatusNetworkInfo> for GraphQLAddrsAndPorts {
+    fn from(network_info: &RpcNodeStatusNetworkInfo) -> Self {
+        Self {
+            bind_ip: network_info.bind_ip.clone(),
+            external_ip: network_info.external_ip.clone(),
+            client_port: network_info.client_port.map(|port| port.into()),
+            libp2p_port: network_info.libp2p_port.map(|port| port.into()),
+        }
+    }
 }
 
 #[derive(GraphQLObject, Clone, Debug)]

node/native/src/node/builder.rs

@@ -345,6 +345,7 @@ impl NodeBuilder {
                 snarker: self.snarker,
                 consensus_constants: consensus_consts.clone(),
                 testing_run: false,
+                client_port: self.http_port,
             },
             p2p: self.p2p,
             ledger: LedgerConfig {},

node/src/config.rs

@@ -35,6 +35,7 @@ pub struct GlobalConfig {
     pub build: Box<BuildEnv>,
     pub snarker: Option<SnarkerConfig>,
     pub consensus_constants: ConsensusConstants,
+    pub client_port: Option<u16>,
     pub testing_run: bool,
 }
 

node/src/rpc/mod.rs

@@ -516,6 +516,17 @@ pub struct RpcNodeStatus {
     pub peers: Vec<RpcPeerInfo>,
     pub resources_status: RpcNodeStatusResources,
     pub service_queues: Queues,
+    pub network_info: RpcNodeStatusNetworkInfo,
+    pub block_producer: Option<AccountPublicKey>,
+    pub coinbase_receiver: Option<AccountPublicKey>,
+}
+
+#[derive(Serialize, Debug, Clone)]
+pub struct RpcNodeStatusNetworkInfo {
+    pub bind_ip: String,
+    pub external_ip: Option<String>,
+    pub client_port: Option<u16>,
+    pub libp2p_port: Option<u16>,
 }
 
 #[derive(Serialize, Debug, Clone)]

node/src/rpc_effectful/rpc_effectful_effects.rs

@@ -14,14 +14,14 @@ use crate::{
         AccountQuery, AccountSlim, ActionStatsQuery, ActionStatsResponse, CurrentMessageProgress,
         MessagesStats, NodeHeartbeat, ProducedBlockInfo, RootLedgerSyncProgress,
         RootStagedLedgerSyncProgress, RpcAction, RpcBlockProducerStats, RpcMessageProgressResponse,
-        RpcNodeStatus, RpcNodeStatusLedger, RpcNodeStatusResources, RpcNodeStatusTransactionPool,
-        RpcNodeStatusTransitionFrontier, RpcNodeStatusTransitionFrontierBlockSummary,
-        RpcNodeStatusTransitionFrontierSync, RpcRequestExtraData, RpcScanStateSummary,
-        RpcScanStateSummaryBlock, RpcScanStateSummaryBlockTransaction,
-        RpcScanStateSummaryBlockTransactionKind, RpcScanStateSummaryScanStateJob,
-        RpcSnarkPoolJobFull, RpcSnarkPoolJobSnarkWork, RpcSnarkPoolJobSummary,
-        RpcSnarkerJobCommitResponse, RpcSnarkerJobSpecResponse, RpcTransactionInjectResponse,
-        TransactionStatus,
+        RpcNodeStatus, RpcNodeStatusLedger, RpcNodeStatusNetworkInfo, RpcNodeStatusResources,
+        RpcNodeStatusTransactionPool, RpcNodeStatusTransitionFrontier,
+        RpcNodeStatusTransitionFrontierBlockSummary, RpcNodeStatusTransitionFrontierSync,
+        RpcRequestExtraData, RpcScanStateSummary, RpcScanStateSummaryBlock,
+        RpcScanStateSummaryBlockTransaction, RpcScanStateSummaryBlockTransactionKind,
+        RpcScanStateSummaryScanStateJob, RpcSnarkPoolJobFull, RpcSnarkPoolJobSnarkWork,
+        RpcSnarkPoolJobSummary, RpcSnarkerJobCommitResponse, RpcSnarkerJobSpecResponse,
+        RpcTransactionInjectResponse, TransactionStatus,
     },
     snark_pool::SnarkPoolAction,
     transition_frontier::sync::{
@@ -37,6 +37,7 @@ use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use mina_p2p_messages::{rpc_kernel::QueryHeader, v2};
 use mina_signer::CompressedPubKey;
 use openmina_core::{block::ArcBlockWithHash, bug_condition};
+use openmina_node_account::AccountPublicKey;
 use p2p::channels::streaming_rpc::{
     staged_ledger_parts::calc_total_pieces_to_transfer, P2pStreamingRpcReceiveProgress,
 };
@@ -869,8 +870,31 @@ fn compute_node_status<S: Service>(store: &mut Store<S>) -> RpcNodeStatus {
         .and_then(|idx| block_production_attempts.get(idx))
         .cloned();
 
+    let network_info = RpcNodeStatusNetworkInfo {
+        bind_ip: "0.0.0.0".to_string(),
+        external_ip: state
+            .p2p
+            .config()
+            .external_addrs
+            .first()
+            .map(|addr| addr.to_string()),
+        client_port: state.config.client_port,
+        libp2p_port: state.p2p.config().libp2p_port,
+    };
+
+    let block_producer = state
+        .block_producer
+        .config()
+        .map(|config| AccountPublicKey::from(config.pub_key.clone()));
+    let coinbase_receiver = state
+        .block_producer
+        .config()
+        .map(|config| AccountPublicKey::from(config.coinbase_receiver().clone()));
+
     let status = RpcNodeStatus {
         chain_id,
+        block_producer,
+        coinbase_receiver,
         transition_frontier: RpcNodeStatusTransitionFrontier {
             best_tip: state.transition_frontier.best_tip().map(block_summary),
             sync: RpcNodeStatusTransitionFrontierSync {
@@ -924,6 +948,7 @@ fn compute_node_status<S: Service>(store: &mut Store<S>) -> RpcNodeStatus {
             snark_pool: state.snark_pool.resources_usage(),
         },
         service_queues: store.service.queues(),
+        network_info,
     };
     status
 }

node/testing/src/cluster/mod.rs

@@ -272,6 +272,7 @@ impl Cluster {
                 build: BuildEnv::get().into(),
                 snarker: testing_config.snark_worker,
                 consensus_constants: consensus_consts.clone(),
+                client_port: Some(http_port),
                 testing_run: true,
             },
             p2p: P2pConfig {