remove block_hash from queries

Author: kobayurii

database/src/postgres/rpc_server.rs

@@ -310,26 +310,20 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
         let data_range_id = shard_id_pool.data_range_id;
         let sql_query = format!(
             "
-                SELECT block_height, block_hash, data_value
+                SELECT data_value, block_height 
                 FROM state_changes_account_{data_range_id}
                 WHERE account_id = $1
                     AND block_height <= $2
                 ORDER BY block_height DESC
                 LIMIT 1;
             "
         );
-        let (block_height, block_hash, data_value): (bigdecimal::BigDecimal, String, Vec<u8>) =
-            sqlx::query_as(&sql_query)
-                .bind(account_id.to_string())
-                .bind(bigdecimal::BigDecimal::from(request_block_height))
-                .fetch_one(shard_id_pool.pool)
-                .await?;
-        let block = readnode_primitives::BlockRecord::try_from((block_hash, block_height))?;
-        readnode_primitives::QueryData::<near_primitives::account::Account>::try_from((
-            data_value,
-            block.height,
-            block.hash,
-        ))
+        let result: (Vec<u8>, bigdecimal::BigDecimal) = sqlx::query_as(&sql_query)
+            .bind(account_id.to_string())
+            .bind(bigdecimal::BigDecimal::from(request_block_height))
+            .fetch_one(shard_id_pool.pool)
+            .await?;
+        readnode_primitives::QueryData::<near_primitives::account::Account>::try_from(result)
     }
 
     async fn get_contract_code(
@@ -351,26 +345,20 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
         let data_range_id = shard_id_pool.data_range_id;
         let sql_query = format!(
             "
-                SELECT block_height, block_hash, data_value
+                SELECT data_value, block_height
                 FROM state_changes_contract_{data_range_id}
                 WHERE account_id = $1
                     AND block_height <= $2
                 ORDER BY block_height DESC
                 LIMIT 1;
             "
         );
-        let (block_height, block_hash, contract_code): (bigdecimal::BigDecimal, String, Vec<u8>) =
-            sqlx::query_as(&sql_query)
-                .bind(account_id.to_string())
-                .bind(bigdecimal::BigDecimal::from(request_block_height))
-                .fetch_one(shard_id_pool.pool)
-                .await?;
-        let block = readnode_primitives::BlockRecord::try_from((block_hash, block_height))?;
-        Ok(readnode_primitives::QueryData {
-            data: contract_code,
-            block_height: block.height,
-            block_hash: block.hash,
-        })
+        let result: (Vec<u8>, bigdecimal::BigDecimal) = sqlx::query_as(&sql_query)
+            .bind(account_id.to_string())
+            .bind(bigdecimal::BigDecimal::from(request_block_height))
+            .fetch_one(shard_id_pool.pool)
+            .await?;
+        readnode_primitives::QueryData::<Vec<u8>>::try_from(result)
     }
 
     async fn get_access_key(
@@ -394,7 +382,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
         let data_range_id = shard_id_pool.data_range_id;
         let sql_query = format!(
             "
-                SELECT block_height, block_hash, data_value
+                SELECT data_value, block_height
                 FROM state_changes_access_key_{data_range_id}
                 WHERE account_id = $1 
                     AND data_key = $2
@@ -403,19 +391,13 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 LIMIT 1;
             "
         );
-        let (block_height, block_hash, data_value): (bigdecimal::BigDecimal, String, Vec<u8>) =
-            sqlx::query_as(&sql_query)
-                .bind(account_id.to_string())
-                .bind(hex::encode(&key_data).to_string())
-                .bind(bigdecimal::BigDecimal::from(request_block_height))
-                .fetch_one(shard_id_pool.pool)
-                .await?;
-        let block = readnode_primitives::BlockRecord::try_from((block_hash, block_height))?;
-        readnode_primitives::QueryData::<near_primitives::account::AccessKey>::try_from((
-            data_value,
-            block.height,
-            block.hash,
-        ))
+        let result: (Vec<u8>, bigdecimal::BigDecimal) = sqlx::query_as(&sql_query)
+            .bind(account_id.to_string())
+            .bind(hex::encode(&key_data).to_string())
+            .bind(bigdecimal::BigDecimal::from(request_block_height))
+            .fetch_one(shard_id_pool.pool)
+            .await?;
+        readnode_primitives::QueryData::<near_primitives::account::AccessKey>::try_from(result)
     }
 
     async fn get_account_access_keys(

readnode-primitives/src/lib.rs

@@ -220,12 +220,11 @@ pub type StateValue = Vec<u8>;
 pub struct BlockHeightShardId(pub u64, pub u64);
 pub struct QueryData<T: borsh::BorshDeserialize> {
     pub data: T,
-    // block_height and block_hash we return here represents the moment
+    // block_height we return here represents the moment
     // when the data was last updated in the database
     // We used to return it in the `QueryResponse` but it was replaced with
     // the logic that corresponds the logic of the `nearcore` RPC API
     pub block_height: near_indexer_primitives::types::BlockHeight,
-    pub block_hash: CryptoHash,
 }
 
 #[derive(Debug, Clone)]
@@ -300,31 +299,20 @@ where
     }
 }
 
-impl<T>
-    TryFrom<(
-        Vec<u8>,
-        near_indexer_primitives::types::BlockHeight,
-        CryptoHash,
-    )> for QueryData<T>
+impl<T, B> TryFrom<(Vec<u8>, B)> for QueryData<T>
 where
     T: borsh::BorshDeserialize,
+    B: ToPrimitive,
 {
     type Error = anyhow::Error;
 
-    fn try_from(
-        value: (
-            Vec<u8>,
-            near_indexer_primitives::types::BlockHeight,
-            CryptoHash,
-        ),
-    ) -> Result<Self, Self::Error> {
+    fn try_from(value: (Vec<u8>, B)) -> Result<Self, Self::Error> {
         let data = T::try_from_slice(&value.0)?;
-
-        Ok(Self {
-            data,
-            block_height: value.1,
-            block_hash: value.2,
-        })
+        let block_height = value
+            .1
+            .to_u64()
+            .ok_or_else(|| anyhow::anyhow!("Failed to parse `block_height` to u64"))?;
+        Ok(Self { data, block_height })
     }
 }