From 46e1592e69b05a20324d5408559c058e90b31a90 Mon Sep 17 00:00:00 2001 From: Bohdan Khorolets Date: Thu, 21 Apr 2022 18:13:45 +0300 Subject: [PATCH] refactor: Upgrade to 0.1.2 (nearcore 1.26.0-rc.1) (#35) * refactor: Upgrade nearcore to 1.26.0-rc.1 * use another commit hash * proper commit hash for nearcore dependencies --- CHANGELOG.md | 5 + Cargo.lock | 594 +++++++++++++++++++++++++++++++------------------ Cargo.toml | 17 +- rust-toolchain | 1 - src/configs.rs | 6 +- 5 files changed, 391 insertions(+), 232 deletions(-) delete mode 100644 rust-toolchain diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f63a83..7bf9ff2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.1.2 + +* Fix: Calculation time to catch up with the network +* Upgrade `nearcore` to 1.26.0-rc.1 + ## 0.1.1 * Minor fix: avoid division by zero in stats printer function diff --git a/Cargo.lock b/Cargo.lock index 40dc849..180661d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "actix" -version = "0.11.0-beta.2" +version = "0.13.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "8eb78f9871feb3519e06b947c2becbf2cc7f67ce786e510e6bd3f9a27da3dbf1" +checksum = "f728064aca1c318585bf4bb04ffcfac9e75e508ab4e8b1bd9ba5dfe04e2cbed5" dependencies = [ "actix-rt", "actix_derive", @@ -16,13 +16,14 @@ dependencies = [ "futures-core", "futures-sink", "futures-task", + "futures-util", "log", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project-lite", "smallvec", "tokio", - "tokio-util", + "tokio-util 0.7.1", ] [[package]] @@ -38,7 +39,7 @@ dependencies = [ "log", "pin-project-lite", "tokio", - "tokio-util", + "tokio-util 0.6.9", ] [[package]] @@ -66,7 +67,7 @@ dependencies = [ "actix-service", "actix-tls", "actix-utils", - "ahash 0.7.6", + "ahash", "base64 0.13.0", "bitflags", "brotli2", @@ -124,9 +125,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.2.0" +version = "2.3.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "bc7d7cd957c9ed92288a7c3c96af81fa5291f65247a76a34dac7b6af74e52ba0" +checksum = "ea360596a50aa9af459850737f99293e5cb9114ae831118cb6026b3bbc7583ad" dependencies = [ "actix-macros", "futures-core", @@ -162,9 +163,9 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.0.0-beta.5" +version = "3.0.0-beta.6" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "65b7bb60840962ef0332f7ea01a57d73a24d2cb663708511ff800250bbfef569" +checksum = "0bd80ba563d12cb7ca41845b0ca2cc7d9e9e15eb7ae9566980789e32170984d5" dependencies = [ "actix-codec", "actix-rt", @@ -176,7 +177,7 @@ dependencies = [ "log", "openssl", "tokio-openssl", - "tokio-util", + "tokio-util 0.6.9", ] [[package]] @@ -205,7 +206,7 @@ dependencies = [ "actix-tls", "actix-utils", "actix-web-codegen", - "ahash 0.7.6", + "ahash", "bytes", "cookie", "derive_more", @@ -242,9 +243,9 @@ dependencies = [ [[package]] name = "actix_derive" -version = "0.6.0-beta.1" +version = "0.6.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "ae749cf2582eb83efd288edd4e9704600fdce1bc4f69aa0c86ca1368a3e4c13f" +checksum = "6d44b8fee1ced9671ba043476deddef739dd0959bf77030b26b738cc591737a7" dependencies = [ "proc-macro2", "quote", @@ -266,12 +267,6 @@ version = "1.0.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.4.7" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" - [[package]] name = "ahash" version = "0.7.6" @@ -303,9 +298,12 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.53" +version = "1.0.56" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +dependencies = [ + "backtrace", +] [[package]] name = "arrayref" @@ -355,9 +353,9 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "awc" @@ -608,7 +606,7 @@ dependencies = [ "percent-encoding", "pin-project", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing", ] @@ -804,19 +802,19 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "borsh" -version = "0.9.1" +version = "0.9.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "18dda7dc709193c0d86a1a51050a926dc3df1cf262ec46a23a25dba421ea1924" +checksum = "4c9d0958efb8301e1626692ea879cbff622ef45cf731807ec8d488b34be98cb8" dependencies = [ "borsh-derive", - "hashbrown 0.9.1", + "hashbrown", ] [[package]] name = "borsh-derive" -version = "0.9.1" +version = "0.9.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "684155372435f578c0fa1acd13ebbb182cc19d6b38b64ae7901da4393217d264" +checksum = "325164710ad57bae6d32455ce3bd384f95768464a927ce145626dc3390a7f9fe" dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", @@ -827,9 +825,9 @@ dependencies = [ [[package]] name = "borsh-derive-internal" -version = "0.9.1" +version = "0.9.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "2102f62f8b6d3edeab871830782285b64cc1830168094db05c8e458f209bc5c3" +checksum = "f74159f43b231f4af8c4ce4967fef76e4e59725acf51706ddb9268c94348d15c" dependencies = [ "proc-macro2", "quote", @@ -838,9 +836,9 @@ dependencies = [ [[package]] name = "borsh-schema-derive-internal" -version = "0.9.1" +version = "0.9.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "196c978c4c9b0b142d446ef3240690bf5a8a33497074a113ff9a337ccb750483" +checksum = "99b2a77771907a820a860d200d193a0787c79a7890c8e253c462fa0f51ad58b6" dependencies = [ "proc-macro2", "quote", @@ -920,9 +918,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "bytes-utils" -version = "0.1.1" +version = "0.1.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "4e314712951c43123e5920a446464929adc667a5eade7f8fb3997776c9df6e54" +checksum = "1934a3ef9cac8efde4966a92781e77713e1ba329f1d42e446c7d7eba340d8ef1" dependencies = [ "bytes", "either", @@ -943,6 +941,17 @@ dependencies = [ "bytes", ] +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "c2-chacha" version = "0.3.2" @@ -1019,9 +1028,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.0-rc.4" +version = "3.1.6" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "967965e82fc46fee1a88147a7a977a66d615ed5f83eb95b18577b342c08f90ff" +checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" dependencies = [ "atty", "bitflags", @@ -1036,11 +1045,11 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.0.0-rc.4" +version = "3.1.4" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "85946d4034625800196413478a1c6d3a57c12785e1f3970e590e0137dfa07342" +checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16" dependencies = [ - "heck", + "heck 0.4.0", "proc-macro-error", "proc-macro2", "quote", @@ -1064,13 +1073,13 @@ checksum = "eac4306c796b95d3964b94fa65018a57daee08b45a54b86a4f64910426427b66" [[package]] name = "console" -version = "0.15.0" +version = "0.14.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" +checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" dependencies = [ "encode_unicode", + "lazy_static", "libc", - "once_cell", "regex", "terminal_size", "unicode-width", @@ -1131,6 +1140,16 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "cpu-time" +version = "1.0.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "cpufeatures" version = "0.2.1" @@ -1355,6 +1374,15 @@ dependencies = [ "syn", ] +[[package]] +name = "delay-detector" +version = "0.0.0" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" +dependencies = [ + "cpu-time", + "tracing", +] + [[package]] name = "derive_more" version = "0.99.14" @@ -1417,6 +1445,12 @@ version = "0.3.3" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + [[package]] name = "dynasm" version = "1.1.0" @@ -1544,28 +1578,6 @@ dependencies = [ "libc", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -1706,7 +1718,7 @@ version = "0.3.17" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "proc-macro-hack", "proc-macro2", "quote", @@ -1731,7 +1743,7 @@ version = "0.3.17" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "futures-channel", "futures-core", "futures-io", @@ -1806,9 +1818,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "h2" -version = "0.3.6" +version = "0.3.12" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964" +checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" dependencies = [ "bytes", "fnv", @@ -1819,26 +1831,17 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing", ] -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -dependencies = [ - "ahash 0.4.7", -] - [[package]] name = "hashbrown" version = "0.11.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.6", + "ahash", ] [[package]] @@ -1859,6 +1862,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1876,13 +1885,13 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "0.2.5" +version = "0.2.6" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes", "fnv", - "itoa 0.4.8", + "itoa 1.0.1", ] [[package]] @@ -2007,12 +2016,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.6.1" +version = "1.8.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ - "autocfg 1.0.1", - "hashbrown 0.9.1", + "autocfg 1.1.0", + "hashbrown", "serde", ] @@ -2128,9 +2137,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.116" +version = "0.2.112" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" +checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" [[package]] name = "libloading" @@ -2144,14 +2153,28 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "6.20.3" +version = "0.6.1+6.28.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" +checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ "bindgen", + "bzip2-sys", "cc", "glob", "libc", + "libz-sys", + "zstd-sys", +] + +[[package]] +name = "libz-sys" +version = "1.1.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", ] [[package]] @@ -2195,10 +2218,11 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.7" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg 1.1.0", "scopeguard", "serde", ] @@ -2239,7 +2263,7 @@ version = "0.7.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "274353858935c992b13c0ca408752e2121da852d07dec7ce5f108c77dfa14d1f" dependencies = [ - "hashbrown 0.11.2", + "hashbrown", ] [[package]] @@ -2322,9 +2346,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.5.3" +version = "0.5.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f" +checksum = "4647a11b578fead29cdbb34d4adef8dd3dc35b876c9c6d5240d83f205abfe96e" dependencies = [ "libc", ] @@ -2335,7 +2359,7 @@ version = "0.6.4" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", ] [[package]] @@ -2357,7 +2381,7 @@ source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", - "autocfg 1.0.1", + "autocfg 1.1.0", ] [[package]] @@ -2409,7 +2433,7 @@ dependencies = [ [[package]] name = "near-account-id" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "borsh", "serde", @@ -2418,7 +2442,7 @@ dependencies = [ [[package]] name = "near-cache" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "lru", ] @@ -2426,13 +2450,12 @@ dependencies = [ [[package]] name = "near-chain" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "borsh", "chrono", - "failure", - "failure_derive", + "delay-detector", "itertools", "lru", "near-chain-configs", @@ -2444,6 +2467,7 @@ dependencies = [ "near-store", "num-rational", "once_cell", + "prometheus", "rand 0.7.3", "rayon", "strum", @@ -2454,7 +2478,7 @@ dependencies = [ [[package]] name = "near-chain-configs" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "anyhow", "chrono", @@ -2472,60 +2496,64 @@ dependencies = [ [[package]] name = "near-chain-primitives" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ + "anyhow", "chrono", - "failure", - "failure_derive", - "log", "near-crypto", "near-primitives", "thiserror", + "tracing", ] [[package]] name = "near-chunks" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "borsh", "chrono", "futures", - "log", "lru", "near-chain", "near-chunks-primitives", "near-crypto", + "near-metrics", "near-network", "near-network-primitives", "near-pool", "near-primitives", "near-store", + "once_cell", + "prometheus", "rand 0.7.3", "reed-solomon-erasure", + "tracing", ] [[package]] name = "near-chunks-primitives" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "near-chain-primitives", + "near-primitives", ] [[package]] name = "near-client" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "actix-rt", "ansi_term", "borsh", "chrono", + "delay-detector", "futures", - "log", + "itertools", "lru", "near-chain", "near-chain-configs", @@ -2543,18 +2571,21 @@ dependencies = [ "near-telemetry", "num-rational", "once_cell", + "prometheus", "rand 0.7.3", "reed-solomon-erasure", "serde_json", "strum", "sysinfo", "thiserror", + "tokio", + "tracing", ] [[package]] name = "near-client-primitives" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "chrono", @@ -2571,7 +2602,7 @@ dependencies = [ [[package]] name = "near-crypto" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "arrayref", "blake2", @@ -2597,11 +2628,10 @@ dependencies = [ [[package]] name = "near-epoch-manager" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "borsh", - "log", - "lru", + "near-cache", "near-chain", "near-chain-configs", "near-crypto", @@ -2613,12 +2643,13 @@ dependencies = [ "rand 0.7.3", "serde_json", "smart-default", + "tracing", ] [[package]] name = "near-indexer" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "anyhow", @@ -2641,7 +2672,7 @@ dependencies = [ [[package]] name = "near-indexer-primitives" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "near-primitives", "serde", @@ -2651,13 +2682,14 @@ dependencies = [ [[package]] name = "near-jsonrpc" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "actix-cors", "actix-web", "easy-ext", "futures", + "lazy-static-include", "near-chain-configs", "near-client", "near-jsonrpc-client", @@ -2678,7 +2710,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix-http", "awc", @@ -2693,7 +2725,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "near-chain-configs", @@ -2714,7 +2746,7 @@ dependencies = [ [[package]] name = "near-lake" -version = "0.1.1" +version = "0.1.2" dependencies = [ "actix", "anyhow", @@ -2742,23 +2774,25 @@ dependencies = [ [[package]] name = "near-metrics" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "lazy_static", - "log", "prometheus", + "tracing", ] [[package]] name = "near-network" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", + "anyhow", "borsh", "bytes", "bytesize", "conqueue", + "delay-detector", "futures", "itertools", "lru", @@ -2775,17 +2809,16 @@ dependencies = [ "strum", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.7.1", "tracing", ] [[package]] name = "near-network-primitives" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", - "actix_derive", "anyhow", "borsh", "chrono", @@ -2799,25 +2832,24 @@ dependencies = [ [[package]] name = "near-performance-metrics" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "bitflags", "bytes", - "bytesize", "futures", "libc", - "log", "once_cell", "strum", "tokio", - "tokio-util", + "tokio-util 0.7.1", + "tracing", ] [[package]] name = "near-performance-metrics-macros" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "quote", "syn", @@ -2826,7 +2858,7 @@ dependencies = [ [[package]] name = "near-pool" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "borsh", "near-crypto", @@ -2839,7 +2871,7 @@ dependencies = [ [[package]] name = "near-primitives" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "borsh", "byteorder", @@ -2853,6 +2885,7 @@ dependencies = [ "near-rpc-error-macro", "near-vm-errors", "num-rational", + "once_cell", "primitive-types", "rand 0.7.3", "reed-solomon-erasure", @@ -2864,7 +2897,7 @@ dependencies = [ [[package]] name = "near-primitives-core" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "base64 0.11.0", "borsh", @@ -2874,26 +2907,27 @@ dependencies = [ "num-rational", "serde", "sha2", + "strum", ] [[package]] name = "near-rate-limiter" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "bytes", "futures-core", "pin-project-lite", "tokio", - "tokio-util", + "tokio-util 0.7.1", "tracing", ] [[package]] name = "near-rosetta-rpc" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "actix-cors", @@ -2922,7 +2956,7 @@ dependencies = [ [[package]] name = "near-rpc-error-core" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "quote", "serde", @@ -2932,7 +2966,7 @@ dependencies = [ [[package]] name = "near-rpc-error-macro" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "near-rpc-error-core", "serde", @@ -2942,12 +2976,12 @@ dependencies = [ [[package]] name = "near-stable-hasher" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" [[package]] name = "near-store" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "borsh", "byteorder", @@ -2959,8 +2993,11 @@ dependencies = [ "near-crypto", "near-primitives", "num_cpus", + "once_cell", "rand 0.7.3", + "rlimit", "rocksdb", + "serde", "serde_json", "strum", "thiserror", @@ -2970,7 +3007,7 @@ dependencies = [ [[package]] name = "near-telemetry" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "actix-web", @@ -2987,7 +3024,7 @@ dependencies = [ [[package]] name = "near-vm-errors" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "borsh", "near-account-id", @@ -2998,7 +3035,7 @@ dependencies = [ [[package]] name = "near-vm-logic" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "base64 0.13.0", "borsh", @@ -3018,7 +3055,7 @@ dependencies = [ [[package]] name = "near-vm-runner" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "anyhow", "borsh", @@ -3050,18 +3087,18 @@ dependencies = [ [[package]] name = "nearcore" -version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +version = "1.26.0-rc.1" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "actix", "actix-rt", "actix-web", - "actix_derive", "anyhow", "awc", "borsh", "byteorder", "chrono", + "delay-detector", "dirs", "easy-ext", "futures", @@ -3076,6 +3113,7 @@ dependencies = [ "near-crypto", "near-epoch-manager", "near-jsonrpc", + "near-metrics", "near-network", "near-network-primitives", "near-performance-metrics", @@ -3087,11 +3125,16 @@ dependencies = [ "near-vm-runner", "node-runtime", "num-rational", + "once_cell", + "prometheus", "rand 0.7.3", "rayon", + "rlimit", "serde", + "serde_ignored", "serde_json", "smart-default", + "strum", "tempfile", "thiserror", "tokio", @@ -3115,12 +3158,11 @@ dependencies = [ [[package]] name = "node-runtime" version = "0.0.0" -source = "git+/~https://github.com/near/nearcore?rev=5f09a3bf042b32d1ff26554433ad6449199ea02a#5f09a3bf042b32d1ff26554433ad6449199ea02a" +source = "git+/~https://github.com/near/nearcore?rev=e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf#e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" dependencies = [ "borsh", "byteorder", "hex", - "log", "near-chain-configs", "near-crypto", "near-metrics", @@ -3167,7 +3209,7 @@ version = "0.3.3" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-integer", "num-traits", ] @@ -3178,7 +3220,7 @@ version = "0.1.44" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-traits", ] @@ -3188,7 +3230,7 @@ version = "0.3.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-bigint", "num-integer", "num-traits", @@ -3201,7 +3243,7 @@ version = "0.2.14" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", ] [[package]] @@ -3216,9 +3258,9 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.3" +version = "0.1.5" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15" +checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" dependencies = [ "libc", ] @@ -3242,9 +3284,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.8.0" +version = "1.10.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "opaque-debug" @@ -3254,9 +3296,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.36" +version = "0.10.38" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" +checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -3283,11 +3325,11 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.67" +version = "0.9.72" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058" +checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "cc", "libc", "openssl-src", @@ -3373,7 +3415,7 @@ name = "paperclip-macros" version = "0.4.0" source = "git+/~https://github.com/near/paperclip?branch=actix-web-4-beta.6#b9589c6e520eeee4a07ed94f7e32c476990d6536" dependencies = [ - "heck", + "heck 0.3.3", "http", "lazy_static", "mime", @@ -3452,10 +3494,20 @@ source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.5", + "lock_api 0.4.7", "parking_lot_core 0.8.5", ] +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api 0.4.7", + "parking_lot_core 0.9.2", +] + [[package]] name = "parking_lot_core" version = "0.7.2" @@ -3484,6 +3536,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.2" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.10", + "smallvec", + "windows-sys", +] + [[package]] name = "paste" version = "1.0.5" @@ -3886,7 +3951,7 @@ version = "1.5.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "crossbeam-deque", "either", "rayon-core", @@ -4011,9 +4076,9 @@ dependencies = [ [[package]] name = "rend" -version = "0.3.6" +version = "0.3.5" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "79af64b4b6362ffba04eef3a4e10829718a4896dac19daa741851c86781edf95" +checksum = "1033f6fe7ce48c8333e5412891b933e85d6a3a09728c4883240edf64e7a6f11a" dependencies = [ "bytecheck", ] @@ -4046,12 +4111,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.26" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "66bf572c17c77322f4d858c214def56b13a3c32b8d833cd6d28a92de8325ac5f" dependencies = [ "bytecheck", - "hashbrown 0.11.2", + "hashbrown", "ptr_meta", "rend", "rkyv_derive", @@ -4060,20 +4125,29 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.26" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "df3eca50f172b8e59e2080810fb41b65f047960c197149564d4bd0680af1888e" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "rlimit" +version = "0.7.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "347703a5ae47adf1e693144157be231dde38c72bd485925cae7407ad3e52480b" +dependencies = [ + "libc", +] + [[package]] name = "rocksdb" -version = "0.16.0" +version = "0.18.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3" +checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" dependencies = [ "libc", "librocksdb-sys", @@ -4244,9 +4318,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.136" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] @@ -4272,15 +4346,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.136" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "serde_ignored" +version = "0.1.2" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "1c2c7d39d14f2f2ea82239de71594782f186fd03501ac81f0ce08e674819ff2f" +dependencies = [ + "serde", +] + [[package]] name = "serde_json" version = "1.0.68" @@ -4306,12 +4389,12 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.23" +version = "0.8.21" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" +checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af" dependencies = [ + "dtoa", "indexmap", - "ryu", "serde", "yaml-rust", ] @@ -4520,7 +4603,7 @@ version = "0.20.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2", "quote", "syn", @@ -4589,13 +4672,13 @@ checksum = "d9bffcddbc2458fa3e6058414599e3c838a022abae82e5c67b4f7f80298d5bff" [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if 1.0.0", + "fastrand", "libc", - "rand 0.8.4", "redox_syscall 0.2.10", "remove_dir_all", "winapi", @@ -4622,9 +4705,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.14.2" +version = "0.15.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" @@ -4648,9 +4731,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.3" +version = "1.1.4" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ "once_cell", ] @@ -4739,11 +4822,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.12.0" +version = "1.16.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" +checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" dependencies = [ - "autocfg 1.0.1", "bytes", "libc", "memchr", @@ -4759,9 +4841,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.5.0" +version = "1.7.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2", "quote", @@ -4826,6 +4908,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.7.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + [[package]] name = "toml" version = "0.5.8" @@ -4837,9 +4933,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.11" +version = "0.4.12" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "5651b5f6860a99bd1adb59dbfe1db8beb433e73709d9032b413a77e2fb7c066a" +checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e" dependencies = [ "futures-core", "futures-util", @@ -4889,11 +4985,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.23" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -4909,9 +5006,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.2" +version = "0.1.3" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ "serde", "tracing-core", @@ -5051,6 +5148,12 @@ version = "0.12.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "ad9680608df133af2c1ddd5eaf1ddce91d60d61b6bc51494ef326458365a470a" +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -5147,9 +5250,9 @@ checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" [[package]] name = "wasmer-compiler-near" -version = "2.2.0" +version = "2.2.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "c11074b5b8f4170b5ebf0744e811728befb01a70757395c43b528b6441e9c924" +checksum = "b836e89dcfdc39c6ff7b26c5f2c7ae27b9bd92a74aed940f09c24ba9d4e32973" dependencies = [ "enumset", "loupe", @@ -5166,9 +5269,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-singlepass-near" -version = "2.2.0" +version = "2.2.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "c95dc7a193f0b607ce19c3a71418ea0d325696087a53755b4610b5b5b02b335b" +checksum = "adb2995c6705f7ab2ef83888b41c4ffba9a4b9ceea790b2982d667d9dd43846f" dependencies = [ "byteorder", "dynasm", @@ -5186,15 +5289,15 @@ dependencies = [ [[package]] name = "wasmer-engine-near" -version = "2.2.0" +version = "2.2.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "55090b4c4cffc8460478fa0b0355d81044750655986a8be93e769f9df3caa6bf" +checksum = "15cc33ca0168a79244345834c73c408cf1151cfcbe40b42dfa5409aa1d42f13c" dependencies = [ "backtrace", "enumset", "lazy_static", "loupe", - "memmap2 0.5.3", + "memmap2 0.5.0", "more-asserts", "rustc-demangle", "serde", @@ -5208,9 +5311,9 @@ dependencies = [ [[package]] name = "wasmer-engine-universal-near" -version = "2.2.0" +version = "2.2.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "37d2a5c1153cf6d9441e3d05101559071a3fb7f44e343f398d5ec89f2f5748f4" +checksum = "9fbf42534f4c05800dcb07686321ea33dcf815af82c3d57150a6d13a25bec55d" dependencies = [ "cfg-if 1.0.0", "enumset", @@ -5291,9 +5394,9 @@ dependencies = [ [[package]] name = "wasmer-types-near" -version = "2.2.0" +version = "2.2.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "b4fae5b0041c76c1b114b3286503a54d42c38eb88146724919b5610c66ecd548" +checksum = "74a34b18bef672dd578b18ec10b157edbda31123f20a6cbf0d160cbd341fe8de" dependencies = [ "indexmap", "loupe", @@ -5304,9 +5407,9 @@ dependencies = [ [[package]] name = "wasmer-vm-near" -version = "2.2.0" +version = "2.2.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "db06e0c8e20945000c075237f1b5afb682bf80e2bec875ed9b9a633ef41960c7" +checksum = "6bd58bc505063fe59c224c6263afc4e64e72dff29636ca9fcb912bfbf742a995" dependencies = [ "backtrace", "cc", @@ -5523,6 +5626,49 @@ version = "0.4.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.34.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + +[[package]] +name = "windows_i686_gnu" +version = "0.34.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + +[[package]] +name = "windows_i686_msvc" +version = "0.34.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.34.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + [[package]] name = "wyz" version = "0.2.0" @@ -5573,3 +5719,13 @@ dependencies = [ "syn", "synstructure", ] + +[[package]] +name = "zstd-sys" +version = "1.6.3+zstd.1.5.2" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" +dependencies = [ + "cc", + "libc", +] diff --git a/Cargo.toml b/Cargo.toml index e0a3895..91a4f9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,23 +1,22 @@ [package] name = "near-lake" -version = "0.1.1" +version = "0.1.2" authors = ["Near Inc "] edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +rust-version = "1.60.0" [dependencies] -actix = "=0.11.0-beta.2" +actix = "0.13.0" anyhow = "1.0.51" aws-config = "0.6.0" aws-endpoint = "0.6.0" aws-sdk-s3 = "0.6.0" aws-smithy-http = "0.36.0" -clap = { version = "3.0.0-beta.5", features = ["color", "derive", "env"] } +clap = { version = "3.1.6", features = ["color", "derive", "env"] } futures = "0.3.5" http = "0.2" humantime = "2.1.0" -itertools = "^0.10.3" +itertools = "0.10.0" openssl-probe = { version = "0.1.2" } serde = { version = "1", features = ["derive"] } serde_json = "1.0.55" @@ -26,6 +25,6 @@ tokio-stream = { version = "0.1" } tracing = "0.1.13" tracing-subscriber = "0.2.4" -near-indexer = { git = "/~https://github.com/near/nearcore", rev = "5f09a3bf042b32d1ff26554433ad6449199ea02a" } -near-indexer-primitives = { git = "/~https://github.com/near/nearcore", rev = "5f09a3bf042b32d1ff26554433ad6449199ea02a" } -near-client = { git = "/~https://github.com/near/nearcore", rev = "5f09a3bf042b32d1ff26554433ad6449199ea02a" } +near-indexer = { git = "/~https://github.com/near/nearcore", rev = "e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" } +near-indexer-primitives = { git = "/~https://github.com/near/nearcore", rev = "e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" } +near-client = { git = "/~https://github.com/near/nearcore", rev = "e127d2d9cf436ad4cf8e71ad7ce2419eafbecbdf" } diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 373aea9..0000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.57.0 diff --git a/src/configs.rs b/src/configs.rs index f852825..501d9ce 100644 --- a/src/configs.rs +++ b/src/configs.rs @@ -7,9 +7,9 @@ use clap::Parser; version, author, about, - setting(clap::AppSettings::DisableHelpSubcommand), - setting(clap::AppSettings::PropagateVersion), - setting(clap::AppSettings::NextLineHelp) + disable_help_subcommand(true), + propagate_version(true), + next_line_help(true) )] pub(crate) struct Opts { /// Sets a custom config dir. Defaults to ~/.near/