chore: bump nearcore to 2.4.0 rc.1, Rust toolchain to 1.82.0 (#183)

* chore: bump near core to 2.4.0-rc.1 * make clippy happy * Fix comments fmt
aurora-is-near · Nov 21, 2024 · 288446a · 288446a
1 parent ce8340c
commit 288446a
Show file tree

Hide file tree

Showing 9 changed files with 1,192 additions and 664 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Aurora Labs <[email protected]>"]
-version = "0.29.0-2.3.1"
+version = "0.29.0-2.4.0-rc.1"
 edition = "2021"
 homepage = "https://github.com/aurora-is-near/aurora-standalone"
 repository = "https://github.com/aurora-is-near/aurora-standalone"
@@ -37,9 +37,9 @@ hex = "0.4"
 impl-serde = "0.5"
 lazy_static = "1"
 lru = "0.12"
-near-crypto = { git = "https://github.com/near/nearcore", tag = "2.3.1" }
-near-indexer = { git = "https://github.com/near/nearcore", tag = "2.3.1" }
-near-primitives = { git = "https://github.com/near/nearcore", tag = "2.3.1" }
+near-crypto = { git = "https://github.com/near/nearcore", tag = "2.4.0-rc.1" }
+near-indexer = { git = "https://github.com/near/nearcore", tag = "2.4.0-rc.1" }
+near-primitives = { git = "https://github.com/near/nearcore", tag = "2.4.0-rc.1" }
 near-lake-framework = "0.7"
 prometheus = "0.13"
 rlp = "0.5"

diff --git a/refiner-app/src/conversion/mod.rs b/refiner-app/src/conversion/mod.rs
@@ -9,7 +9,7 @@ pub fn convert(block: StreamerMessage) -> NEARBlock {
             .shards
             .into_iter()
             .map(|shard| Shard {
-                shard_id: shard.shard_id,
+                shard_id: shard.shard_id.into(),
                 chunk: shard.chunk.map(|chunk| ChunkView {
                     author: ch_json(chunk.author),
                     header: ChunkHeaderView {

diff --git a/refiner-app/src/socket.rs b/refiner-app/src/socket.rs
@@ -114,7 +114,7 @@ async fn handle_msg(
 ) -> Result<serde_json::Value, JsonRpcError<String>> {
     match msg
         .get("method")
-        .ok_or(JsonRpcError {
+        .ok_or_else(|| JsonRpcError {
             code: -32600,
             message: "Invalid Request".into(),
             data: Some("no method defined".into()),

diff --git a/refiner-lib/src/tx_hash_tracker.rs b/refiner-lib/src/tx_hash_tracker.rs
@@ -2,8 +2,9 @@ use aurora_refiner_types::{near_block::NEARBlock, near_primitives::hash::CryptoH
 use std::path::Path;
 
 /// A helper object for tracking the NEAR transaction hash that caused each NEAR receipt
-/// to be produced (potentially indirectly via a number of other receipts). The main interface
-/// includes the `get_tx_hash` function to query the helper for the transaction hash associated
+/// to be produced (potentially indirectly via a number of other receipts).
+///
+/// The main interface includes the `get_tx_hash` function to query the helper for the transaction hash associated
 /// with a given receipt hash, and two functions to mutate the tracker's state:
 /// `consume_near_block` and `on_block_end`. The purpose of `consume_near_block` is to update
 /// the tracker's state with the new receipts that are created in that block. The purpose of

diff --git a/refiner-types/src/aurora_block.rs b/refiner-types/src/aurora_block.rs
@@ -87,8 +87,9 @@ pub struct NearBlockHeader {
     pub author: AccountId,
 }
 
-/// Similar to Ethereum transaction but only contains information relevant for Aurora. It includes
-/// the information of the receipt after executing the transaction as well. In addition it contains
+/// Similar to Ethereum transaction but only contains information relevant for Aurora.
+///
+/// It includes the information of the receipt after executing the transaction as well. In addition it contains
 /// extra metadata to map it into a NEAR transaction.
 ///
 /// ## Fields from Ethereum transactions and receipts not included:

diff --git a/refiner-types/src/near_block.rs b/refiner-types/src/near_block.rs
@@ -263,6 +263,9 @@ impl Clone for Shard {
                         }
                         StateChangeCauseView::Migration => StateChangeCauseView::Migration,
                         StateChangeCauseView::ReshardingV2 => StateChangeCauseView::ReshardingV2,
+                        StateChangeCauseView::BandwidthSchedulerStateUpdate => {
+                            StateChangeCauseView::BandwidthSchedulerStateUpdate
+                        }
                     },
                     value: match &v.value {
                         StateChangeValueView::AccountUpdate {

diff --git a/refiner-types/src/utils.rs b/refiner-types/src/utils.rs
@@ -5,6 +5,7 @@ const U64_MAX: U256 = U256([u64::MAX, 0, 0, 0]);
 
 pub mod u64_hex_serde {
     //! This module provides serde serialization for u64 numbers with hexadecimal encoding.
+    //!
     //! It can be used with the field attribute `#[serde(with = "u64_hex_serde")]` on u64
     //! inside structs deriving serde Serialize and Deserialize traits.
     //! Note: if a number is larger than U256::MAX then the deserializing will fail with an error.
@@ -38,6 +39,7 @@ pub mod u64_hex_serde {
 
 pub mod u128_dec_serde {
     //! This module provides serde serialization for optional u128 numbers with base-10 strings.
+    //!
     //! It can be used with the field attribute `#[serde(with = "u128_dec_serde")]` on u128 fields
     //! inside structs deriving serde Serialize and Deserialize traits.
 

diff --git a/rust-toolchain b/rust-toolchain
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.81.0"
+channel = "1.82.0"
 components = [ "rustfmt", "clippy" ]
 targets = [ "wasm32-unknown-unknown" ]