fix paginated state

Author: kobayurii

database/src/postgres/rpc_server.rs

@@ -74,24 +74,43 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
         } else {
             crate::postgres::PageState::new(1000)
         };
-        let mut stream = sqlx::query_as::<_, (String, Vec<u8>)>(
-            "
+        let mut stream = if let Some(last_data_key) = &page_state.last_data_key {
+            sqlx::query_as::<_, (String, Vec<u8>)>(
+                "
                 SELECT data_key, data_value
                 FROM state_changes_data_compact
                 WHERE account_id = $1
                   AND block_height_from <= $2
                   AND (block_height_to IS NULL OR block_height_to > $2)
-                  AND ($3 IS NULL OR data_key > $3)
+                  AND data_key > $3
                 ORDER BY
                     data_key ASC
                 LIMIT $4;
                 ",
-        )
-        .bind(account_id.to_string())
-        .bind(block_height as i64) // Convert to i64 for database compatibility
-        .bind(page_state.last_data_key.clone())
-        .bind(page_state.page_size)
-        .fetch(shard_id_pool.pool);
+            )
+            .bind(account_id.to_string())
+            .bind(block_height as i64) // Convert to i64 for database compatibility
+            .bind(last_data_key.clone())
+            .bind(page_state.page_size)
+            .fetch(shard_id_pool.pool)
+        } else {
+            sqlx::query_as::<_, (String, Vec<u8>)>(
+                "
+                SELECT data_key, data_value
+                FROM state_changes_data_compact
+                WHERE account_id = $1
+                  AND block_height_from <= $2
+                  AND (block_height_to IS NULL OR block_height_to > $2)
+                ORDER BY
+                    data_key ASC
+                LIMIT $4;
+                ",
+            )
+            .bind(account_id.to_string())
+            .bind(block_height as i64) // Convert to i64 for database compatibility
+            .bind(page_state.page_size)
+            .fetch(shard_id_pool.pool)
+        };
         let mut items = std::collections::HashMap::new();
         let mut last_data_key = String::new();
         while let Some(row) = stream.next().await {

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

@@ -17,7 +17,7 @@ pub async fn get_state_from_db_paginated(
 
     let account = data
         .db_manager
-        .get_account(account_id, block.header.height, "query_view_state")
+        .get_account(account_id, block.header.height, "view_state_paginated")
         .await
         .map_err(
             |_err| near_jsonrpc::primitives::types::query::RpcQueryError::UnknownAccount {
@@ -32,7 +32,7 @@ pub async fn get_state_from_db_paginated(
     // more details: nearcore/runtime/runtime/src/state_viewer/mod.rs:150
     let code_len = data
         .db_manager
-        .get_contract_code(account_id, block.header.height, "query_view_state")
+        .get_contract_code(account_id, block.header.height, "view_state_paginated")
         .await
         .map(|code| code.data.len() as u64)
         .unwrap_or_default();