improvements according pr comments

Author: kobayurii

configuration/src/configs/general.rs

@@ -21,7 +21,7 @@ pub struct GeneralRpcServerConfig {
     pub block_cache_size: f64,
     pub shadow_data_consistency_rate: f64,
     pub prefetch_state_size_limit: u64,
-    pub available_data_ranges: u64,
+    pub keep_data_ranges_number: u64,
     pub archival_mode: bool,
 }
 
@@ -127,7 +127,7 @@ pub struct CommonGeneralRpcServerConfig {
         message = "Available data ranges must be greater than or equal to 1"
     ))]
     #[serde(deserialize_with = "deserialize_optional_data_or_env", default)]
-    pub available_data_ranges: Option<u64>,
+    pub keep_data_ranges_number: Option<u64>,
     #[serde(deserialize_with = "deserialize_optional_data_or_env", default)]
     pub archival_mode: Option<bool>,
 }
@@ -157,12 +157,12 @@ impl CommonGeneralRpcServerConfig {
         100_000
     }
 
-    pub fn default_available_data_ranges() -> u64 {
+    pub fn default_keep_data_ranges_number() -> u64 {
         1
     }
 
     pub fn default_archival_mode() -> bool {
-        false
+        true
     }
 }
 
@@ -175,7 +175,7 @@ impl Default for CommonGeneralRpcServerConfig {
             block_cache_size: Some(Self::default_block_cache_size()),
             shadow_data_consistency_rate: Some(Self::default_shadow_data_consistency_rate()),
             prefetch_state_size_limit: Some(Self::default_prefetch_state_size_limit()),
-            available_data_ranges: Some(Self::default_available_data_ranges()),
+            keep_data_ranges_number: Some(Self::default_keep_data_ranges_number()),
             archival_mode: Some(Self::default_archival_mode()),
         }
     }
@@ -282,10 +282,10 @@ impl From<CommonGeneralConfig> for GeneralRpcServerConfig {
                 .rpc_server
                 .prefetch_state_size_limit
                 .unwrap_or_else(CommonGeneralRpcServerConfig::default_prefetch_state_size_limit),
-            available_data_ranges: common_config
+            keep_data_ranges_number: common_config
                 .rpc_server
-                .available_data_ranges
-                .unwrap_or_else(CommonGeneralRpcServerConfig::default_available_data_ranges),
+                .keep_data_ranges_number
+                .unwrap_or_else(CommonGeneralRpcServerConfig::default_keep_data_ranges_number),
             archival_mode: common_config
                 .rpc_server
                 .archival_mode

configuration/src/default_env_configs.rs

@@ -31,14 +31,15 @@ rpc_auth_token = "${RPC_AUTH_TOKEN}"
 redis_url = "${REDIS_URL}"
 
 ## Represents the number of available data ranges.
-## 1 means it will be available last 500_000 blocks (~11 epochs).
+## 1 means it will be available last 500_000 blocks (~11 epochs).cargo fmt
 ## 2 means it will be available last 1_000_000 blocks (~22 epochs) etc.
 ## Default value is 1
-available_data_ranges = "${AVAILABLE_DATA_RANGES}"
+keep_data_ranges_number = "${KEEP_DATA_RANGES_NUMBER}"
 
 ## If true, means we store whole state changes in the database 
-## and available_data_ranges will be ignored 
+## and keep_data_ranges_number will be ignored 
 ## and genesis block_height will be used as earliest_available_block_height
+## Default value is true
 archival_mode = "${ARCHIVAL_MODE}"
 
 ### Rpc server general configuration

configuration/src/utils.rs

@@ -41,25 +41,25 @@ pub async fn get_data_range_id(
 /// This function calculates the earliest available block height based on the final block height
 pub async fn get_earliest_available_block_height(
     final_block_height: u64,
-    available_data_ranges: u64,
+    keep_data_ranges_number: u64,
 ) -> anyhow::Result<u64> {
     let final_range_id = get_data_range_id(&final_block_height).await?;
-    Ok(final_range_id * 100_000 + available_data_ranges * BLOCK_HEIGHT_RANGE)
+    Ok(final_range_id * 100_000 + keep_data_ranges_number * BLOCK_HEIGHT_RANGE)
 }
 
 /// This function checks if the block height is available in the database
 /// It returns an error if the block height is less than the earliest available block
-pub async fn check_block_height(
+pub async fn check_block_height_availability(
     block_height: &near_primitives::types::BlockHeight,
     final_block_height: &near_primitives::types::BlockHeight,
-    available_data_ranges: u64,
+    keep_data_ranges_number: u64,
     archival_mode: bool,
 ) -> anyhow::Result<()> {
     if archival_mode {
         return Ok(());
     }
     let earliest_available_block =
-        get_earliest_available_block_height(*final_block_height, available_data_ranges).await?;
+        get_earliest_available_block_height(*final_block_height, keep_data_ranges_number).await?;
     if *block_height < earliest_available_block {
         anyhow::bail!(
             "The data for block #{} is garbage collected on this node, use an archival node to fetch historical data",

database/src/postgres/migrations/shard_db/20250521171609_drop_block_hash_from_state_changes.up.sql

@@ -1,11 +1,5 @@
 -- Add up migration script here
-DO $$
-DECLARE
-    i INT;
-BEGIN
-    -- Drop column from parent table
-    ALTER TABLE state_changes_data DROP COLUMN IF EXISTS block_hash;
-    ALTER TABLE state_changes_access_key DROP COLUMN IF EXISTS block_hash;
-    ALTER TABLE state_changes_contract DROP COLUMN IF EXISTS block_hash;
-    ALTER TABLE state_changes_account DROP COLUMN IF EXISTS block_hash;
-END $$;
+ALTER TABLE state_changes_data DROP COLUMN IF EXISTS block_hash;
+ALTER TABLE state_changes_access_key DROP COLUMN IF EXISTS block_hash;
+ALTER TABLE state_changes_contract DROP COLUMN IF EXISTS block_hash;
+ALTER TABLE state_changes_account DROP COLUMN IF EXISTS block_hash;

database/src/postgres/mod.rs

@@ -45,7 +45,7 @@ impl PageState {
 /// block_height 130_501_000, the `data_range_id` will be 1305 -> `state_changes_data_1305`
 ///
 /// How to get `data_range_id` from block_height
-/// see more details in the `get_data_range_id` function below.
+/// see more details in the function `configuration::utils::get_data_range_id`.
 pub struct ShardIdPool<'a> {
     shard_id: near_primitives::types::ShardId,
     data_range_id: u64,

rpc-server/src/config.rs

@@ -75,9 +75,9 @@ pub struct ServerContext {
     /// Binary version.
     pub version: near_primitives::version::Version,
     /// Available data ranges for regular node mode.
-    pub available_data_ranges: u64,
+    pub keep_data_ranges_number: u64,
     /// Archival mode.
-    /// If true, available_data_ranges will be ignored
+    /// If true, keep_data_ranges_number will be ignored
     pub archival_mode: bool,
 }
 
@@ -188,7 +188,7 @@ impl ServerContext {
                 commit: NEARD_COMMIT.to_string(),
                 rustc_version: RUSTC_VERSION.to_string(),
             },
-            available_data_ranges: rpc_server_config.general.available_data_ranges,
+            keep_data_ranges_number: rpc_server_config.general.keep_data_ranges_number,
             archival_mode: rpc_server_config.general.archival_mode,
         })
     }

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

@@ -408,15 +408,15 @@ pub async fn fetch_block(
             Ok(data.genesis_info.genesis_block.header.height)
         }
     }?;
-    configuration::utils::check_block_height(
+    configuration::utils::check_block_height_availability(
         &block_height,
         &data
             .blocks_info_by_finality
             .optimistic_block_view()
             .await
             .header
             .height,
-        data.available_data_ranges,
+        data.keep_data_ranges_number,
         data.archival_mode,
     )
     .await
@@ -531,15 +531,15 @@ pub async fn fetch_chunk(
             .map(|block_height_shard_id| (block_height_shard_id.0, block_height_shard_id.1))?,
     };
 
-    configuration::utils::check_block_height(
+    configuration::utils::check_block_height_availability(
         &block_height,
         &data
             .blocks_info_by_finality
             .optimistic_block_view()
             .await
             .header
             .height,
-        data.available_data_ranges,
+        data.keep_data_ranges_number,
         data.archival_mode,
     )
     .await

rpc-server/src/modules/blocks/utils.rs

@@ -128,15 +128,15 @@ pub async fn fetch_block_from_cache_or_get(
                         }
                     })?,
             };
-            configuration::utils::check_block_height(
+            configuration::utils::check_block_height_availability(
                 &block_height,
                 &data
                     .blocks_info_by_finality
                     .optimistic_block_view()
                     .await
                     .header
                     .height,
-                data.available_data_ranges,
+                data.keep_data_ranges_number,
                 data.archival_mode,
             )
             .await