diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb402ec1..a750c327 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.10.30
+
+* Upgrade Indexer Framework to be based on [`nearcore` version `1.30.0-rc.2`](https://github.com/near/nearcore/releases/tag/1.30.0-rc.2)
+
 ## 0.10.29
 
 * Fixed circulating supply computation given that the args are not base64-encoded anymore (was broken since 0.10.22 release)
diff --git a/Cargo.lock b/Cargo.lock
index df22d00e..5a957799 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,7 +29,7 @@ dependencies = [
  "pin-project-lite",
  "smallvec",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.2",
 ]
 
 [[package]]
@@ -46,7 +46,7 @@ dependencies = [
  "memchr",
  "pin-project-lite",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.2",
 ]
 
 [[package]]
@@ -195,7 +195,7 @@ dependencies = [
  "openssl",
  "pin-project-lite",
  "tokio-openssl",
- "tokio-util",
+ "tokio-util 0.7.2",
 ]
 
 [[package]]
@@ -338,9 +338,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.57"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
+checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305"
 
 [[package]]
 name = "arc-swap"
@@ -386,6 +386,27 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "async-stream"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.53"
@@ -1305,7 +1326,7 @@ dependencies = [
 [[package]]
 name = "delay-detector"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "cpu-time",
  "tracing",
@@ -1601,6 +1622,12 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
 [[package]]
 name = "flate2"
 version = "1.0.23"
@@ -1655,10 +1682,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
+name = "fs_extra"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
 
 [[package]]
 name = "futures"
@@ -1831,7 +1858,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.2",
  "tracing",
 ]
 
@@ -1959,6 +1986,18 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper",
+ "pin-project-lite",
+ "tokio",
+ "tokio-io-timeout",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -2005,7 +2044,7 @@ dependencies = [
 
 [[package]]
 name = "indexer-explorer"
-version = "0.10.29"
+version = "0.10.30"
 dependencies = [
  "actix",
  "actix-diesel",
@@ -2026,7 +2065,7 @@ dependencies = [
  "near-client",
  "near-crypto",
  "near-indexer",
- "near-metrics",
+ "near-o11y",
  "near-sdk",
  "num-traits",
  "once_cell",
@@ -2073,12 +2112,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "integer-encoding"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e85a1509a128c855368e135cffcde7eac17d8e1083f41e2b98c58bc1a5074be"
-
 [[package]]
 name = "io-lifetimes"
 version = "0.5.3"
@@ -2179,6 +2212,7 @@ dependencies = [
  "glob",
  "libc",
  "libz-sys",
+ "tikv-jemalloc-sys",
  "zstd-sys",
 ]
 
@@ -2404,6 +2438,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
 
+[[package]]
+name = "multimap"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+
 [[package]]
 name = "native-tls"
 version = "0.2.10"
@@ -2425,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "near-account-id"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "borsh 0.9.3",
  "serde",
@@ -2434,7 +2474,7 @@ dependencies = [
 [[package]]
 name = "near-cache"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "lru",
 ]
@@ -2442,7 +2482,7 @@ dependencies = [
 [[package]]
 name = "near-chain"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "ansi_term",
@@ -2458,7 +2498,7 @@ dependencies = [
  "near-chain-primitives",
  "near-client-primitives",
  "near-crypto",
- "near-metrics",
+ "near-epoch-manager",
  "near-o11y",
  "near-pool",
  "near-primitives",
@@ -2475,7 +2515,7 @@ dependencies = [
 [[package]]
 name = "near-chain-configs"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2493,7 +2533,7 @@ dependencies = [
 [[package]]
 name = "near-chain-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "chrono",
  "near-crypto",
@@ -2505,7 +2545,7 @@ dependencies = [
 [[package]]
 name = "near-chunks"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "borsh 0.9.3",
@@ -2515,9 +2555,9 @@ dependencies = [
  "near-chain",
  "near-chunks-primitives",
  "near-crypto",
- "near-metrics",
  "near-network",
  "near-network-primitives",
+ "near-o11y",
  "near-pool",
  "near-primitives",
  "near-store",
@@ -2530,7 +2570,7 @@ dependencies = [
 [[package]]
 name = "near-chunks-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "near-chain-primitives",
  "near-primitives",
@@ -2539,7 +2579,7 @@ dependencies = [
 [[package]]
 name = "near-client"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "actix-rt",
@@ -2556,7 +2596,6 @@ dependencies = [
  "near-chunks",
  "near-client-primitives",
  "near-crypto",
- "near-metrics",
  "near-network",
  "near-network-primitives",
  "near-o11y",
@@ -2581,7 +2620,7 @@ dependencies = [
 [[package]]
 name = "near-client-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "chrono",
@@ -2591,6 +2630,7 @@ dependencies = [
  "near-crypto",
  "near-network-primitives",
  "near-primitives",
+ "once_cell",
  "serde",
  "serde_json",
  "strum",
@@ -2600,7 +2640,7 @@ dependencies = [
 [[package]]
 name = "near-crypto"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "arrayref",
  "blake2",
@@ -2612,10 +2652,9 @@ dependencies = [
  "ed25519-dalek",
  "near-account-id",
  "once_cell",
- "parity-secp256k1",
  "primitive-types",
  "rand 0.7.3",
- "rand_core 0.5.1",
+ "secp256k1",
  "serde",
  "serde_json",
  "subtle",
@@ -2625,12 +2664,12 @@ dependencies = [
 [[package]]
 name = "near-epoch-manager"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "borsh 0.9.3",
  "near-cache",
- "near-chain",
  "near-chain-configs",
+ "near-chain-primitives",
  "near-crypto",
  "near-primitives",
  "near-store",
@@ -2646,7 +2685,7 @@ dependencies = [
 [[package]]
 name = "near-indexer"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "anyhow",
@@ -2656,10 +2695,12 @@ dependencies = [
  "near-client",
  "near-crypto",
  "near-indexer-primitives",
+ "near-o11y",
  "near-primitives",
  "near-store",
  "nearcore",
  "node-runtime",
+ "once_cell",
  "rocksdb",
  "serde",
  "serde_json",
@@ -2670,7 +2711,7 @@ dependencies = [
 [[package]]
 name = "near-indexer-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "near-primitives",
  "serde",
@@ -2680,7 +2721,7 @@ dependencies = [
 [[package]]
 name = "near-jsonrpc"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "actix-cors",
@@ -2692,7 +2733,6 @@ dependencies = [
  "near-client-primitives",
  "near-jsonrpc-client",
  "near-jsonrpc-primitives",
- "near-metrics",
  "near-network",
  "near-network-primitives",
  "near-o11y",
@@ -2703,13 +2743,13 @@ dependencies = [
  "serde_json",
  "tokio",
  "tracing",
- "tracing-subscriber 0.3.11",
+ "tracing-subscriber 0.3.15",
 ]
 
 [[package]]
 name = "near-jsonrpc-client"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix-http",
  "awc",
@@ -2718,13 +2758,12 @@ dependencies = [
  "near-primitives",
  "serde",
  "serde_json",
- "uuid",
 ]
 
 [[package]]
 name = "near-jsonrpc-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "near-chain-configs",
  "near-client-primitives",
@@ -2734,22 +2773,12 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "uuid",
-]
-
-[[package]]
-name = "near-logger-utils"
-version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
-dependencies = [
- "near-o11y",
- "tracing",
 ]
 
 [[package]]
 name = "near-mainnet-res"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "near-account-id",
  "near-chain-configs",
@@ -2757,19 +2786,10 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "near-metrics"
-version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
-dependencies = [
- "prometheus",
- "tracing",
-]
-
 [[package]]
 name = "near-network"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "anyhow",
@@ -2788,14 +2808,11 @@ dependencies = [
  "itertools",
  "lru",
  "near-crypto",
- "near-logger-utils",
- "near-metrics",
  "near-network-primitives",
  "near-o11y",
  "near-performance-metrics",
  "near-performance-metrics-macros",
  "near-primitives",
- "near-rate-limiter",
  "near-stable-hasher",
  "near-store",
  "once_cell",
@@ -2803,8 +2820,8 @@ dependencies = [
  "parking_lot 0.12.1",
  "protobuf 3.0.2",
  "protobuf-codegen",
- "rand 0.6.5",
- "rand_pcg",
+ "rand 0.7.3",
+ "rand_xorshift 0.2.0",
  "rayon",
  "serde",
  "smart-default",
@@ -2812,7 +2829,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
- "tokio-util",
+ "tokio-util 0.7.2",
  "tracing",
  "tracing-opentelemetry",
 ]
@@ -2820,7 +2837,7 @@ dependencies = [
 [[package]]
 name = "near-network-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "anyhow",
@@ -2841,14 +2858,16 @@ dependencies = [
 [[package]]
 name = "near-o11y"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "atty",
  "backtrace",
  "clap",
  "once_cell",
  "opentelemetry",
- "opentelemetry-jaeger",
+ "opentelemetry-otlp",
+ "opentelemetry-semantic-conventions",
+ "prometheus",
  "strum",
  "thiserror",
  "tokio",
@@ -2856,13 +2875,13 @@ dependencies = [
  "tracing-appender",
  "tracing-opentelemetry",
  "tracing-serde",
- "tracing-subscriber 0.3.11",
+ "tracing-subscriber 0.3.15",
 ]
 
 [[package]]
 name = "near-performance-metrics"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "bitflags",
@@ -2872,14 +2891,14 @@ dependencies = [
  "once_cell",
  "strum",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.2",
  "tracing",
 ]
 
 [[package]]
 name = "near-performance-metrics-macros"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "quote",
  "syn",
@@ -2888,11 +2907,11 @@ dependencies = [
 [[package]]
 name = "near-pool"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "borsh 0.9.3",
  "near-crypto",
- "near-metrics",
+ "near-o11y",
  "near-primitives",
  "once_cell",
  "rand 0.7.3",
@@ -2901,7 +2920,7 @@ dependencies = [
 [[package]]
 name = "near-primitives"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "borsh 0.9.3",
  "byteorder",
@@ -2930,7 +2949,7 @@ dependencies = [
 [[package]]
 name = "near-primitives-core"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "base64 0.13.0",
  "borsh 0.9.3",
@@ -2962,24 +2981,10 @@ dependencies = [
  "sha2 0.9.9",
 ]
 
-[[package]]
-name = "near-rate-limiter"
-version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
-dependencies = [
- "actix",
- "bytes",
- "futures-core",
- "pin-project-lite",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "near-rosetta-rpc"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "actix-cors",
@@ -3007,7 +3012,7 @@ dependencies = [
 [[package]]
 name = "near-rpc-error-core"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "quote",
  "serde",
@@ -3030,7 +3035,7 @@ dependencies = [
 [[package]]
 name = "near-rpc-error-macro"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "near-rpc-error-core 0.0.0",
  "serde",
@@ -3092,13 +3097,14 @@ dependencies = [
 [[package]]
 name = "near-stable-hasher"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 
 [[package]]
 name = "near-store"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
+ "anyhow",
  "borsh 0.9.3",
  "byteorder",
  "bytesize",
@@ -3107,9 +3113,9 @@ dependencies = [
  "elastic-array",
  "enum-map",
  "fs2",
+ "itoa",
  "lru",
  "near-crypto",
- "near-metrics",
  "near-o11y",
  "near-primitives",
  "num_cpus",
@@ -3133,12 +3139,12 @@ source = "git+https://github.com/near/near-sdk-rs?rev=03487c184d37b0382dd9bd41c5
 [[package]]
 name = "near-telemetry"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "awc",
  "futures",
- "near-metrics",
+ "near-o11y",
  "near-performance-metrics",
  "near-performance-metrics-macros",
  "near-primitives",
@@ -3152,12 +3158,13 @@ dependencies = [
 [[package]]
 name = "near-vm-errors"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "borsh 0.9.3",
  "near-account-id",
  "near-rpc-error-macro 0.0.0",
  "serde",
+ "strum",
 ]
 
 [[package]]
@@ -3175,11 +3182,12 @@ dependencies = [
 [[package]]
 name = "near-vm-logic"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "borsh 0.9.3",
  "bs58",
  "byteorder",
+ "ed25519-dalek",
  "near-account-id",
  "near-crypto",
  "near-o11y",
@@ -3188,8 +3196,8 @@ dependencies = [
  "near-vm-errors 0.0.0",
  "ripemd",
  "serde",
- "sha2 0.9.9",
- "sha3",
+ "sha2 0.10.2",
+ "sha3 0.10.1",
  "zeropool-bn",
 ]
 
@@ -3208,13 +3216,13 @@ dependencies = [
  "near-vm-errors 4.0.0-pre.1",
  "serde",
  "sha2 0.9.9",
- "sha3",
+ "sha3 0.9.1",
 ]
 
 [[package]]
 name = "near-vm-runner"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "anyhow",
  "borsh 0.9.3",
@@ -3245,8 +3253,8 @@ dependencies = [
 
 [[package]]
 name = "nearcore"
-version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+version = "1.30.0-rc.2"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "actix",
  "actix-rt",
@@ -3267,11 +3275,11 @@ dependencies = [
  "near-chain-configs",
  "near-chunks",
  "near-client",
+ "near-client-primitives",
  "near-crypto",
  "near-epoch-manager",
  "near-jsonrpc",
  "near-mainnet-res",
- "near-metrics",
  "near-network",
  "near-network-primitives",
  "near-o11y",
@@ -3316,14 +3324,13 @@ dependencies = [
 [[package]]
 name = "node-runtime"
 version = "0.0.0"
-source = "git+https://github.com/near/nearcore?rev=cdebd3fa2cf516f0b672710c404718c331dd1b07#cdebd3fa2cf516f0b672710c404718c331dd1b07"
+source = "git+https://github.com/near/nearcore?rev=418df99fe099daa01a921c5d1c3169c9b82744cc#418df99fe099daa01a921c5d1c3169c9b82744cc"
 dependencies = [
  "borsh 0.9.3",
  "byteorder",
  "hex",
  "near-chain-configs",
  "near-crypto",
- "near-metrics",
  "near-o11y",
  "near-primitives",
  "near-store",
@@ -3455,9 +3462,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.12.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
+checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
 
 [[package]]
 name = "opaque-debug"
@@ -3542,18 +3549,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "opentelemetry-jaeger"
-version = "0.16.0"
+name = "opentelemetry-otlp"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c0b12cd9e3f9b35b52f6e0dac66866c519b26f424f4bbf96e3fe8bfbdc5229"
+checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a"
 dependencies = [
  "async-trait",
- "lazy_static",
+ "futures",
+ "futures-util",
+ "http",
  "opentelemetry",
- "opentelemetry-semantic-conventions",
+ "prost",
  "thiserror",
- "thrift",
  "tokio",
+ "tonic",
+ "tonic-build",
 ]
 
 [[package]]
@@ -3565,15 +3575,6 @@ dependencies = [
  "opentelemetry",
 ]
 
-[[package]]
-name = "ordered-float"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "os_str_bytes"
 version = "6.0.1"
@@ -3665,18 +3666,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "parity-secp256k1"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fca4f82fccae37e8bbdaeb949a4a218a1bbc485d11598f193d2a908042e5fc1"
-dependencies = [
- "arrayvec",
- "cc",
- "cfg-if 0.1.10",
- "rand 0.7.3",
-]
-
 [[package]]
 name = "parity-wasm"
 version = "0.41.0"
@@ -3754,6 +3743,16 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
+[[package]]
+name = "petgraph"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
+dependencies = [
+ "fixedbitset",
+ "indexmap",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.0.10"
@@ -3874,6 +3873,59 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "prost"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
+dependencies = [
+ "bytes",
+ "heck 0.3.3",
+ "itertools",
+ "lazy_static",
+ "log",
+ "multimap",
+ "petgraph",
+ "prost",
+ "prost-types",
+ "regex",
+ "tempfile",
+ "which",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
+dependencies = [
+ "bytes",
+ "prost",
+]
+
 [[package]]
 name = "protobuf"
 version = "2.27.1"
@@ -4004,9 +4056,8 @@ dependencies = [
  "rand_hc 0.1.0",
  "rand_isaac",
  "rand_jitter",
- "rand_os",
  "rand_pcg",
- "rand_xorshift",
+ "rand_xorshift 0.1.1",
  "winapi",
 ]
 
@@ -4135,20 +4186,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
-]
-
 [[package]]
 name = "rand_pcg"
 version = "0.1.2"
@@ -4168,6 +4205,15 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
+[[package]]
+name = "rand_xorshift"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
 [[package]]
 name = "rand_xoshiro"
 version = "0.6.0"
@@ -4201,15 +4247,6 @@ dependencies = [
  "num_cpus",
 ]
 
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.1.57"
@@ -4471,6 +4508,25 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
+[[package]]
+name = "secp256k1"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7649a0b3ffb32636e60c7ce0d70511eda9c52c658cd0634e194d5a19943aeff"
+dependencies = [
+ "rand 0.8.5",
+ "secp256k1-sys",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7058dc8eaf3f2810d7828680320acda0b25a288f6d288e19278e249bbf74226b"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.6.1"
@@ -4517,9 +4573,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.137"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
 dependencies = [
  "serde_derive",
 ]
@@ -4545,9 +4601,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.137"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4657,6 +4713,16 @@ dependencies = [
  "opaque-debug",
 ]
 
+[[package]]
+name = "sha3"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86"
+dependencies = [
+ "digest 0.10.3",
+ "keccak",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.4"
@@ -4879,18 +4945,18 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
 
 [[package]]
 name = "thiserror"
-version = "1.0.31"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4907,25 +4973,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "threadpool"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
-dependencies = [
- "num_cpus",
-]
-
-[[package]]
-name = "thrift"
-version = "0.15.0"
+name = "tikv-jemalloc-sys"
+version = "0.4.3+5.2.1-patched.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b82ca8f46f95b3ce96081fe3dd89160fdea970c254bb72925255d1b62aae692e"
+checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49"
 dependencies = [
- "byteorder",
- "integer-encoding",
- "log",
- "ordered-float",
- "threadpool",
+ "cc",
+ "fs_extra",
+ "libc",
 ]
 
 [[package]]
@@ -4992,6 +5047,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "tokio-io-timeout"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-macros"
 version = "1.7.0"
@@ -5036,6 +5101,20 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.6.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "log",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.2"
@@ -5059,6 +5138,75 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "tonic"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "base64 0.13.0",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-timeout",
+ "percent-encoding",
+ "pin-project",
+ "prost",
+ "prost-derive",
+ "tokio",
+ "tokio-stream",
+ "tokio-util 0.6.10",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+ "tracing-futures",
+]
+
+[[package]]
+name = "tonic-build"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
+dependencies = [
+ "proc-macro2",
+ "prost-build",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "indexmap",
+ "pin-project",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "slab",
+ "tokio",
+ "tokio-util 0.7.2",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
+
 [[package]]
 name = "tower-service"
 version = "0.3.1"
@@ -5067,9 +5215,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.34"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
+checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
@@ -5086,14 +5234,14 @@ checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
 dependencies = [
  "crossbeam-channel",
  "time 0.3.9",
- "tracing-subscriber 0.3.11",
+ "tracing-subscriber 0.3.15",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
+checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5102,14 +5250,24 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.26"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
+checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
 dependencies = [
- "lazy_static",
+ "once_cell",
  "valuable",
 ]
 
+[[package]]
+name = "tracing-futures"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
+dependencies = [
+ "pin-project",
+ "tracing",
+]
+
 [[package]]
 name = "tracing-log"
 version = "0.1.3"
@@ -5123,15 +5281,16 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.17.2"
+version = "0.17.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f9378e96a9361190ae297e7f3a8ff644aacd2897f244b1ff81f381669196fa6"
+checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f"
 dependencies = [
+ "once_cell",
  "opentelemetry",
  "tracing",
  "tracing-core",
  "tracing-log",
- "tracing-subscriber 0.3.11",
+ "tracing-subscriber 0.3.15",
 ]
 
 [[package]]
@@ -5168,13 +5327,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.11"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
+checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b"
 dependencies = [
  "ansi_term",
- "lazy_static",
  "matchers 0.1.0",
+ "once_cell",
  "regex",
  "sharded-slab",
  "smallvec",
@@ -5265,15 +5424,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom 0.2.6",
-]
-
 [[package]]
 name = "validator"
 version = "0.12.0"
diff --git a/Cargo.toml b/Cargo.toml
index 68dd9719..6452a2bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "indexer-explorer"
-version = "0.10.29"
+version = "0.10.30"
 authors = ["Near Inc <hello@nearprotocol.com>"]
 edition = "2021"
 
@@ -36,7 +36,7 @@ tracing-subscriber = "0.2.4"
 uint = { version = "0.8.3", default-features = false }
 
 actix-diesel = { git = "https://github.com/frol/actix-diesel", rev = "3a001986c89dfabfc3c448d8bae28525101b4992" }
-near-indexer = { git = "https://github.com/near/nearcore", rev = "cdebd3fa2cf516f0b672710c404718c331dd1b07" }
-near-crypto = { git = "https://github.com/near/nearcore", rev = "cdebd3fa2cf516f0b672710c404718c331dd1b07" }
-near-client = { git = "https://github.com/near/nearcore", rev = "cdebd3fa2cf516f0b672710c404718c331dd1b07" }
-near-metrics = { git = "https://github.com/near/nearcore", rev = "cdebd3fa2cf516f0b672710c404718c331dd1b07" }
+near-indexer = { git = "https://github.com/near/nearcore", rev = "418df99fe099daa01a921c5d1c3169c9b82744cc" }
+near-crypto = { git = "https://github.com/near/nearcore", rev = "418df99fe099daa01a921c5d1c3169c9b82744cc" }
+near-client = { git = "https://github.com/near/nearcore", rev = "418df99fe099daa01a921c5d1c3169c9b82744cc" }
+near-o11y = { git = "https://github.com/near/nearcore", rev = "418df99fe099daa01a921c5d1c3169c9b82744cc" }
diff --git a/rust-toolchain b/rust-toolchain
index b77a81dc..94057304 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.62.1
+1.64.0
diff --git a/src/aggregated/circulating_supply/lockup.rs b/src/aggregated/circulating_supply/lockup.rs
index 64fa18f1..2ff4addc 100644
--- a/src/aggregated/circulating_supply/lockup.rs
+++ b/src/aggregated/circulating_supply/lockup.rs
@@ -27,6 +27,7 @@ pub(super) async fn get_lockup_contract_state(
     let request = near_primitives::views::QueryRequest::ViewState {
         account_id: account_id.clone(),
         prefix: vec![].into(),
+        include_proof: false,
     };
     let query = Query::new(block_reference, request);
 
diff --git a/src/metrics.rs b/src/metrics.rs
index 0982f28f..77576a51 100644
--- a/src/metrics.rs
+++ b/src/metrics.rs
@@ -1,4 +1,4 @@
-use near_metrics::{
+use near_o11y::metrics::{
     exponential_buckets, try_create_histogram, try_create_histogram_vec, Histogram, HistogramVec,
 };
 use once_cell::sync::Lazy;