From 8ed8a802627ec0e7658d0dba88f9ddf9e4f29a86 Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Thu, 3 Oct 2024 11:17:05 +0300 Subject: [PATCH] chore/bump-new-version-to-2.3.0-rc.1 (#108) --- .cargo/config.toml | 2 +- CHANGELOG.md | 6 ++ Cargo.lock | 264 ++++++++++++++++++++------------------------- Cargo.toml | 11 +- Dockerfile | 2 +- README.md | 16 ++- rust-toolchain | 2 +- src/main.rs | 6 +- 8 files changed, 144 insertions(+), 165 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 586f53f..0d2a97c 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ [env] -NEARCORE_VERSION = "2.2.1-971e76d" +NEARCORE_VERSION = "2.3.0-rc.1-93073d7" diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fb8315..45e49ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.3.0-rc.1 + +* Upgrade Indexer Framework to be based on [nearcore 2.3.0-rc.1](https://github.com/near/nearcore/releases/tag/2.3.0-rc.1) +* Bump the minimal supported Rust version to `1.81.0` (following the `nearcore` master branch) +* Adopt the changes from the `nearcore` around how the typical configs are downloaded now (see [nearcore#12070](https://github.com/near/nearcore/issues/12070)) + ## 2.2.1 * Upgrade Indexer Framework to be based on [nearcore 2.2.1](https://github.com/near/nearcore/releases/tag/2.2.1) diff --git a/Cargo.lock b/Cargo.lock index ec2fd12..c4613ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3296,8 +3296,8 @@ dependencies = [ [[package]] name = "near-async" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "derive_more", @@ -3316,8 +3316,8 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "proc-macro2", "quote", @@ -3326,16 +3326,16 @@ dependencies = [ [[package]] name = "near-cache" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "lru 0.12.4", ] [[package]] name = "near-chain" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "assert_matches", @@ -3363,6 +3363,7 @@ dependencies = [ "near-performance-metrics-macros", "near-pool", "near-primitives", + "near-schema-checker-lib", "near-store", "near-vm-runner", "node-runtime", @@ -3371,6 +3372,7 @@ dependencies = [ "rand", "rand_chacha", "rayon", + "serde", "strum", "tempfile", "thiserror", @@ -3381,8 +3383,8 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "bytesize", @@ -3395,7 +3397,6 @@ dependencies = [ "near-primitives", "near-time", "num-rational", - "once_cell", "serde", "serde_json", "sha2", @@ -3406,8 +3407,8 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-crypto", "near-primitives", @@ -3419,8 +3420,8 @@ dependencies = [ [[package]] name = "near-chunks" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "borsh 1.5.1", @@ -3442,7 +3443,6 @@ dependencies = [ "near-pool", "near-primitives", "near-store", - "once_cell", "rand", "reed-solomon-erasure", "strum", @@ -3452,8 +3452,8 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-chain-primitives", "near-primitives", @@ -3461,8 +3461,8 @@ dependencies = [ [[package]] name = "near-client" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-rt", @@ -3519,8 +3519,8 @@ dependencies = [ [[package]] name = "near-client-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "chrono", @@ -3541,8 +3541,8 @@ dependencies = [ [[package]] name = "near-config-utils" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "json_comments", @@ -3552,8 +3552,8 @@ dependencies = [ [[package]] name = "near-crypto" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "blake2", "borsh 1.5.1", @@ -3564,8 +3564,8 @@ dependencies = [ "hex", "near-account-id", "near-config-utils", + "near-schema-checker-lib", "near-stdx", - "once_cell", "primitive-types", "rand", "secp256k1", @@ -3577,8 +3577,8 @@ dependencies = [ [[package]] name = "near-dyn-configs" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "near-chain-configs", @@ -3586,7 +3586,6 @@ dependencies = [ "near-o11y", "near-primitives", "near-time", - "once_cell", "prometheus", "serde", "serde_json", @@ -3597,8 +3596,8 @@ dependencies = [ [[package]] name = "near-epoch-manager" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.1", "itertools 0.10.5", @@ -3608,12 +3607,14 @@ dependencies = [ "near-crypto", "near-o11y", "near-primitives", + "near-schema-checker-lib", "near-store", + "num-bigint 0.3.3", "num-rational", - "once_cell", "primitive-types", "rand", "rand_hc", + "serde", "serde_json", "smart-default", "tracing", @@ -3621,23 +3622,23 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-primitives-core", ] [[package]] name = "near-indexer" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "anyhow", "futures", - "lazy_static", "near-chain-configs", "near-client", + "near-config-utils", "near-crypto", "near-dyn-configs", "near-indexer-primitives", @@ -3647,7 +3648,6 @@ dependencies = [ "near-store", "nearcore", "node-runtime", - "once_cell", "rocksdb", "serde", "serde_json", @@ -3657,8 +3657,8 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-primitives", "serde", @@ -3667,8 +3667,8 @@ dependencies = [ [[package]] name = "near-jsonrpc" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-cors", @@ -3687,8 +3687,6 @@ dependencies = [ "near-network", "near-o11y", "near-primitives", - "near-rpc-error-macro", - "once_cell", "serde", "serde_json", "serde_with", @@ -3699,8 +3697,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix-http", "awc", @@ -3713,15 +3711,15 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "arbitrary", "near-chain-configs", "near-client-primitives", "near-crypto", "near-primitives", - "near-rpc-error-macro", + "near-schema-checker-lib", "serde", "serde_json", "thiserror", @@ -3730,7 +3728,7 @@ dependencies = [ [[package]] name = "near-lake" -version = "2.2.1" +version = "2.3.0-rc.1" dependencies = [ "actix", "anyhow", @@ -3743,6 +3741,7 @@ dependencies = [ "humantime", "itertools 0.13.0", "near-client", + "near-config-utils", "near-indexer", "near-indexer-primitives", "near-o11y", @@ -3759,8 +3758,8 @@ dependencies = [ [[package]] name = "near-mainnet-res" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-account-id", "near-chain-configs", @@ -3770,8 +3769,8 @@ dependencies = [ [[package]] name = "near-network" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "anyhow", @@ -3797,8 +3796,8 @@ dependencies = [ "near-performance-metrics", "near-performance-metrics-macros", "near-primitives", + "near-schema-checker-lib", "near-store", - "once_cell", "opentelemetry", "parking_lot 0.12.3", "pin-project", @@ -3822,15 +3821,14 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "base64 0.21.7", "clap", "near-crypto", "near-primitives-core", - "once_cell", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", @@ -3848,13 +3846,14 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.1", "enum-map", "near-account-id", "near-primitives-core", + "near-schema-checker-lib", "num-rational", "serde", "serde_repr", @@ -3865,15 +3864,14 @@ dependencies = [ [[package]] name = "near-performance-metrics" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "bitflags 1.3.2", "bytes", "futures", "libc", - "once_cell", "tokio", "tokio-util", "tracing", @@ -3881,8 +3879,8 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "quote", "syn 2.0.72", @@ -3890,24 +3888,24 @@ dependencies = [ [[package]] name = "near-pool" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.1", "near-crypto", "near-o11y", "near-primitives", - "once_cell", "rand", ] [[package]] name = "near-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "arbitrary", "base64 0.21.7", + "bitvec", "borsh 1.5.1", "bytes", "bytesize", @@ -3922,12 +3920,10 @@ dependencies = [ "near-fmt", "near-parameters", "near-primitives-core", - "near-rpc-error-macro", + "near-schema-checker-lib", "near-stdx", - "near-structs-checker-lib", "near-time", "num-rational", - "once_cell", "ordered-float", "primitive-types", "rand", @@ -3946,8 +3942,8 @@ dependencies = [ [[package]] name = "near-primitives-core" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "arbitrary", "base64 0.21.7", @@ -3956,7 +3952,7 @@ dependencies = [ "derive_more", "enum-map", "near-account-id", - "near-structs-checker-lib", + "near-schema-checker-lib", "num-rational", "serde", "serde_repr", @@ -3966,8 +3962,8 @@ dependencies = [ [[package]] name = "near-rosetta-rpc" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-cors", @@ -3996,34 +3992,33 @@ dependencies = [ ] [[package]] -name = "near-rpc-error-core" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" -dependencies = [ - "quote", - "serde", - "syn 2.0.72", -] +name = "near-schema-checker-core" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" [[package]] -name = "near-rpc-error-macro" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +name = "near-schema-checker-lib" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "near-rpc-error-core", - "serde", - "syn 2.0.72", + "near-schema-checker-core", + "near-schema-checker-macro", ] +[[package]] +name = "near-schema-checker-macro" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" + [[package]] name = "near-stdx" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" [[package]] name = "near-store" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-rt", @@ -4044,11 +4039,11 @@ dependencies = [ "near-o11y", "near-parameters", "near-primitives", + "near-schema-checker-lib", "near-stdx", "near-time", "near-vm-runner", "num_cpus", - "once_cell", "rand", "rayon", "reed-solomon-erasure", @@ -4064,29 +4059,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-structs-checker-core" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" - -[[package]] -name = "near-structs-checker-lib" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" -dependencies = [ - "near-structs-checker-core", - "near-structs-checker-macro", -] - -[[package]] -name = "near-structs-checker-macro" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" - [[package]] name = "near-telemetry" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "awc", @@ -4096,7 +4072,6 @@ dependencies = [ "near-performance-metrics", "near-performance-metrics-macros", "near-time", - "once_cell", "openssl", "serde", "serde_json", @@ -4105,10 +4080,9 @@ dependencies = [ [[package]] name = "near-time" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "once_cell", "serde", "time", "tokio", @@ -4116,8 +4090,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "enumset", "finite-wasm", @@ -4132,14 +4106,13 @@ dependencies = [ [[package]] name = "near-vm-compiler-singlepass" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", "enumset", "finite-wasm", - "lazy_static", "memoffset 0.8.0", "more-asserts", "near-vm-compiler", @@ -4153,14 +4126,13 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "backtrace", "cfg-if 1.0.0", "enumset", "finite-wasm", - "lazy_static", "more-asserts", "near-vm-compiler", "near-vm-types", @@ -4176,8 +4148,8 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "blst", @@ -4192,6 +4164,7 @@ dependencies = [ "near-o11y", "near-parameters", "near-primitives-core", + "near-schema-checker-lib", "near-stdx", "near-vm-compiler", "near-vm-compiler-singlepass", @@ -4199,12 +4172,12 @@ dependencies = [ "near-vm-types", "near-vm-vm", "num-rational", - "once_cell", "parity-wasm 0.41.0", "parity-wasm 0.42.2", "prefix-sum-vec", "prometheus", "pwasm-utils", + "rayon", "ripemd", "rustix", "serde", @@ -4231,8 +4204,8 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "indexmap 1.9.3", "num-traits", @@ -4242,8 +4215,8 @@ dependencies = [ [[package]] name = "near-vm-vm" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "backtrace", "cc", @@ -4263,19 +4236,18 @@ dependencies = [ [[package]] name = "near-wallet-contract" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "near-primitives-core", "near-vm-runner", - "once_cell", ] [[package]] name = "nearcore" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-rt", @@ -4318,7 +4290,6 @@ dependencies = [ "near-vm-runner", "node-runtime", "num-rational", - "once_cell", "rand", "rayon", "regex", @@ -4364,8 +4335,8 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?rev=971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=93073d762ff377382ebf54e7cbff448b492e72c6#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.1", "near-crypto", @@ -4378,7 +4349,6 @@ dependencies = [ "near-wallet-contract", "num-bigint 0.3.3", "num-traits", - "once_cell", "rand", "rayon", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index fd341f1..697c544 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-lake" -version = "2.2.1" +version = "2.3.0-rc.1" authors = ["Near Inc "] edition = "2021" @@ -29,7 +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 = "971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" } -near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" } -near-client = { git = "https://github.com/near/nearcore", rev = "971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" } -near-o11y = { git = "https://github.com/near/nearcore", rev = "971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" } +near-indexer = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-client = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-config-utils = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } +near-o11y = { git = "https://github.com/near/nearcore", rev = "93073d762ff377382ebf54e7cbff448b492e72c6" } diff --git a/Dockerfile b/Dockerfile index 02aaa6a..57a9d61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.79 AS builder +FROM rust:1.81 AS builder WORKDIR /tmp/ # Copy from nearcore: diff --git a/README.md b/README.md index 556d72e..ede2c5d 100644 --- a/README.md +++ b/README.md @@ -59,18 +59,16 @@ To connect NEAR Lake to the specific chain you need to have necessary configs, y $ ./target/release/near-lake --home ~/.near/testnet init --chain-id testnet --download-config --download-genesis ``` -The above code will download the official genesis config and generate necessary configs. You can replace `testnet` in the command above to different network ID (`betanet`, `mainnet`). +The above code will download the official genesis config and generate necessary configs. You can replace `testnet` in the command above to different network ID (`mainnet`). **NB!** According to changes in `nearcore` config generation we don't fill all the necessary fields in the config file. While this issue is open https://github.com/nearprotocol/nearcore/issues/3156 you need to download config you want and replace the generated one manually. -- [testnet config.json](https://s3-us-west-1.amazonaws.com/build.nearprotocol.com/nearcore-deploy/testnet/config.json) -- [betanet config.json](https://s3-us-west-1.amazonaws.com/build.nearprotocol.com/nearcore-deploy/betanet/config.json) -- [mainnet config.json](https://s3-us-west-1.amazonaws.com/build.nearprotocol.com/nearcore-deploy/mainnet/config.json) - -Configs for the specified network are in the `--home` provided folder. We need to ensure that NEAR Lake follows -all the necessary shards, so `"tracked_shards"` parameters in `~/.near/testnet/config.json` needs to be configured properly. -Currently, `nearcore` treats empty value for `"tracked_shards"` as "do not track any shard" and **any value** as "track all shards". -For example, in order to track all shards, you just add the shard #0 to the list: +- [testnet config.json](https://s3-us-west-1.amazonaws.com/build.nearprotocol.com/nearcore-deploy/testnet/rpc/config.json) +- [mainnet config.json](https://s3-us-west-1.amazonaws.com/build.nearprotocol.com/nearcore-deploy/mainnet/rpc/config.json) + +Configs for the specified network are in the `--home` provided folder. The configuration in the `config.json` file ensures that NEAR Lake follows +all the necessary shards, so `"tracked_shards"` parameters in `~/.near/testnet/config.json` is configured as follows: +(`nearcore` treats empty value for `"tracked_shards"` as "do not track any shard" and **any value** as "track all shards".) ``` ... diff --git a/rust-toolchain b/rust-toolchain index b3a8c61..dbd4126 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.79.0 +1.81.0 diff --git a/src/main.rs b/src/main.rs index 9abb6b4..56b2895 100644 --- a/src/main.rs +++ b/src/main.rs @@ -107,7 +107,11 @@ fn main() { .donwload_genesis_records_url .as_ref() .map(AsRef::as_ref), - config.download_config, + if config.download_config { + Some(near_config_utils::DownloadConfigType::RPC) + } else { + None + }, config.download_config_url.as_ref().map(AsRef::as_ref), config.boot_nodes.as_ref().map(AsRef::as_ref), config.max_gas_burnt_view,