Merge remote-tracking branch 'origin/master' into nonrefundable-cost

CHANGELOG.md

@@ -6,6 +6,14 @@
 
 ### Non-protocol Changes
 
+## 1.40.0
+
+### Protocol Changes
+
+**No Changes**
+
+### Non-protocol Changes
+
 ## 1.39.0
 
 ### Protocol Changes
@@ -14,6 +22,14 @@
 
 ### Non-protocol Changes
 
+* Limit overcharging by decoupling minimum_new_receipt_gas from the function call and setting it to a constant value. [#10941](https://github.com/near/nearcore/pull/10941)
+* These PRs introduce a change in the default behaviour of `broadcast_tx_commit`,`send_tx`, `tx, EXPERIMENTAL_tx_status` RPC methods. The default behaviour no longer waits for refund receipts.
+  If you do need to wait for refund receipts, you need ask about it explicitly by using TxExecutionStatus::Final option ("wait_until": "FINAL" in the json request). More information in the
+  [#10792](https://github.com/near/nearcore/pull/10792) [#10948](https://github.com/near/nearcore/pull/10948)
+* Adds improvements to the `sweat` contract prefetcher logic. Add new prefetcher logic for `kaiching` contract. [#10899](https://github.com/near/nearcore/pull/10899)
+* Improves prefetcher logic to speedup chunk finalization by prefetching keys related to refund receipts and actions such as: Delegate, AddKey, DeleteKey. [#10936](https://github.com/near/nearcore/pull/10936)
+* Add more metrics for receipt processing. [#10944](https://github.com/near/nearcore/pull/10944)
+
 ## 1.37.0
 
 ### Protocol Changes

Cargo.toml

@@ -113,7 +113,7 @@ unnecessary_lazy_evaluations = "deny"
 [workspace.dependencies]
 actix = "0.13.0"
 actix-cors = "0.6.1"
-actix-http = "3.3"
+actix-http = "3.6"
 actix-rt = "2"
 actix-web = "4.1"
 anyhow = "1.0.62"
@@ -278,9 +278,10 @@ num-traits = "0.2.15"
 once_cell = "1.13.1"
 openssl = { version = "0.10.60", features = ["vendored"] }
 openssl-probe = "0.1.4"
-opentelemetry = { version = "0.17.0", features = ["rt-tokio", "trace"] }
-opentelemetry-otlp = "0.10.0"
-opentelemetry-semantic-conventions = "0.9.0"
+opentelemetry = { version = "0.22.0", features = ["trace"] }
+opentelemetry_sdk = { version = "0.22.0", features = ["rt-tokio"] }
+opentelemetry-otlp = "0.15.0"
+opentelemetry-semantic-conventions = "0.14.0"
 paperclip = { version = "0.8.0", features = ["actix4"] }
 parity-wasm = { version = "0.42", default-features = false }
 parity-wasm_41 = { package = "parity-wasm", version = "0.41" }
@@ -361,11 +362,11 @@ tokio-stream = { version = "0.1.2", features = ["net"] }
 tokio-util = { version = "0.7.1", features = ["codec", "io"] }
 toml = "0.5.8"
 tqdm = "0.4.4"
-tracing = { version = "0.1.36", features = ["std"] }
-tracing-appender = "0.2.2"
-tracing-opentelemetry = "0.17.0"
+tracing = { version = "0.1.40", features = ["std"] }
+tracing-appender = "0.2.3"
+tracing-opentelemetry = "0.23.0"
 tracing-span-tree = "0.1"
-tracing-subscriber = { version = "0.3.15", features = [
+tracing-subscriber = { version = "0.3.18", features = [
     "env-filter",
     "fmt",
     "registry",
@@ -405,6 +406,7 @@ winapi = { version = "0.3", features = [
 xshell = "0.2.1"
 xz2 = "0.1.6"
 yansi = "0.5.1"
+zstd = "0.13.1"
 
 stdx = { package = "near-stdx", path = "utils/stdx" }
 

chain/chain/src/block_processing_utils.rs

@@ -68,13 +68,6 @@ pub struct BlockProcessingArtifact {
     pub invalid_chunks: Vec<ShardChunkHeader>,
 }
 
-/// This struct defines the callback function that will be called after apply chunks are finished
-/// for each block. Multiple functions that might trigger the start processing of new blocks has
-/// this as an argument. Caller of these functions must note that this callback can be called multiple
-/// times, for different blocks, because these functions may trigger the processing of more than
-/// one block.
-pub type DoneApplyChunkCallback = Arc<dyn Fn(CryptoHash) -> () + Send + Sync + 'static>;
-
 #[derive(Debug)]
 pub struct BlockNotInPoolError;