rebase from main

rpc-server/src/config.rs

@@ -4,9 +4,9 @@ use std::string::ToString;
 
 // TODO: Improve versioning in future.
 // For now, it's hardcoded and should be updated manually at each release..
-static NEARD_VERSION: &str = "1.36.0";
-static NEARD_BUILD: &str = "1.36.0";
-static RUSTC_VERSION: &str = "1.73.0";
+static NEARD_VERSION: &str = "1.37.0";
+static NEARD_BUILD: &str = "1.37.0";
+static RUSTC_VERSION: &str = "1.75.0";
 
 // Struct to store genesis_config and genesis_block in the server context
 // Fetch once genesis info on start of the server and put it in the context

rpc-server/src/health.rs

@@ -1,7 +1,7 @@
 use crate::config::ServerContext;
 use crate::utils::friendly_memory_size_format;
 use actix_web::Responder;
-use sysinfo::{System, SystemExt};
+use sysinfo::System;
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct RPCHealthStatusResponse {

rpc-server/src/main.rs

@@ -51,7 +51,7 @@ async fn main() -> anyhow::Result<()> {
     });
 
     let rpc = Server::new()
-        .with_data(Data::new(server_context))
+        .with_data(Data::new(server_context.clone()))
         // custom requests methods
         .with_method(
             "view_state_paginated",

rpc-server/src/modules/network/methods.rs

@@ -5,7 +5,7 @@ use near_primitives::utils::from_timestamp;
 use crate::config::ServerContext;
 use crate::errors::RPCError;
 use crate::modules::blocks::utils::fetch_block_from_cache_or_get;
-use crate::modules::network::{clone_protocol_config, parse_validator_request};
+use crate::modules::network::parse_validator_request;
 
 pub async fn client_config(
     _data: Data<ServerContext>,
@@ -14,16 +14,6 @@ pub async fn client_config(
     Err(RPCError::unimplemented_error("client_config"))
 }
 
-pub async fn health(
-    data: Data<ServerContext>,
-    Params(_params): Params<serde_json::Value>,
-) -> Result<near_jsonrpc_primitives::types::status::RpcHealthResponse, RPCError> {
-    Ok(data
-        .near_rpc_client
-        .call(near_jsonrpc_client::methods::health::RpcHealthRequest)
-        .await?)
-}
-
 pub async fn maintenance_windows(
     _data: Data<ServerContext>,
     Params(_params): Params<serde_json::Value>,

rpc-server/src/modules/network/mod.rs

@@ -20,48 +20,3 @@ async fn parse_validator_request(
     };
     Ok(request)
 }
-
-/// cannot move out of dereference of `futures_locks::RwLockReadGuard<FinalBlockInfo>`
-/// move occurs because value `current_protocol_config` has type `ProtocolConfigView`,
-/// which does not implement the `Copy` trait
-pub fn clone_protocol_config(
-    protocol_config: &near_chain_configs::ProtocolConfigView,
-) -> near_chain_configs::ProtocolConfigView {
-    near_chain_configs::ProtocolConfigView {
-        protocol_version: protocol_config.protocol_version,
-        genesis_time: protocol_config.genesis_time,
-        chain_id: protocol_config.chain_id.clone(),
-        genesis_height: protocol_config.genesis_height,
-        num_block_producer_seats: protocol_config.num_block_producer_seats,
-        num_block_producer_seats_per_shard: protocol_config
-            .num_block_producer_seats_per_shard
-            .clone(),
-        avg_hidden_validator_seats_per_shard: protocol_config
-            .avg_hidden_validator_seats_per_shard
-            .clone(),
-        dynamic_resharding: protocol_config.dynamic_resharding,
-        protocol_upgrade_stake_threshold: protocol_config.protocol_upgrade_stake_threshold,
-        epoch_length: protocol_config.epoch_length,
-        gas_limit: protocol_config.gas_limit,
-        min_gas_price: protocol_config.min_gas_price,
-        max_gas_price: protocol_config.max_gas_price,
-        block_producer_kickout_threshold: protocol_config.block_producer_kickout_threshold,
-        chunk_producer_kickout_threshold: protocol_config.chunk_producer_kickout_threshold,
-        online_min_threshold: protocol_config.online_min_threshold,
-        online_max_threshold: protocol_config.online_max_threshold,
-        gas_price_adjustment_rate: protocol_config.gas_price_adjustment_rate,
-        runtime_config: protocol_config.runtime_config.clone(),
-        transaction_validity_period: protocol_config.transaction_validity_period,
-        protocol_reward_rate: protocol_config.protocol_reward_rate,
-        max_inflation_rate: protocol_config.max_inflation_rate,
-        num_blocks_per_year: protocol_config.num_blocks_per_year,
-        protocol_treasury_account: protocol_config.protocol_treasury_account.clone(),
-        fishermen_threshold: protocol_config.fishermen_threshold,
-        minimum_stake_divisor: protocol_config.minimum_stake_divisor,
-        max_kickout_stake_perc: protocol_config.max_kickout_stake_perc,
-        minimum_stake_ratio: protocol_config.minimum_stake_ratio,
-        minimum_validators_per_shard: protocol_config.minimum_validators_per_shard,
-        num_chunk_only_producer_seats: protocol_config.num_chunk_only_producer_seats,
-        shard_layout: protocol_config.shard_layout.clone(),
-    }
-}