Merge branch 'master' into restrict-ethereum-address

.gitignore

@@ -61,4 +61,4 @@ rusty-tags.vi
 # Estimator generated files
 costs-*.txt
 names-to-stats.txt
-data_dump_*.bin
+data_dump_*.bin

CHANGELOG.md

@@ -11,6 +11,11 @@
 * New option `transaction_pool_size_limit` in `config.json` allows to limit the size of the node's transaction pool.
   By default the limit is set to 100 MB. [#3284](https://github.com/near/nearcore/issues/3284)
 * Database snapshots at the end of an epoch. This lets a node obtain state parts using flat storage. [#9090](https://github.com/near/nearcore/pull/9090)
+* Number of transactions included in a chunk will be lowered if there is a congestion of more than 20000 delayed receipts in a shard. [#9222](https://github.com/near/nearcore/pull/9222)
+* Our more efficient and scalable V2 routing protocol is implemented. It shadows the V1 protocol for now while we verify its performance. [#9187](https://github.com/near/nearcore/pull/9187)
+* The default config now enables TIER1 outbound connections by default. [#9349](https://github.com/near/nearcore/pull/9349)
+* State Sync from GCS is available for experimental use. [#9398](https://github.com/near/nearcore/pull/9398)
+* Add prometheus metrics for the internal state of the doomslug. [#9458](https://github.com/near/nearcore/pull/9458)
 
 ## 1.35.0
 

CONTRIBUTING.md

@@ -63,7 +63,7 @@ Proposal](https://github.com/near/NEPs/blob/master/neps/nep-0001.md) process.
 All the contributions to `nearcore` happen via Pull Requests.  Please follow the
 following steps when creating a PR:
 
-1. Fork the `nearcore` repository and create a new branch there to do you work.
+1. Fork the `nearcore` repository and create a new branch there to do your work.
 2. The branch can contain any number of commits.  When merged, all commits will
    be squashed into a single commit.
 3. The changes should be thoroughly tested.  Please refer to [this
@@ -100,10 +100,12 @@ following steps when creating a PR:
 need to pass before a PR can be merged.
 2. When all the comments from the reviewer(s) have been addressed, they should
 approve the PR allowing a PR to be merged.
-3. An approved PR can be merged by adding the `S-automerge` label to it.  The
-label can be added by the author if they have the appropriate access or by a
-reviewer otherwise.  PR authors can also apply label immediately after filing a
-PR: removing an additional round-trip after PR is approved.
+3. An approved PR can be merged by clicking the "Merge when ready" button.  The
+button can be clicked by the author if they have the appropriate access, or by a
+reviewer otherwise.  PR authors can also click the button immediately after filing
+a PR; removing an additional round-trip after the PR gets approved. The PR author
+will be notified by email by github if the PR fails to land, once it has entered
+the merge queue (ie. after it has passed PR CI and gotten an approving review).
 
 ## Code review process
 

Cargo.toml

@@ -2,7 +2,7 @@
 version = "0.0.0" # managed by cargo-workspaces, see below
 authors = ["Near Inc <[email protected]>"]
 edition = "2021"
-rust-version = "1.71.0"
+rust-version = "1.72.0"
 repository = "https://github.com/near/nearcore"
 license = "MIT OR Apache-2.0"
 
@@ -12,6 +12,7 @@ version = "0.17.0"
 exclude = ["neard"]
 
 [workspace]
+resolver = "2"
 members = [
     "chain/chain",
     "chain/chunks",

chain/chain-primitives/src/error.rs

@@ -188,6 +188,9 @@ pub enum Error {
     /// Invalid block merkle root.
     #[error("Invalid Block Merkle Root")]
     InvalidBlockMerkleRoot,
+    /// Invalid split shard ids.
+    #[error("Invalid Split Shard Ids when resharding. shard_id: {0}, parent_shard_id: {1}")]
+    InvalidSplitShardsIds(u64, u64),
     /// Someone is not a validator. Usually happens in signature verification
     #[error("Not A Validator")]
     NotAValidator,
@@ -271,6 +274,7 @@ impl Error {
             | Error::InvalidStatePayload
             | Error::InvalidTransactions
             | Error::InvalidChallenge
+            | Error::InvalidSplitShardsIds(_, _)
             | Error::MaliciousChallenge
             | Error::IncorrectNumberOfChunkHeaders
             | Error::InvalidEpochHash

chain/chain/Cargo.toml

@@ -10,8 +10,10 @@ actix.workspace = true
 ansi_term.workspace = true
 assert_matches.workspace = true
 borsh.workspace = true
+bytesize.workspace = true
 chrono.workspace = true
 crossbeam-channel.workspace = true
+delay-detector.workspace = true
 enum-map.workspace = true
 itertools.workspace = true
 itoa.workspace = true
@@ -25,7 +27,6 @@ strum.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 
-delay-detector.workspace = true
 near-chain-configs.workspace = true
 near-chain-primitives.workspace = true
 near-crypto.workspace = true
@@ -48,13 +49,19 @@ expensive_tests = []
 test_features = []
 delay_detector = ["delay-detector/delay_detector"]
 no_cache = ["near-store/no_cache"]
-protocol_feature_reject_blocks_with_outdated_protocol_version = ["near-primitives/protocol_feature_reject_blocks_with_outdated_protocol_version"]
-protocol_feature_block_header_v4 = ["near-primitives/protocol_feature_block_header_v4"]
+new_epoch_sync = ["near-store/new_epoch_sync", "near-primitives/new_epoch_sync"]
+
+protocol_feature_reject_blocks_with_outdated_protocol_version = [
+  "near-primitives/protocol_feature_reject_blocks_with_outdated_protocol_version",
+]
+protocol_feature_simple_nightshade_v2 = [
+  "near-primitives/protocol_feature_simple_nightshade_v2",
+]
 
 nightly = [
   "nightly_protocol",
-  "protocol_feature_block_header_v4",
   "protocol_feature_reject_blocks_with_outdated_protocol_version",
+  "protocol_feature_simple_nightshade_v2",
   "near-chain-configs/nightly",
   "near-client-primitives/nightly",
   "near-epoch-manager/nightly",