Merge branch 'master' into protocol-struct

near · Jul 3, 2024 · ccd6f57 · ccd6f57
2 parents 96cf370 + f3287d3
commit ccd6f57
Show file tree

Hide file tree

Showing 180 changed files with 4,041 additions and 2,224 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,9 +3,13 @@
 ## [unreleased]
 
 ### Protocol Changes
+* Congestion Control [NEP-0539](https://github.com/near/NEPs/pull/539)
+* Stateless Validation [NEP-0509](https://github.com/near/NEPs/pull/509)
 
 ### Non-protocol Changes
 
+* Enforce rate limits to received network messages [#11617](https://github.com/near/nearcore/issues/11617). Rate limits are configured by default, but they can be overridden through the experimental configuration option `received_messages_rate_limits`.
+
 ## 1.40.0
 
 ### Protocol Changes

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -150,6 +150,7 @@ cargo_metadata = "0.14.1"
 cc = "1.0"
 cfg-if = "1.0"
 chrono = { version = "0.4", default-features = false, features = [
+    "clock",
     "alloc",
     "serde",
 ] }

diff --git a/chain/chain-primitives/Cargo.toml b/chain/chain-primitives/Cargo.toml
@@ -16,7 +16,7 @@ thiserror.workspace = true
 time.workspace = true
 tracing.workspace = true
 
-near-async.workspace = true
+near-time.workspace = true
 near-primitives.workspace = true
 near-crypto.workspace = true
 

diff --git a/chain/chain-primitives/src/error.rs b/chain/chain-primitives/src/error.rs
@@ -1,10 +1,10 @@
-use near_async::time::Utc;
 use near_primitives::block::BlockValidityError;
 use near_primitives::challenge::{ChunkProofs, ChunkState};
 use near_primitives::errors::{EpochError, StorageError};
 use near_primitives::shard_layout::ShardLayoutError;
 use near_primitives::sharding::{ChunkHash, ShardChunkHeader};
 use near_primitives::types::{BlockHeight, EpochId, ShardId};
+use near_time::Utc;
 use std::io;
 
 #[derive(thiserror::Error, Debug)]

diff --git a/chain/chain/Cargo.toml b/chain/chain/Cargo.toml
@@ -118,3 +118,4 @@ statelessnet_protocol = [
   "near-primitives/statelessnet_protocol",
 ]
 sandbox = ["near-o11y/sandbox", "near-primitives/sandbox"]
+testloop = []