diff --git a/Cargo.lock b/Cargo.lock
index 56ac223b..76db5c6e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -60,9 +60,9 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.0.4"
+version = "3.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5885cb81a0d4d0d322864bea1bb6c2a8144626b4fdc625d4c51eba197e7797a"
+checksum = "0c83abf9903e1f0ad9973cc4f7b9767fd5a03a583f51a5b7a339e07987cd2724"
 dependencies = [
  "actix-codec",
  "actix-rt",
@@ -85,13 +85,13 @@ dependencies = [
  "itoa",
  "language-tags",
  "local-channel",
- "log",
  "mime",
  "percent-encoding",
  "pin-project-lite",
  "rand 0.8.5",
- "sha-1",
+ "sha1",
  "smallvec",
+ "tracing",
  "zstd",
 ]
 
@@ -325,6 +325,15 @@ version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
 
+[[package]]
+name = "arbitrary"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0224938f92e7aef515fac2ff2d18bd1115c1394ddf4a092e0c87e8be9499ee5"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "arc-swap"
 version = "1.5.1"
@@ -383,9 +392,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.57"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
+checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -403,15 +412,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "autocfg"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
-dependencies = [
- "autocfg 1.1.0",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -485,9 +485,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.59.2"
+version = "0.60.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -825,12 +825,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "conqueue"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac4306c796b95d3964b94fa65018a57daee08b45a54b86a4f64910426427b66"
-
 [[package]]
 name = "console"
 version = "0.15.1"
@@ -1051,7 +1045,7 @@ version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "cfg-if 1.0.0",
  "crossbeam-utils",
  "memoffset",
@@ -1155,12 +1149,23 @@ dependencies = [
 [[package]]
 name = "delay-detector"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "cpu-time",
  "tracing",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf460bbff5f571bfc762da5102729f59f338be7db17a21fade44c5c4f5005350"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -1710,6 +1715,9 @@ name = "hex"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "http"
@@ -1844,7 +1852,7 @@ version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "hashbrown 0.12.3",
  "serde",
 ]
@@ -1858,6 +1866,7 @@ dependencies = [
  "console",
  "lazy_static",
  "number_prefix",
+ "rayon",
  "regex",
 ]
 
@@ -1971,9 +1980,9 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "0.6.1+6.28.2"
+version = "0.8.0+7.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291"
+checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -2041,7 +2050,7 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "scopeguard",
  "serde",
 ]
@@ -2171,7 +2180,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]
 
 [[package]]
@@ -2240,8 +2249,9 @@ dependencies = [
 [[package]]
 name = "near-account-id"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
+ "arbitrary",
  "borsh",
  "serde",
 ]
@@ -2249,7 +2259,7 @@ dependencies = [
 [[package]]
 name = "near-cache"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "lru",
 ]
@@ -2257,10 +2267,11 @@ dependencies = [
 [[package]]
 name = "near-chain"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "ansi_term",
+ "assert_matches",
  "borsh",
  "chrono",
  "crossbeam-channel",
@@ -2280,7 +2291,8 @@ dependencies = [
  "near-store",
  "num-rational",
  "once_cell",
- "rand 0.7.3",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "rayon",
  "strum",
  "thiserror",
@@ -2290,7 +2302,7 @@ dependencies = [
 [[package]]
 name = "near-chain-configs"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2308,7 +2320,7 @@ dependencies = [
 [[package]]
 name = "near-chain-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "chrono",
  "near-crypto",
@@ -2320,7 +2332,7 @@ dependencies = [
 [[package]]
 name = "near-chunks"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "borsh",
@@ -2331,13 +2343,12 @@ dependencies = [
  "near-chunks-primitives",
  "near-crypto",
  "near-network",
- "near-network-primitives",
  "near-o11y",
  "near-pool",
  "near-primitives",
  "near-store",
  "once_cell",
- "rand 0.7.3",
+ "rand 0.8.5",
  "reed-solomon-erasure",
  "tracing",
 ]
@@ -2345,7 +2356,7 @@ dependencies = [
 [[package]]
 name = "near-chunks-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "near-chain-primitives",
  "near-primitives",
@@ -2354,11 +2365,12 @@ dependencies = [
 [[package]]
 name = "near-client"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "actix-rt",
  "ansi_term",
+ "async-trait",
  "borsh",
  "chrono",
  "delay-detector",
@@ -2371,8 +2383,9 @@ dependencies = [
  "near-chunks",
  "near-client-primitives",
  "near-crypto",
+ "near-dyn-configs",
+ "near-epoch-manager",
  "near-network",
- "near-network-primitives",
  "near-o11y",
  "near-performance-metrics",
  "near-performance-metrics-macros",
@@ -2382,7 +2395,7 @@ dependencies = [
  "near-telemetry",
  "num-rational",
  "once_cell",
- "rand 0.7.3",
+ "rand 0.8.5",
  "reed-solomon-erasure",
  "serde_json",
  "strum",
@@ -2395,7 +2408,7 @@ dependencies = [
 [[package]]
 name = "near-client-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "chrono",
@@ -2403,7 +2416,6 @@ dependencies = [
  "near-chain-primitives",
  "near-chunks-primitives",
  "near-crypto",
- "near-network-primitives",
  "near-primitives",
  "once_cell",
  "serde",
@@ -2415,9 +2427,8 @@ dependencies = [
 [[package]]
 name = "near-crypto"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
- "arrayref",
  "blake2",
  "borsh",
  "bs58",
@@ -2426,6 +2437,7 @@ dependencies = [
  "derive_more",
  "ed25519-dalek",
  "near-account-id",
+ "near-stdx",
  "once_cell",
  "primitive-types",
  "rand 0.7.3",
@@ -2436,10 +2448,20 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "near-dyn-configs"
+version = "0.0.0"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
+dependencies = [
+ "near-o11y",
+ "once_cell",
+ "prometheus 0.13.1",
+]
+
 [[package]]
 name = "near-epoch-manager"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "borsh",
  "near-cache",
@@ -2450,8 +2472,8 @@ dependencies = [
  "near-store",
  "num-rational",
  "primitive-types",
- "rand 0.6.5",
- "rand 0.7.3",
+ "rand 0.8.5",
+ "rand_hc 0.3.1",
  "serde_json",
  "smart-default",
  "tracing",
@@ -2513,7 +2535,7 @@ dependencies = [
 [[package]]
 name = "near-indexer"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "anyhow",
@@ -2522,6 +2544,7 @@ dependencies = [
  "near-chain-configs",
  "near-client",
  "near-crypto",
+ "near-dyn-configs",
  "near-indexer-primitives",
  "near-o11y",
  "near-primitives",
@@ -2539,7 +2562,7 @@ dependencies = [
 [[package]]
 name = "near-indexer-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "near-primitives",
  "serde",
@@ -2549,11 +2572,12 @@ dependencies = [
 [[package]]
 name = "near-jsonrpc"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "actix-cors",
  "actix-web",
+ "bs58",
  "easy-ext",
  "futures",
  "near-chain-configs",
@@ -2562,7 +2586,6 @@ dependencies = [
  "near-jsonrpc-client",
  "near-jsonrpc-primitives",
  "near-network",
- "near-network-primitives",
  "near-o11y",
  "near-primitives",
  "near-rpc-error-macro",
@@ -2577,7 +2600,7 @@ dependencies = [
 [[package]]
 name = "near-jsonrpc-client"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix-http",
  "awc",
@@ -2591,8 +2614,9 @@ dependencies = [
 [[package]]
 name = "near-jsonrpc-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
+ "arbitrary",
  "near-chain-configs",
  "near-client-primitives",
  "near-crypto",
@@ -2606,7 +2630,7 @@ dependencies = [
 [[package]]
 name = "near-mainnet-res"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "near-account-id",
  "near-chain-configs",
@@ -2617,17 +2641,17 @@ dependencies = [
 [[package]]
 name = "near-network"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "anyhow",
  "arc-swap",
  "assert_matches",
+ "async-trait",
  "borsh",
  "bytes",
  "bytesize",
  "chrono",
- "conqueue",
  "crossbeam-channel",
  "delay-detector",
  "futures",
@@ -2636,7 +2660,6 @@ dependencies = [
  "itertools",
  "lru",
  "near-crypto",
- "near-network-primitives",
  "near-o11y",
  "near-performance-metrics",
  "near-performance-metrics-macros",
@@ -2648,68 +2671,49 @@ dependencies = [
  "parking_lot 0.12.1",
  "protobuf 3.1.0",
  "protobuf-codegen",
- "rand 0.7.3",
- "rand_xorshift 0.2.0",
+ "rand 0.8.5",
+ "rand_xorshift",
  "rayon",
  "serde",
  "smart-default",
  "strum",
  "thiserror",
+ "time 0.3.13",
  "tokio",
  "tokio-stream",
  "tokio-util 0.7.3",
  "tracing",
- "tracing-opentelemetry",
-]
-
-[[package]]
-name = "near-network-primitives"
-version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
-dependencies = [
- "actix",
- "anyhow",
- "borsh",
- "chrono",
- "near-crypto",
- "near-primitives",
- "once_cell",
- "opentelemetry",
- "serde",
- "strum",
- "thiserror",
- "time 0.3.13",
- "tokio",
- "tracing",
 ]
 
 [[package]]
 name = "near-o11y"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
+ "actix",
  "atty",
- "backtrace",
  "clap",
+ "near-crypto",
+ "near-primitives-core",
  "once_cell",
  "opentelemetry",
  "opentelemetry-otlp",
  "opentelemetry-semantic-conventions",
  "prometheus 0.13.1",
+ "serde",
  "strum",
  "thiserror",
  "tokio",
  "tracing",
  "tracing-appender",
  "tracing-opentelemetry",
- "tracing-serde",
  "tracing-subscriber 0.3.15",
 ]
 
 [[package]]
 name = "near-performance-metrics"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "bitflags",
@@ -2726,7 +2730,7 @@ dependencies = [
 [[package]]
 name = "near-performance-metrics-macros"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "quote",
  "syn",
@@ -2735,54 +2739,60 @@ dependencies = [
 [[package]]
 name = "near-pool"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "borsh",
  "near-crypto",
  "near-o11y",
  "near-primitives",
  "once_cell",
- "rand 0.7.3",
+ "rand 0.8.5",
 ]
 
 [[package]]
 name = "near-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
+ "arbitrary",
  "borsh",
- "byteorder",
  "bytesize",
  "cfg-if 1.0.0",
  "chrono",
  "derive_more",
  "easy-ext",
+ "enum-map",
  "hex",
  "near-crypto",
+ "near-o11y",
  "near-primitives-core",
  "near-rpc-error-macro",
+ "near-stdx",
  "near-vm-errors",
  "num-rational",
  "once_cell",
  "primitive-types",
- "rand 0.7.3",
+ "rand 0.8.5",
  "reed-solomon-erasure",
  "serde",
  "serde_json",
  "smart-default",
  "strum",
  "thiserror",
+ "tracing",
 ]
 
 [[package]]
 name = "near-primitives-core"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
+ "arbitrary",
  "base64",
  "borsh",
  "bs58",
  "derive_more",
+ "enum-map",
  "near-account-id",
  "num-rational",
  "serde",
@@ -2794,7 +2804,7 @@ dependencies = [
 [[package]]
 name = "near-rosetta-rpc"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "actix-cors",
@@ -2810,6 +2820,7 @@ dependencies = [
  "near-client-primitives",
  "near-crypto",
  "near-network",
+ "near-o11y",
  "near-primitives",
  "paperclip",
  "serde",
@@ -2822,7 +2833,7 @@ dependencies = [
 [[package]]
 name = "near-rpc-error-core"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "quote",
  "serde",
@@ -2832,8 +2843,9 @@ dependencies = [
 [[package]]
 name = "near-rpc-error-macro"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
+ "fs2",
  "near-rpc-error-core",
  "serde",
  "syn",
@@ -2853,12 +2865,17 @@ dependencies = [
 [[package]]
 name = "near-stable-hasher"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
+
+[[package]]
+name = "near-stdx"
+version = "0.0.0"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 
 [[package]]
 name = "near-store"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "anyhow",
  "borsh",
@@ -2874,9 +2891,10 @@ dependencies = [
  "near-crypto",
  "near-o11y",
  "near-primitives",
+ "near-stdx",
  "num_cpus",
  "once_cell",
- "rand 0.7.3",
+ "rand 0.8.5",
  "rlimit",
  "rocksdb",
  "serde",
@@ -2890,7 +2908,7 @@ dependencies = [
 [[package]]
 name = "near-telemetry"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "awc",
@@ -2909,22 +2927,22 @@ dependencies = [
 [[package]]
 name = "near-vm-errors"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "borsh",
  "near-account-id",
  "near-rpc-error-macro",
  "serde",
  "strum",
+ "thiserror",
 ]
 
 [[package]]
 name = "near-vm-logic"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "borsh",
- "bs58",
  "byteorder",
  "ed25519-dalek",
  "near-account-id",
@@ -2932,10 +2950,11 @@ dependencies = [
  "near-o11y",
  "near-primitives",
  "near-primitives-core",
+ "near-stdx",
  "near-vm-errors",
  "ripemd",
  "serde",
- "sha2 0.9.9",
+ "sha2 0.10.2",
  "sha3",
  "zeropool-bn",
 ]
@@ -2943,7 +2962,7 @@ dependencies = [
 [[package]]
 name = "near-vm-runner"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "anyhow",
  "borsh",
@@ -2974,8 +2993,8 @@ dependencies = [
 
 [[package]]
 name = "nearcore"
-version = "1.30.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+version = "0.0.0"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "actix",
  "actix-rt",
@@ -2998,11 +3017,11 @@ dependencies = [
  "near-client",
  "near-client-primitives",
  "near-crypto",
+ "near-dyn-configs",
  "near-epoch-manager",
  "near-jsonrpc",
  "near-mainnet-res",
  "near-network",
- "near-network-primitives",
  "near-o11y",
  "near-performance-metrics",
  "near-pool",
@@ -3014,7 +3033,7 @@ dependencies = [
  "node-runtime",
  "num-rational",
  "once_cell",
- "rand 0.7.3",
+ "rand 0.8.5",
  "rayon",
  "rlimit",
  "serde",
@@ -3058,7 +3077,7 @@ dependencies = [
 [[package]]
 name = "node-runtime"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=1.30.0#9b0275de057a01f87c259580f93e58f746da75aa"
+source = "git+https://github.com/near/nearcore?rev=1.31.0-rc.1#bf210a5a2bf23682f329f23da48735f308aa78e6"
 dependencies = [
  "borsh",
  "byteorder",
@@ -3075,7 +3094,7 @@ dependencies = [
  "num-rational",
  "num-traits",
  "once_cell",
- "rand 0.7.3",
+ "rand 0.8.5",
  "rayon",
  "serde",
  "serde_json",
@@ -3109,7 +3128,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -3120,7 +3139,7 @@ version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "num-traits",
 ]
 
@@ -3130,7 +3149,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -3143,7 +3162,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]
 
 [[package]]
@@ -3251,7 +3270,7 @@ version = "0.9.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "cc",
  "libc",
  "openssl-src",
@@ -3889,24 +3908,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.8",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_pcg",
- "rand_xorshift 0.1.1",
- "winapi",
-]
-
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -3931,16 +3932,6 @@ dependencies = [
  "rand_core 0.6.3",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -3961,21 +3952,6 @@ dependencies = [
  "rand_core 0.6.3",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -3994,15 +3970,6 @@ dependencies = [
  "getrandom 0.2.7",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -4013,51 +3980,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
+name = "rand_hc"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
 dependencies = [
- "rand_core 0.3.1",
+ "rand_core 0.6.3",
 ]
 
 [[package]]
 name = "rand_xorshift"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
 ]
 
 [[package]]
@@ -4075,7 +4012,7 @@ version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "crossbeam-deque",
  "either",
  "rayon-core",
@@ -4253,9 +4190,9 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290"
+checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -4503,10 +4440,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "sha-1"
-version = "0.10.0"
+name = "sha1"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+checksum = "006769ba83e921b3085caa8334186b00cf92b4cb1a6cf4632fbccc8eff5c7549"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
@@ -4593,7 +4530,7 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]
 
 [[package]]
@@ -4801,9 +4738,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemalloc-sys"
-version = "0.4.3+5.2.1-patched.2"
+version = "0.5.2+5.3.0-patched"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49"
+checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3"
 dependencies = [
  "cc",
  "fs_extra",
@@ -4860,7 +4797,7 @@ version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "bytes",
  "libc",
  "memchr",
@@ -5888,18 +5825,18 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.10.2+zstd.1.5.2"
+version = "0.11.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847"
+checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "4.1.6+zstd.1.5.2"
+version = "5.0.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb"
+checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
 dependencies = [
  "libc",
  "zstd-sys",
@@ -5907,10 +5844,11 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "1.6.3+zstd.1.5.2"
+version = "2.0.5+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8"
+checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596"
 dependencies = [
  "cc",
  "libc",
+ "pkg-config",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 9987a3c7..101e632d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,9 +57,9 @@ rustix = "0.33.7"
 # Added to get rid of a dependencies error even if we do not use it
 itertools = "0.10.3"
 
-near-indexer = { git = "https://github.com/near/nearcore", rev="1.30.0" }
-near-crypto = { git = "https://github.com/near/nearcore", rev="1.30.0" }
-near-vm-errors = { git = "https://github.com/near/nearcore", rev="1.30.0" }
+near-indexer = { git = "https://github.com/near/nearcore", rev="1.31.0-rc.1" }
+near-crypto = { git = "https://github.com/near/nearcore", rev="1.31.0-rc.1" }
+near-vm-errors = { git = "https://github.com/near/nearcore", rev="1.31.0-rc.1" }
 
 [build-dependencies]
 tonic-build = "0.5.0"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 7e22aaf6..b1825785 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.63.0"
+channel = "1.65.0"
 components = [ "rustfmt" ]
 targets = [ "wasm32-unknown-unknown" ]
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index b9813bc9..34a8f0a8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -34,6 +34,7 @@ fn main() {
                 home_dir,
                 sync_mode,
                 await_for_node_synced: near_indexer::AwaitForNodeSyncedEnum::StreamWhileSyncing,
+                validate_genesis: false,
             };
 
             let system = actix::System::new();