From 1d00c62baff5001b3ab23952b39ec5a4ab9f9496 Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Thu, 21 Nov 2024 11:33:02 +0200 Subject: [PATCH] chore: bump new version 2.4.0-rc.1 (#115) --- .cargo/config.toml | 2 +- CHANGELOG.md | 5 + Cargo.lock | 313 ++++++++++++++++++++++++--------------------- Cargo.toml | 12 +- Dockerfile | 2 +- rust-toolchain | 2 +- src/main.rs | 1 + 7 files changed, 183 insertions(+), 154 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index f65a195..5e8aceb 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ [env] -NEARCORE_VERSION = "2.3.1-2bce389" +NEARCORE_VERSION = "2.4.0-rc.1-a83c184" diff --git a/CHANGELOG.md b/CHANGELOG.md index eca60f7..25f9027 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2.4.0-rc.1 + +* Upgrade Indexer Framework to be based on [nearcore 2.4.0-rc.1](https://github.com/near/nearcore/releases/tag/2.4.0-rc.1) +* Bump the minimal supported Rust version to `1.82.0` (following the `nearcore` master branch) + ## 2.3.1 * Upgrade Indexer Framework to be based on [nearcore 2.3.1](https://github.com/near/nearcore/releases/tag/2.3.1) diff --git a/Cargo.lock b/Cargo.lock index 134d620..acbb623 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -581,7 +581,7 @@ dependencies = [ "rust-ini", "serde", "serde-xml-rs", - "thiserror", + "thiserror 1.0.69", "time", "url", ] @@ -592,7 +592,7 @@ version = "0.25.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9aed3f9c7eac9be28662fdb3b0f4d1951e812f7c64fed4f0327ba702f459b3b" dependencies = [ - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2198,7 +2198,7 @@ dependencies = [ "dissimilar", "num-traits", "prefix-sum-vec", - "thiserror", + "thiserror 1.0.69", "wasm-encoder 0.27.0", "wasmparser 0.105.0", "wasmprinter", @@ -3394,8 +3394,8 @@ dependencies = [ [[package]] name = "near-async" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "derive_more", @@ -3414,8 +3414,8 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "proc-macro2", "quote", @@ -3424,16 +3424,16 @@ dependencies = [ [[package]] name = "near-cache" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "lru 0.12.5", ] [[package]] name = "near-chain" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "assert_matches", @@ -3446,6 +3446,7 @@ dependencies = [ "itertools 0.10.5", "itoa", "lru 0.12.5", + "more-asserts", "near-async", "near-cache", "near-chain-configs", @@ -3473,16 +3474,16 @@ dependencies = [ "serde", "strum", "tempfile", - "thiserror", + "thiserror 2.0.3", "time", + "tokio", "tracing", - "yansi", ] [[package]] name = "near-chain-configs" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "bytesize", @@ -3505,21 +3506,21 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-crypto", "near-primitives", "near-time", - "thiserror", + "thiserror 2.0.3", "time", "tracing", ] [[package]] name = "near-chunks" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "borsh", @@ -3550,8 +3551,8 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-chain-primitives", "near-primitives", @@ -3559,8 +3560,8 @@ dependencies = [ [[package]] name = "near-client" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-rt", @@ -3608,17 +3609,19 @@ dependencies = [ "strum", "sysinfo", "tempfile", - "thiserror", + "thiserror 2.0.3", "time", "tokio", + "tokio-stream", + "tokio-util", "tracing", "yansi", ] [[package]] name = "near-client-primitives" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "chrono", @@ -3631,27 +3634,26 @@ dependencies = [ "serde", "serde_json", "strum", - "thiserror", + "thiserror 2.0.3", "time", "tracing", - "yansi", ] [[package]] name = "near-config-utils" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "json_comments", - "thiserror", + "thiserror 2.0.3", "tracing", ] [[package]] name = "near-crypto" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "blake2", "borsh", @@ -3670,13 +3672,13 @@ dependencies = [ "serde", "serde_json", "subtle", - "thiserror", + "thiserror 2.0.3", ] [[package]] name = "near-dyn-configs" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "near-chain-configs", @@ -3687,15 +3689,15 @@ dependencies = [ "prometheus", "serde", "serde_json", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "near-epoch-manager" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh", "itertools 0.10.5", @@ -3720,16 +3722,16 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-primitives-core", ] [[package]] name = "near-indexer" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "anyhow", @@ -3755,8 +3757,8 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-primitives", "serde", @@ -3765,8 +3767,8 @@ dependencies = [ [[package]] name = "near-jsonrpc" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-cors", @@ -3795,8 +3797,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix-http", "awc", @@ -3809,8 +3811,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "arbitrary", "near-chain-configs", @@ -3820,13 +3822,13 @@ dependencies = [ "near-schema-checker-lib", "serde", "serde_json", - "thiserror", + "thiserror 2.0.3", "time", ] [[package]] name = "near-lake" -version = "2.3.1" +version = "2.4.0-rc.1" dependencies = [ "actix", "anyhow", @@ -3856,8 +3858,8 @@ dependencies = [ [[package]] name = "near-mainnet-res" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-account-id", "near-chain-configs", @@ -3867,8 +3869,8 @@ dependencies = [ [[package]] name = "near-network" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "anyhow", @@ -3909,7 +3911,7 @@ dependencies = [ "smart-default", "strum", "stun", - "thiserror", + "thiserror 2.0.3", "time", "tokio", "tokio-stream", @@ -3919,8 +3921,8 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "base64 0.21.7", @@ -3934,7 +3936,7 @@ dependencies = [ "prometheus", "serde", "serde_json", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", "tracing-appender", @@ -3944,8 +3946,8 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh", "enum-map", @@ -3957,13 +3959,13 @@ dependencies = [ "serde_repr", "serde_yaml", "strum", - "thiserror", + "thiserror 2.0.3", ] [[package]] name = "near-performance-metrics" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "bitflags 1.3.2", @@ -3977,8 +3979,8 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "quote", "syn 2.0.87", @@ -3986,8 +3988,8 @@ dependencies = [ [[package]] name = "near-pool" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh", "near-crypto", @@ -3998,8 +4000,8 @@ dependencies = [ [[package]] name = "near-primitives" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "arbitrary", "base64 0.21.7", @@ -4033,15 +4035,15 @@ dependencies = [ "sha3", "smart-default", "strum", - "thiserror", + "thiserror 2.0.3", "tracing", "zstd", ] [[package]] name = "near-primitives-core" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "arbitrary", "base64 0.21.7", @@ -4055,13 +4057,13 @@ dependencies = [ "serde", "serde_repr", "sha2", - "thiserror", + "thiserror 2.0.3", ] [[package]] name = "near-rosetta-rpc" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-cors", @@ -4085,19 +4087,19 @@ dependencies = [ "serde", "serde_json", "strum", - "thiserror", + "thiserror 2.0.3", "tokio", ] [[package]] name = "near-schema-checker-core" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" [[package]] name = "near-schema-checker-lib" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "near-schema-checker-core", "near-schema-checker-macro", @@ -4105,18 +4107,18 @@ dependencies = [ [[package]] name = "near-schema-checker-macro" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" [[package]] name = "near-stdx" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" [[package]] name = "near-store" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-rt", @@ -4152,15 +4154,15 @@ dependencies = [ "smallvec", "strum", "tempfile", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "near-telemetry" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "awc", @@ -4178,8 +4180,8 @@ dependencies = [ [[package]] name = "near-time" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "serde", "time", @@ -4188,8 +4190,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "enumset", "finite-wasm", @@ -4197,15 +4199,15 @@ dependencies = [ "near-vm-vm", "rkyv", "target-lexicon 0.12.16", - "thiserror", + "thiserror 2.0.3", "tracing", "wasmparser 0.99.0", ] [[package]] name = "near-vm-compiler-singlepass" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -4224,8 +4226,8 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -4240,14 +4242,14 @@ dependencies = [ "rustc-demangle", "rustix", "target-lexicon 0.12.16", - "thiserror", + "thiserror 2.0.3", "tracing", ] [[package]] name = "near-vm-runner" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "blst", @@ -4284,7 +4286,7 @@ dependencies = [ "sha3", "strum", "tempfile", - "thiserror", + "thiserror 2.0.3", "tracing", "wasm-encoder 0.27.0", "wasmer-compiler-near", @@ -4302,19 +4304,19 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "indexmap 1.9.3", "num-traits", "rkyv", - "thiserror", + "thiserror 2.0.3", ] [[package]] name = "near-vm-vm" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "backtrace", "cc", @@ -4327,15 +4329,15 @@ dependencies = [ "near-vm-types", "region", "rkyv", - "thiserror", + "thiserror 2.0.3", "tracing", "winapi", ] [[package]] name = "near-wallet-contract" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "anyhow", "near-primitives-core", @@ -4344,8 +4346,8 @@ dependencies = [ [[package]] name = "nearcore" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "actix", "actix-rt", @@ -4363,6 +4365,7 @@ dependencies = [ "hyper", "hyper-tls", "indicatif", + "itertools 0.10.5", "near-async", "near-chain", "near-chain-configs", @@ -4400,7 +4403,7 @@ dependencies = [ "smart-default", "strum", "tempfile", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", "xz2", @@ -4433,8 +4436,8 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.3.1" -source = "git+https://github.com/near/nearcore?rev=2bce389e4fd9273b78e4efbb16fb3317a7389b5b#2bce389e4fd9273b78e4efbb16fb3317a7389b5b" +version = "2.4.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=a83c18490cf4dafaedca01458f365dc5871bd293#a83c18490cf4dafaedca01458f365dc5871bd293" dependencies = [ "borsh", "near-crypto", @@ -4451,7 +4454,7 @@ dependencies = [ "rayon", "serde_json", "sha2", - "thiserror", + "thiserror 2.0.3", "tracing", ] @@ -4651,7 +4654,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", "urlencoding", ] @@ -4669,7 +4672,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry_sdk", "prost", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic", ] @@ -4709,7 +4712,7 @@ dependencies = [ "ordered-float", "percent-encoding", "rand", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -4786,7 +4789,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", "url", ] @@ -4821,7 +4824,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5098,7 +5101,7 @@ dependencies = [ "memchr", "parking_lot 0.12.3", "protobuf 2.28.0", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5138,7 +5141,7 @@ checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" dependencies = [ "once_cell", "protobuf-support", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5153,7 +5156,7 @@ dependencies = [ "protobuf-parse", "regex", "tempfile", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5168,7 +5171,7 @@ dependencies = [ "protobuf 3.7.1", "protobuf-support", "tempfile", - "thiserror", + "thiserror 1.0.69", "which", ] @@ -5178,7 +5181,7 @@ version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" dependencies = [ - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5338,7 +5341,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5613,7 +5616,7 @@ dependencies = [ "serde-xml-rs", "serde_derive", "sha2", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "tokio-stream", @@ -5876,7 +5879,7 @@ checksum = "65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa" dependencies = [ "log", "serde", - "thiserror", + "thiserror 1.0.69", "xml-rs", ] @@ -6220,7 +6223,7 @@ dependencies = [ "rand", "ring 0.16.20", "subtle", - "thiserror", + "thiserror 1.0.69", "tokio", "url", "webrtc-util", @@ -6344,7 +6347,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", ] [[package]] @@ -6358,6 +6370,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -6632,7 +6655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.69", "time", "tracing-subscriber", ] @@ -6959,7 +6982,7 @@ dependencies = [ "rkyv", "smallvec", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmer-types-near", "wasmer-vm-near", "wasmparser 0.78.2", @@ -6997,7 +7020,7 @@ dependencies = [ "more-asserts", "rustc-demangle", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmer-compiler-near", "wasmer-types-near", "wasmer-vm-near", @@ -7014,7 +7037,7 @@ dependencies = [ "leb128", "region", "rkyv", - "thiserror", + "thiserror 1.0.69", "wasmer-compiler-near", "wasmer-engine-near", "wasmer-types-near", @@ -7094,7 +7117,7 @@ checksum = "1ba154adffb0fbd33f5dabd3788a1744d846b43e6e090d44269c7ee8fa5743e4" dependencies = [ "indexmap 1.9.3", "rkyv", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7112,7 +7135,7 @@ dependencies = [ "more-asserts", "region", "rkyv", - "thiserror", + "thiserror 1.0.69", "wasmer-types-near", "winapi", ] @@ -7227,7 +7250,7 @@ dependencies = [ "log", "object 0.32.2", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.115.0", "wasmtime-cranelift-shared", "wasmtime-environ", @@ -7265,7 +7288,7 @@ dependencies = [ "serde", "serde_derive", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.115.0", "wasmtime-types", ] @@ -7353,7 +7376,7 @@ dependencies = [ "cranelift-entity", "serde", "serde_derive", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.115.0", ] @@ -7410,7 +7433,7 @@ dependencies = [ "log", "nix 0.24.3", "rand", - "thiserror", + "thiserror 1.0.69", "tokio", "winapi", ] diff --git a/Cargo.toml b/Cargo.toml index 8267269..62aca82 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-lake" -version = "2.3.1" +version = "2.4.0-rc.1" authors = ["Near Inc "] edition = "2021" @@ -29,8 +29,8 @@ tracing = "0.1.40" tracing-subscriber = "0.3.18" # Please, update the supported nearcore version in .cargo/config.toml file -near-indexer = { git = "https://github.com/near/nearcore", rev = "2bce389e4fd9273b78e4efbb16fb3317a7389b5b" } -near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "2bce389e4fd9273b78e4efbb16fb3317a7389b5b" } -near-client = { git = "https://github.com/near/nearcore", rev = "2bce389e4fd9273b78e4efbb16fb3317a7389b5b" } -near-config-utils = { git = "https://github.com/near/nearcore", rev = "2bce389e4fd9273b78e4efbb16fb3317a7389b5b" } -near-o11y = { git = "https://github.com/near/nearcore", rev = "2bce389e4fd9273b78e4efbb16fb3317a7389b5b" } +near-indexer = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-client = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-config-utils = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } +near-o11y = { git = "https://github.com/near/nearcore", rev = "a83c18490cf4dafaedca01458f365dc5871bd293" } diff --git a/Dockerfile b/Dockerfile index 57a9d61..550ea36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.81 AS builder +FROM rust:1.82 AS builder WORKDIR /tmp/ # Copy from nearcore: diff --git a/rust-toolchain b/rust-toolchain index dbd4126..71fae54 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.81.0 +1.82.0 diff --git a/src/main.rs b/src/main.rs index 56b2895..c8081df 100644 --- a/src/main.rs +++ b/src/main.rs @@ -115,6 +115,7 @@ fn main() { config.download_config_url.as_ref().map(AsRef::as_ref), config.boot_nodes.as_ref().map(AsRef::as_ref), config.max_gas_burnt_view, + None, ) .expect("Failed to initialize the node config files"), }