From 17db12a0f3f0ad256fe45c1e54f2310a47ae69ce Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Thu, 31 Oct 2024 16:11:54 +0200 Subject: [PATCH 1/9] update nearcore version to 2.3.0 (#368) * update nearcore version to 2.3.0 * improvement --- .cargo/config.toml | 2 +- CHANGELOG.md | 7 + Cargo.lock | 1221 ++++++++++---------- Cargo.toml | 31 +- cache-storage/Cargo.toml | 2 +- cache-storage/src/lib.rs | 12 +- logic-state-indexer/src/configs.rs | 18 + logic-state-indexer/src/lib.rs | 12 +- logic-state-indexer/src/near_client/mod.rs | 18 - near-state-indexer/Cargo.toml | 1 + near-state-indexer/src/configs.rs | 6 +- near-state-indexer/src/main.rs | 7 +- near-state-indexer/src/near_client.rs | 12 - rpc-server/Dockerfile | 2 +- rpc-server/src/config.rs | 1 + rpc-server/src/modules/network/methods.rs | 2 + rust-toolchain | 2 +- state-indexer/Dockerfile | 2 +- state-indexer/src/main.rs | 18 +- tx-indexer/Dockerfile | 2 +- tx-indexer/src/main.rs | 27 +- tx-indexer/src/storage.rs | 2 +- 22 files changed, 704 insertions(+), 703 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 4a0543c4..65e1005d 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ [env] -NEARCORE_VERSION = "2.2.1" +NEARCORE_VERSION = "2.3.0" diff --git a/CHANGELOG.md b/CHANGELOG.md index bad5c2fc..605db366 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/near/read-rpc/compare/main...develop) +## [0.3.1](https://github.com/near/read-rpc/releases/tag/v0.3.1) + +### Supported Nearcore Version +- nearcore v2.3.0 +- rust v1.81.0 + ### What's Changed * Improved bulk insertion of state_changes, reducing database requests from hundreds to a maximum of 7 per block. * Configuration improvement. Create default config.toml on start application to loaded parameters from the environment variables. * Fix to fetch state by pages (view_state_paginated). +* Change logic to get `shard_layout` for indexers. Main idea to avoid request `protocol_config` via RPC, `protocol_config` could be changed with new nearcore release and we should support old and new versions of `protocol_config`. ## [0.3.0](https://github.com/near/read-rpc/releases/tag/v0.3.0) diff --git a/Cargo.lock b/Cargo.lock index 808755d5..9b02a274 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -130,7 +130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -269,7 +269,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -280,7 +280,7 @@ checksum = "b6ac1e58cded18cb28ddc17143c4dea5345b3ad575e14f32f66e4054a56eb271" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -294,11 +294,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "gimli 0.31.0", + "gimli 0.31.1", ] [[package]] @@ -378,9 +378,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" dependencies = [ "anstyle", "anstyle-parse", @@ -393,43 +393,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "arbitrary" @@ -487,9 +487,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -498,24 +498,24 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -545,9 +545,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "awc" @@ -585,9 +585,9 @@ dependencies = [ [[package]] name = "aws-config" -version = "1.5.6" +version = "1.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc" +checksum = "2d6448cfb224dd6a9b9ac734f58622dd0d4751f3589f3b777345745f46b2eb14" dependencies = [ "aws-credential-types", "aws-runtime", @@ -678,11 +678,10 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.51.0" +version = "1.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09fd4b5c7ed75f52b913b4f3ff0501dae7f8cb9125f6d45db4553980cbc0528" +checksum = "0656a79cf5e6ab0d4bb2465cd750a7a2fd7ea26c062183ed94225f5782e22365" dependencies = [ - "ahash 0.8.11", "aws-credential-types", "aws-runtime", "aws-sigv4", @@ -702,7 +701,7 @@ dependencies = [ "hmac", "http 0.2.12", "http-body 0.4.6", - "lru 0.12.4", + "lru 0.12.5", "once_cell", "percent-encoding", "regex-lite", @@ -713,9 +712,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.43.0" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a9d27ed1c12b1140c47daf1bc541606c43fdafd918c4797d520db0043ceef2" +checksum = "a8776850becacbd3a82a4737a9375ddb5c6832a51379f24443a98e61513f852c" dependencies = [ "aws-credential-types", "aws-runtime", @@ -735,9 +734,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.44.0" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44514a6ca967686cde1e2a1b81df6ef1883d0e3e570da8d8bc5c491dcb6fc29b" +checksum = "0007b5b8004547133319b6c4e87193eee2a0bcb3e4c18c75d09febe9dab7b383" dependencies = [ "aws-credential-types", "aws-runtime", @@ -757,9 +756,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.43.0" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7a4d279762a35b9df97209f6808b95d4fe78547fe2316b4d200a0283960c5a" +checksum = "9fffaa356e7f1c725908b75136d53207fa714e348f365671df14e95a60530ad3" dependencies = [ "aws-credential-types", "aws-runtime", @@ -780,9 +779,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68" +checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -820,9 +819,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.60.12" +version = "0.60.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598b1689d001c4d4dc3cb386adb07d37786783aee3ac4b324bcadac116bf3d23" +checksum = "ba1a71073fca26775c8b5189175ea8863afb1c9ea2cceb02a5de5ad9dfbaa795" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -892,9 +891,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.1" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" +checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -907,7 +906,7 @@ dependencies = [ "http-body 0.4.6", "http-body 1.0.1", "httparse", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-rustls", "once_cell", "pin-project-lite", @@ -936,9 +935,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.6" +version = "1.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" +checksum = "07c9cdc179e6afbf5d391ab08c85eac817b51c87e1892a5edb5f7bbdc64314b4" dependencies = [ "base64-simd", "bytes", @@ -996,7 +995,7 @@ dependencies = [ "futures-util", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "itoa", "matchit", "memchr", @@ -1034,11 +1033,11 @@ version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ - "addr2line 0.24.1", + "addr2line 0.24.2", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.36.4", + "object 0.36.5", "rustc-demangle", "windows-targets 0.52.6", ] @@ -1127,7 +1126,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1275,7 +1274,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "syn_derive", ] @@ -1364,9 +1363,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bytes-utils" @@ -1419,7 +1418,7 @@ dependencies = [ [[package]] name = "cache-storage" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "futures", @@ -1438,9 +1437,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.1.21" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", @@ -1511,9 +1510,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -1521,9 +1520,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -1533,14 +1532,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1583,9 +1582,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "combine" @@ -1612,7 +1611,7 @@ dependencies = [ [[package]] name = "configuration" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "aws-credential-types", @@ -1961,9 +1960,9 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.46" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" +checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265" dependencies = [ "curl-sys", "libc", @@ -1976,9 +1975,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.75+curl-8.10.0" +version = "0.4.77+curl-8.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4fd752d337342e4314717c0d9b6586b059a120c80029ebe4d49b11fec7875e" +checksum = "f469e8a5991f277a208224f6c7ad72ecb5f986e36d09ae1f2c1bb9259478a480" dependencies = [ "cc", "libc", @@ -2014,7 +2013,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2062,7 +2061,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2084,7 +2083,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2102,7 +2101,7 @@ dependencies = [ [[package]] name = "database" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "async-trait", @@ -2112,8 +2111,8 @@ dependencies = [ "futures", "hex", "lazy_static", - "near-crypto 2.2.1", - "near-primitives 2.2.1", + "near-crypto 2.3.0", + "near-primitives 2.3.0", "prometheus", "readnode-primitives", "serde_json", @@ -2168,7 +2167,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2179,7 +2178,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2223,7 +2222,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2430,9 +2429,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if 1.0.0", ] @@ -2454,7 +2453,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2475,7 +2474,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2612,9 +2611,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -2622,9 +2621,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "futures-core", "futures-sink", @@ -2637,6 +2636,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -2679,9 +2684,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2694,9 +2699,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2704,15 +2709,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2732,9 +2737,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2764,32 +2769,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2875,15 +2880,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", - "indexmap 2.5.0", + "indexmap 2.6.0", "stable_deref_trait", ] [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -2903,7 +2908,7 @@ dependencies = [ "google-cloud-token", "home", "jsonwebtoken 9.3.0", - "reqwest 0.12.7", + "reqwest 0.12.9", "serde", "serde_json", "thiserror", @@ -2919,7 +2924,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f" dependencies = [ - "reqwest 0.12.7", + "reqwest 0.12.9", "thiserror", "tokio", ] @@ -2944,7 +2949,7 @@ dependencies = [ "percent-encoding", "pkcs8 0.10.2", "regex", - "reqwest 0.12.7", + "reqwest 0.12.9", "reqwest-middleware", "ring 0.17.8", "serde", @@ -2989,7 +2994,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util 0.7.12", @@ -3033,6 +3038,17 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "hashlink" version = "0.8.4" @@ -3166,9 +3182,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -3184,9 +3200,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -3208,9 +3224,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -3233,7 +3249,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "log", "rustls", "rustls-native-certs", @@ -3247,7 +3263,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.30", + "hyper 0.14.31", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -3260,7 +3276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.30", + "hyper 0.14.31", "native-tls", "tokio", "tokio-native-tls", @@ -3274,7 +3290,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", "native-tls", "tokio", @@ -3284,20 +3300,19 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.0", "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] @@ -3357,9 +3372,9 @@ dependencies = [ [[package]] name = "impl-more" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" +checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" [[package]] name = "indexmap" @@ -3374,12 +3389,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -3413,9 +3428,9 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is_terminal_polyfill" @@ -3492,9 +3507,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -3572,9 +3587,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libloading" @@ -3588,9 +3603,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libmimalloc-sys" @@ -3702,7 +3717,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logic-state-indexer" -version = "0.3.0" +version = "0.3.1" dependencies = [ "actix-web", "anyhow", @@ -3715,10 +3730,10 @@ dependencies = [ "humantime", "itertools 0.13.0", "lazy_static", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-indexer-primitives", "near-jsonrpc-client 0.13.0", - "near-primitives 2.2.1", + "near-primitives 2.3.0", "prometheus", "readnode-primitives", "tokio", @@ -3737,18 +3752,18 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] name = "lz4-sys" -version = "1.11.0" +version = "1.11.1+lz4-1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" dependencies = [ "cc", "libc", @@ -3806,7 +3821,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3962,9 +3977,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "mutually_exclusive_features" -version = "0.0.3" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d02c0b00610773bb7fc61d85e13d86c7858cbdf00e1a120bfc41bc055dbaa0e" +checksum = "e94e1e6445d314f972ff7395df2de295fe51b71821694f0b0e1e79c4f12c8577" [[package]] name = "native-tls" @@ -3995,14 +4010,14 @@ dependencies = [ [[package]] name = "near-async" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "derive_more", "futures", "near-async-derive", - "near-o11y 2.2.1", + "near-o11y 2.3.0", "near-performance-metrics", "near-time", "once_cell", @@ -4015,26 +4030,26 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "near-cache" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ - "lru 0.12.4", + "lru 0.12.5", ] [[package]] name = "near-chain" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "assert_matches", @@ -4046,30 +4061,32 @@ dependencies = [ "enum-map", "itertools 0.10.5", "itoa", - "lru 0.12.4", + "lru 0.12.5", "near-async", "near-cache", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-chain-primitives", "near-client-primitives", - "near-crypto 2.2.1", + "near-crypto 2.3.0", "near-epoch-manager", "near-mainnet-res", "near-network", - "near-o11y 2.2.1", - "near-parameters 2.2.1", + "near-o11y 2.3.0", + "near-parameters 2.3.0", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.2.1", + "near-primitives 2.3.0", + "near-schema-checker-lib", "near-store", - "near-vm-runner 2.2.1", + "near-vm-runner 2.3.0", "node-runtime", "num-rational", "once_cell", "rand 0.8.5", "rand_chacha 0.3.1", "rayon", + "serde", "strum", "tempfile", "thiserror", @@ -4103,21 +4120,20 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "anyhow", "bytesize", "chrono", "derive_more", - "near-config-utils 2.2.1", - "near-crypto 2.2.1", - "near-o11y 2.2.1", - "near-parameters 2.2.1", - "near-primitives 2.2.1", + "near-config-utils 2.3.0", + "near-crypto 2.3.0", + "near-o11y 2.3.0", + "near-parameters 2.3.0", + "near-primitives 2.3.0", "near-time", "num-rational", - "once_cell", "serde", "serde_json", "sha2", @@ -4128,11 +4144,11 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ - "near-crypto 2.2.1", - "near-primitives 2.2.1", + "near-crypto 2.3.0", + "near-primitives 2.3.0", "near-time", "thiserror", "time", @@ -4141,8 +4157,8 @@ dependencies = [ [[package]] name = "near-chunks" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "borsh 1.5.1", @@ -4150,21 +4166,20 @@ dependencies = [ "derive_more", "futures", "itertools 0.10.5", - "lru 0.12.4", + "lru 0.12.5", "near-async", "near-chain", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-chunks-primitives", - "near-crypto 2.2.1", + "near-crypto 2.3.0", "near-epoch-manager", "near-network", - "near-o11y 2.2.1", + "near-o11y 2.3.0", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.2.1", + "near-primitives 2.3.0", "near-store", - "once_cell", "rand 0.8.5", "reed-solomon-erasure 6.0.0", "strum", @@ -4174,17 +4189,17 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "near-chain-primitives", - "near-primitives 2.2.1", + "near-primitives 2.3.0", ] [[package]] name = "near-client" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "actix-rt", @@ -4197,27 +4212,27 @@ dependencies = [ "derive_more", "futures", "itertools 0.10.5", - "lru 0.12.4", + "lru 0.12.5", "near-async", "near-cache", "near-chain", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-chain-primitives", "near-chunks", "near-client-primitives", - "near-crypto 2.2.1", + "near-crypto 2.3.0", "near-dyn-configs", "near-epoch-manager", "near-network", - "near-o11y 2.2.1", - "near-parameters 2.2.1", + "near-o11y 2.3.0", + "near-parameters 2.3.0", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.2.1", + "near-primitives 2.3.0", "near-store", "near-telemetry", - "near-vm-runner 2.2.1", + "near-vm-runner 2.3.0", "num-rational", "once_cell", "percent-encoding", @@ -4241,16 +4256,16 @@ dependencies = [ [[package]] name = "near-client-primitives" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "chrono", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-chain-primitives", "near-chunks-primitives", - "near-crypto 2.2.1", - "near-primitives 2.2.1", + "near-crypto 2.3.0", + "near-primitives 2.3.0", "near-time", "serde", "serde_json", @@ -4275,8 +4290,8 @@ dependencies = [ [[package]] name = "near-config-utils" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "anyhow", "json_comments", @@ -4313,8 +4328,8 @@ dependencies = [ [[package]] name = "near-crypto" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "blake2 0.10.6", "borsh 1.5.1", @@ -4324,9 +4339,9 @@ dependencies = [ "ed25519-dalek", "hex", "near-account-id", - "near-config-utils 2.2.1", - "near-stdx 2.2.1", - "once_cell", + "near-config-utils 2.3.0", + "near-schema-checker-lib", + "near-stdx 2.3.0", "primitive-types", "rand 0.8.5", "secp256k1", @@ -4338,16 +4353,15 @@ dependencies = [ [[package]] name = "near-dyn-configs" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "anyhow", - "near-chain-configs 2.2.1", - "near-crypto 2.2.1", - "near-o11y 2.2.1", - "near-primitives 2.2.1", + "near-chain-configs 2.3.0", + "near-crypto 2.3.0", + "near-o11y 2.3.0", + "near-primitives 2.3.0", "near-time", - "once_cell", "prometheus", "serde", "serde_json", @@ -4358,23 +4372,25 @@ dependencies = [ [[package]] name = "near-epoch-manager" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "borsh 1.5.1", "itertools 0.10.5", "near-cache", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-chain-primitives", - "near-crypto 2.2.1", - "near-o11y 2.2.1", - "near-primitives 2.2.1", + "near-crypto 2.3.0", + "near-o11y 2.3.0", + "near-primitives 2.3.0", + "near-schema-checker-lib", "near-store", + "num-bigint 0.3.3", "num-rational", - "once_cell", "primitive-types", "rand 0.8.5", "rand_hc 0.3.2", + "serde", "serde_json", "smart-default", "tracing", @@ -4391,33 +4407,32 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ - "near-primitives-core 2.2.1", + "near-primitives-core 2.3.0", ] [[package]] name = "near-indexer" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "anyhow", "futures", - "lazy_static", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-client", - "near-crypto 2.2.1", + "near-config-utils 2.3.0", + "near-crypto 2.3.0", "near-dyn-configs", "near-indexer-primitives", - "near-o11y 2.2.1", - "near-parameters 2.2.1", - "near-primitives 2.2.1", + "near-o11y 2.3.0", + "near-parameters 2.3.0", + "near-primitives 2.3.0", "near-store", "nearcore", "node-runtime", - "once_cell", "rocksdb", "serde", "serde_json", @@ -4427,18 +4442,18 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ - "near-primitives 2.2.1", + "near-primitives 2.3.0", "serde", "serde_json", ] [[package]] name = "near-jsonrpc" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "actix-cors 0.6.5", @@ -4449,16 +4464,14 @@ dependencies = [ "futures", "hex", "near-async", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-client", "near-client-primitives", - "near-jsonrpc-client 2.2.1", - "near-jsonrpc-primitives 2.2.1", + "near-jsonrpc-client 2.3.0", + "near-jsonrpc-primitives 2.3.0", "near-network", - "near-o11y 2.2.1", - "near-primitives 2.2.1", - "near-rpc-error-macro 2.2.1", - "once_cell", + "near-o11y 2.3.0", + "near-primitives 2.3.0", "serde", "serde_json", "serde_with", @@ -4489,16 +4502,16 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" version = "0.13.0" -source = "git+https://github.com/kobayurii/near-jsonrpc-client-rs.git?branch=0.13.3#f0920d4f9e7d04f68920dcf2af0176ed7f83d0e9" +source = "git+https://github.com/kobayurii/near-jsonrpc-client-rs.git?branch=fork/0.14.0#fe1f68feab15045138cd76c084da45f444a5ce10" dependencies = [ "borsh 1.5.1", "lazy_static", "log", - "near-chain-configs 2.2.1", - "near-crypto 2.2.1", - "near-jsonrpc-primitives 2.2.1", - "near-primitives 2.2.1", - "reqwest 0.12.7", + "near-chain-configs 2.3.0", + "near-crypto 2.3.0", + "near-jsonrpc-primitives 2.3.0", + "near-primitives 2.3.0", + "reqwest 0.12.9", "serde", "serde_json", "thiserror", @@ -4506,14 +4519,14 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix-http", "awc", "futures", - "near-jsonrpc-primitives 2.2.1", - "near-primitives 2.2.1", + "near-jsonrpc-primitives 2.3.0", + "near-primitives 2.3.0", "serde", "serde_json", ] @@ -4528,7 +4541,7 @@ dependencies = [ "near-chain-configs 0.20.1", "near-crypto 0.20.1", "near-primitives 0.20.1", - "near-rpc-error-macro 0.20.1", + "near-rpc-error-macro", "serde", "serde_json", "thiserror", @@ -4536,15 +4549,15 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "arbitrary", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-client-primitives", - "near-crypto 2.2.1", - "near-primitives 2.2.1", - "near-rpc-error-macro 2.2.1", + "near-crypto 2.3.0", + "near-primitives 2.3.0", + "near-schema-checker-lib", "serde", "serde_json", "thiserror", @@ -4554,7 +4567,7 @@ dependencies = [ [[package]] name = "near-lake-framework" version = "0.0.0" -source = "git+https://github.com/kobayurii/near-lake-framework-rs.git?branch=0.7.20#285e88382b25823141a0f80840d30f918c999ca2" +source = "git+https://github.com/kobayurii/near-lake-framework-rs.git?branch=fork/0.7.10#5f6b9b1c785a98692a8d017b2154c29e8aa0e2d5" dependencies = [ "anyhow", "async-stream", @@ -4577,19 +4590,19 @@ dependencies = [ [[package]] name = "near-mainnet-res" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "near-account-id", - "near-chain-configs 2.2.1", - "near-primitives 2.2.1", + "near-chain-configs 2.3.0", + "near-primitives 2.3.0", "serde_json", ] [[package]] name = "near-network" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "anyhow", @@ -4606,21 +4619,21 @@ dependencies = [ "futures-util", "im", "itertools 0.10.5", - "lru 0.12.4", + "lru 0.12.5", "near-async", - "near-chain-configs 2.2.1", - "near-crypto 2.2.1", - "near-fmt 2.2.1", - "near-o11y 2.2.1", + "near-chain-configs 2.3.0", + "near-crypto 2.3.0", + "near-fmt 2.3.0", + "near-o11y 2.3.0", "near-performance-metrics", "near-performance-metrics-macros", - "near-primitives 2.2.1", + "near-primitives 2.3.0", + "near-schema-checker-lib", "near-store", - "once_cell", "opentelemetry 0.22.0", "parking_lot 0.12.3", "pin-project", - "protobuf 3.5.1", + "protobuf 3.7.1", "protobuf-codegen", "rand 0.8.5", "rayon", @@ -4668,15 +4681,14 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "base64 0.21.7", "clap", - "near-crypto 2.2.1", - "near-primitives-core 2.2.1", - "once_cell", + "near-crypto 2.3.0", + "near-primitives-core 2.3.0", "opentelemetry 0.22.0", "opentelemetry-otlp 0.15.0", "opentelemetry-semantic-conventions 0.14.0", @@ -4713,13 +4725,14 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "borsh 1.5.1", "enum-map", "near-account-id", - "near-primitives-core 2.2.1", + "near-primitives-core 2.3.0", + "near-schema-checker-lib", "num-rational", "serde", "serde_repr", @@ -4730,15 +4743,14 @@ dependencies = [ [[package]] name = "near-performance-metrics" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "bitflags 1.3.2", "bytes", "futures", "libc", - "once_cell", "tokio", "tokio-util 0.7.12", "tracing", @@ -4746,23 +4758,22 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "near-pool" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "borsh 1.5.1", - "near-crypto 2.2.1", - "near-o11y 2.2.1", - "near-primitives 2.2.1", - "once_cell", + "near-crypto 2.3.0", + "near-o11y 2.3.0", + "near-primitives 2.3.0", "rand 0.8.5", ] @@ -4787,7 +4798,7 @@ dependencies = [ "near-o11y 0.20.1", "near-parameters 0.20.1", "near-primitives-core 0.20.1", - "near-rpc-error-macro 0.20.1", + "near-rpc-error-macro", "near-stdx 0.20.1", "near-vm-runner 0.20.1", "num-rational", @@ -4810,11 +4821,12 @@ dependencies = [ [[package]] name = "near-primitives" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "arbitrary", "base64 0.21.7", + "bitvec", "borsh 1.5.1", "bytes", "bytesize", @@ -4825,17 +4837,15 @@ dependencies = [ "enum-map", "hex", "itertools 0.10.5", - "near-crypto 2.2.1", - "near-fmt 2.2.1", - "near-parameters 2.2.1", - "near-primitives-core 2.2.1", - "near-rpc-error-macro 2.2.1", - "near-stdx 2.2.1", - "near-structs-checker-lib", + "near-crypto 2.3.0", + "near-fmt 2.3.0", + "near-parameters 2.3.0", + "near-primitives-core 2.3.0", + "near-schema-checker-lib", + "near-stdx 2.3.0", "near-time", "num-rational", - "once_cell", - "ordered-float 4.2.2", + "ordered-float 4.4.0", "primitive-types", "rand 0.8.5", "rand_chacha 0.3.1", @@ -4875,8 +4885,8 @@ dependencies = [ [[package]] name = "near-primitives-core" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "arbitrary", "base64 0.21.7", @@ -4885,7 +4895,7 @@ dependencies = [ "derive_more", "enum-map", "near-account-id", - "near-structs-checker-lib", + "near-schema-checker-lib", "num-rational", "serde", "serde_repr", @@ -4895,8 +4905,8 @@ dependencies = [ [[package]] name = "near-rosetta-rpc" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "actix-cors 0.6.5", @@ -4907,14 +4917,14 @@ dependencies = [ "futures", "hex", "near-account-id", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-client", "near-client-primitives", - "near-crypto 2.2.1", + "near-crypto 2.3.0", "near-network", - "near-o11y 2.2.1", - "near-parameters 2.2.1", - "near-primitives 2.2.1", + "near-o11y 2.3.0", + "near-parameters 2.3.0", + "near-primitives 2.3.0", "node-runtime", "paperclip", "serde", @@ -4932,17 +4942,7 @@ checksum = "80fca203c51edd9595ec14db1d13359fb9ede32314990bf296b6c5c4502f6ab7" dependencies = [ "quote", "serde", - "syn 2.0.77", -] - -[[package]] -name = "near-rpc-error-core" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" -dependencies = [ - "quote", - "serde", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4952,24 +4952,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897a445de2102f6732c8a185d922f5e3bf7fd0a41243ce40854df2197237f799" dependencies = [ "fs2", - "near-rpc-error-core 0.20.1", + "near-rpc-error-core", "serde", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] -name = "near-rpc-error-macro" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +name = "near-schema-checker-core" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" + +[[package]] +name = "near-schema-checker-lib" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ - "near-rpc-error-core 2.2.1", - "serde", - "syn 2.0.77", + "near-schema-checker-core", + "near-schema-checker-macro", ] +[[package]] +name = "near-schema-checker-macro" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" + [[package]] name = "near-state-indexer" -version = "0.3.0" +version = "0.3.1" dependencies = [ "actix", "actix-web", @@ -4980,11 +4989,12 @@ dependencies = [ "database", "futures", "logic-state-indexer", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-client", + "near-config-utils 2.3.0", "near-indexer", "near-indexer-primitives", - "near-o11y 2.2.1", + "near-o11y 2.3.0", "once_cell", "openssl-probe", "rustc_version 0.4.1", @@ -5002,13 +5012,13 @@ checksum = "855fd5540e3b4ff6fedf12aba2db1ee4b371b36f465da1363a6d022b27cb43b8" [[package]] name = "near-stdx" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" [[package]] name = "near-store" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "actix-rt", @@ -5022,18 +5032,18 @@ dependencies = [ "hex", "itertools 0.10.5", "itoa", - "lru 0.12.4", - "near-chain-configs 2.2.1", - "near-crypto 2.2.1", - "near-fmt 2.2.1", - "near-o11y 2.2.1", - "near-parameters 2.2.1", - "near-primitives 2.2.1", - "near-stdx 2.2.1", + "lru 0.12.5", + "near-chain-configs 2.3.0", + "near-crypto 2.3.0", + "near-fmt 2.3.0", + "near-o11y 2.3.0", + "near-parameters 2.3.0", + "near-primitives 2.3.0", + "near-schema-checker-lib", + "near-stdx 2.3.0", "near-time", - "near-vm-runner 2.2.1", + "near-vm-runner 2.3.0", "num_cpus", - "once_cell", "rand 0.8.5", "rayon", "reed-solomon-erasure 6.0.0", @@ -5049,39 +5059,19 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-structs-checker-core" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" - -[[package]] -name = "near-structs-checker-lib" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" -dependencies = [ - "near-structs-checker-core", - "near-structs-checker-macro", -] - -[[package]] -name = "near-structs-checker-macro" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" - [[package]] name = "near-telemetry" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "awc", "futures", "near-async", - "near-o11y 2.2.1", + "near-o11y 2.3.0", "near-performance-metrics", "near-performance-metrics-macros", "near-time", - "once_cell", "openssl", "serde", "serde_json", @@ -5090,10 +5080,9 @@ dependencies = [ [[package]] name = "near-time" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ - "once_cell", "serde", "time", "tokio", @@ -5101,8 +5090,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "enumset", "finite-wasm", @@ -5117,14 +5106,13 @@ dependencies = [ [[package]] name = "near-vm-compiler-singlepass" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", "enumset", "finite-wasm", - "lazy_static", "memoffset 0.8.0", "more-asserts", "near-vm-compiler", @@ -5138,14 +5126,13 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "backtrace", "cfg-if 1.0.0", "enumset", "finite-wasm", - "lazy_static", "more-asserts", "near-vm-compiler", "near-vm-types", @@ -5191,8 +5178,8 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "anyhow", "blst", @@ -5201,25 +5188,26 @@ dependencies = [ "ed25519-dalek", "enum-map", "finite-wasm", - "lru 0.12.4", + "lru 0.12.5", "memoffset 0.8.0", - "near-crypto 2.2.1", - "near-o11y 2.2.1", - "near-parameters 2.2.1", - "near-primitives-core 2.2.1", - "near-stdx 2.2.1", + "near-crypto 2.3.0", + "near-o11y 2.3.0", + "near-parameters 2.3.0", + "near-primitives-core 2.3.0", + "near-schema-checker-lib", + "near-stdx 2.3.0", "near-vm-compiler", "near-vm-compiler-singlepass", "near-vm-engine", "near-vm-types", "near-vm-vm", "num-rational", - "once_cell", "parity-wasm 0.41.0", "parity-wasm 0.42.2", "prefix-sum-vec", "prometheus", "pwasm-utils", + "rayon", "ripemd", "rustix", "serde", @@ -5246,8 +5234,8 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "indexmap 1.9.3", "num-traits", @@ -5257,8 +5245,8 @@ dependencies = [ [[package]] name = "near-vm-vm" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "backtrace", "cc", @@ -5278,19 +5266,18 @@ dependencies = [ [[package]] name = "near-wallet-contract" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "anyhow", - "near-primitives-core 2.2.1", - "near-vm-runner 2.2.1", - "once_cell", + "near-primitives-core 2.3.0", + "near-vm-runner 2.3.0", ] [[package]] name = "nearcore" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "actix", "actix-rt", @@ -5305,35 +5292,34 @@ dependencies = [ "easy-ext", "futures", "hex", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-tls 0.5.0", "indicatif", "near-async", "near-chain", - "near-chain-configs 2.2.1", + "near-chain-configs 2.3.0", "near-chunks", "near-client", "near-client-primitives", - "near-config-utils 2.2.1", - "near-crypto 2.2.1", + "near-config-utils 2.3.0", + "near-crypto 2.3.0", "near-dyn-configs", "near-epoch-manager", "near-jsonrpc", - "near-jsonrpc-primitives 2.2.1", + "near-jsonrpc-primitives 2.3.0", "near-mainnet-res", "near-network", - "near-o11y 2.2.1", - "near-parameters 2.2.1", + "near-o11y 2.3.0", + "near-parameters 2.3.0", "near-performance-metrics", "near-pool", - "near-primitives 2.2.1", + "near-primitives 2.3.0", "near-rosetta-rpc", "near-store", "near-telemetry", - "near-vm-runner 2.2.1", + "near-vm-runner 2.3.0", "node-runtime", "num-rational", - "once_cell", "rand 0.8.5", "rayon", "regex", @@ -5379,21 +5365,20 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.2.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.2.1-fork1#3a97591c46c1b62082de8a48a7da48bb0778a1bb" +version = "2.3.0" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" dependencies = [ "borsh 1.5.1", - "near-crypto 2.2.1", - "near-o11y 2.2.1", - "near-parameters 2.2.1", - "near-primitives 2.2.1", - "near-primitives-core 2.2.1", + "near-crypto 2.3.0", + "near-o11y 2.3.0", + "near-parameters 2.3.0", + "near-primitives 2.3.0", + "near-primitives-core 2.3.0", "near-store", - "near-vm-runner 2.2.1", + "near-vm-runner 2.3.0", "near-wallet-contract", "num-bigint 0.3.3", "num-traits", - "once_cell", "rand 0.8.5", "rayon", "serde_json", @@ -5553,24 +5538,24 @@ checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "memchr", ] [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opaque-debug" @@ -5580,9 +5565,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", @@ -5601,7 +5586,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5612,18 +5597,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.2+3.3.2" +version = "300.4.0+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" +checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -5836,7 +5821,7 @@ dependencies = [ "glob", "once_cell", "opentelemetry 0.22.0", - "ordered-float 4.2.2", + "ordered-float 4.4.0", "percent-encoding", "rand 0.8.5", "thiserror", @@ -5855,9 +5840,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "4.2.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" +checksum = "83e7ccb95e240b7c9506a3d544f10d935e142cc90b0a1d56954fb44d89ad6b97" dependencies = [ "borsh 1.5.1", "num-traits", @@ -5965,9 +5950,9 @@ dependencies = [ [[package]] name = "paperclip-macros" -version = "0.6.5" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0385be5ae9c886c46688290534363a229f2531aa2c5c2bfc3b3ddafed5143aaa" +checksum = "ce6e25ce2c5362c8d48dc89e0f9ca076d507f7c1eabd04f0d593cdf5addff90c" dependencies = [ "heck 0.4.1", "http 0.2.12", @@ -6066,7 +6051,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -6121,7 +6106,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "perf-testing" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "chrono", @@ -6145,34 +6130,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.6.0", ] [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -6213,9 +6198,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "polling" @@ -6256,12 +6241,12 @@ checksum = "aa06bd51638b6e76ac9ba9b6afb4164fa647bd2916d722f2623fbb6d1ed8bdba" [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -6318,9 +6303,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -6403,7 +6388,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -6424,9 +6409,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "protobuf" -version = "3.5.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6" +checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" dependencies = [ "once_cell", "protobuf-support", @@ -6435,13 +6420,13 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.5.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189" +checksum = "e26b833f144769a30e04b1db0146b2aaa53fd2fd83acf10a6b5f996606c18144" dependencies = [ "anyhow", "once_cell", - "protobuf 3.5.1", + "protobuf 3.7.1", "protobuf-parse", "regex", "tempfile", @@ -6450,14 +6435,14 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.5.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76" +checksum = "322330e133eab455718444b4e033ebfac7c6528972c784fcde28d2cc783c6257" dependencies = [ "anyhow", - "indexmap 2.5.0", + "indexmap 2.6.0", "log", - "protobuf 3.5.1", + "protobuf 3.7.1", "protobuf-support", "tempfile", "thiserror", @@ -6466,9 +6451,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.5.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9" +checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" dependencies = [ "thiserror", ] @@ -6641,7 +6626,7 @@ dependencies = [ [[package]] name = "read-rpc-server" -version = "0.3.0" +version = "0.3.1" dependencies = [ "actix-cors 0.7.0", "actix-http", @@ -6658,18 +6643,18 @@ dependencies = [ "futures-locks", "hex", "lazy_static", - "lru 0.12.4", + "lru 0.12.5", "mimalloc", "near-async", - "near-chain-configs 2.2.1", - "near-crypto 2.2.1", + "near-chain-configs 2.3.0", + "near-crypto 2.3.0", "near-indexer-primitives", "near-jsonrpc", "near-jsonrpc-client 0.13.0", "near-lake-framework", - "near-parameters 2.2.1", - "near-primitives 2.2.1", - "near-vm-runner 2.2.1", + "near-parameters 2.3.0", + "near-primitives 2.3.0", + "near-vm-runner 2.3.0", "prometheus", "readnode-primitives", "rustc_version 0.4.1", @@ -6685,7 +6670,7 @@ dependencies = [ [[package]] name = "readnode-primitives" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "borsh 1.5.1", @@ -6697,9 +6682,9 @@ dependencies = [ [[package]] name = "redis" -version = "0.25.4" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d7a6955c7511f60f3ba9e86c6d02b3c3f144f8c24b288d1f4e18074ab8bbec" +checksum = "81cccf17a692ce51b86564334614d72dcae1def0fd5ecebc9f02956da74352b5" dependencies = [ "arc-swap", "async-trait", @@ -6708,13 +6693,14 @@ dependencies = [ "futures", "futures-util", "itoa", + "num-bigint 0.4.6", "percent-encoding", "pin-project-lite", "ryu", "sha1_smol", "socket2", "tokio", - "tokio-retry", + "tokio-retry2", "tokio-util 0.7.12", "url", ] @@ -6736,9 +6722,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -6791,14 +6777,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -6812,13 +6798,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -6835,9 +6821,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "region" @@ -6874,7 +6860,7 @@ dependencies = [ "h2", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -6904,9 +6890,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -6916,7 +6902,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -6928,7 +6914,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "serde", "serde_json", "serde_urlencoded", @@ -6954,7 +6940,7 @@ dependencies = [ "anyhow", "async-trait", "http 1.1.0", - "reqwest 0.12.7", + "reqwest 0.12.9", "serde", "thiserror", "tower-service", @@ -7158,9 +7144,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ "bitflags 2.6.0", "errno 0.3.9", @@ -7204,19 +7190,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" @@ -7230,9 +7215,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rxml" @@ -7259,9 +7244,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -7336,9 +7321,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -7367,9 +7352,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] @@ -7407,13 +7392,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7427,9 +7412,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -7445,14 +7430,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -7471,15 +7456,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -7489,14 +7474,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7505,7 +7490,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -7596,9 +7581,9 @@ dependencies = [ [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple_asn1" @@ -7783,7 +7768,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "log", "memchr", "native-tls", @@ -7955,7 +7940,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state-indexer" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "clap", @@ -8061,9 +8046,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -8079,7 +8064,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -8153,9 +8138,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if 1.0.0", "fastrand 2.1.1", @@ -8166,22 +8151,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -8274,9 +8259,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -8309,7 +8294,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -8344,6 +8329,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-retry2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "903934dba1c4c2f2e9cb460ef10b5695e0b0ecad3bf9ee7c8675e540c5e8b2d1" +dependencies = [ + "pin-project", + "rand 0.8.5", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.24.1" @@ -8424,11 +8420,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -8450,7 +8446,7 @@ dependencies = [ "h2", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-timeout", "percent-encoding", "pin-project", @@ -8480,7 +8476,7 @@ dependencies = [ "h2", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-timeout", "percent-encoding", "pin-project", @@ -8551,9 +8547,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.7.12" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284586dc201db407be8c9d721abad1b3a6dacbbce5cccecd4fd15a37db95ab0d" +checksum = "6b87073920bcce23e9f5cb0d2671e9f01d6803bb5229c159b2f5ce6806d73ffc" dependencies = [ "actix-web", "mutually_exclusive_features", @@ -8582,7 +8578,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -8727,7 +8723,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tx-details-storage" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "google-cloud-storage", @@ -8735,7 +8731,7 @@ dependencies = [ [[package]] name = "tx-indexer" -version = "0.3.0" +version = "0.3.1" dependencies = [ "actix-web", "anyhow", @@ -8787,18 +8783,15 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -8817,9 +8810,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-segmentation" @@ -8829,9 +8822,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode_categories" @@ -8882,9 +8875,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom 0.2.15", ] @@ -8916,7 +8909,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -8984,9 +8977,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -8995,24 +8988,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -9022,9 +9015,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -9032,22 +9025,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-encoder" @@ -9069,9 +9062,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -9286,7 +9279,7 @@ version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "semver 1.0.23", ] @@ -9311,7 +9304,7 @@ dependencies = [ "bumpalo", "cfg-if 1.0.0", "fxprof-processed-profile", - "indexmap 2.5.0", + "indexmap 2.6.0", "libc", "log", "object 0.32.2", @@ -9390,7 +9383,7 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli 0.28.1", - "indexmap 2.5.0", + "indexmap 2.6.0", "log", "object 0.32.2", "serde", @@ -9456,7 +9449,7 @@ dependencies = [ "anyhow", "cc", "cfg-if 1.0.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "libc", "log", "mach", @@ -9496,7 +9489,7 @@ checksum = "09b5575a75e711ca6c36bb9ad647c93541cdc8e34218031acba5da3f35919dd3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -9507,9 +9500,9 @@ checksum = "9dafab2db172a53e23940e0fa3078c202f567ee5f13f4b42f66b694fab43c658" [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -9564,15 +9557,15 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", "wasite", ] [[package]] name = "wildmatch" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3928939971918220fed093266b809d1ee4ec6c1a2d72692ff6876898f3b16c19" +checksum = "68ce1ab1f8c62655ebe1350f589c61e505cf94d385bc6a12899442d9081e71fd" [[package]] name = "winapi" @@ -9785,9 +9778,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -9856,7 +9849,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -9876,7 +9869,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index cdaaf846..538250d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [workspace.package] -version = "0.3.0" +version = "0.3.1" authors = ["Near Inc "] edition = "2021" -rust-version = "1.79.0" +rust-version = "1.81.0" repository = "https://github.com/near/read-rpc" license = "MIT OR Apache-2.0" @@ -51,22 +51,23 @@ tx-details-storage = { path = "tx-details-storage" } logic-state-indexer = { path = "logic-state-indexer" } # Please, update the supported nearcore version in .cargo/config.toml file -near-async = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1" } -near-indexer = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1" } -near-client = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1" } -near-o11y = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1" } -near-indexer-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1" } -near-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1" } -near-chain-configs = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1" } -near-crypto = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1" } -near-jsonrpc = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1" } -near-parameters = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1" } -near-vm-runner = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.2.1-fork1", features = [ +near-async = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-indexer = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-client = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-config-utils = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-o11y = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-indexer-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-chain-configs = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-crypto = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-jsonrpc = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-parameters = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } +near-vm-runner = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork", features = [ "wasmer0_vm", "wasmer2_vm", "wasmtime_vm", "near_vm", ] } -near-lake-framework = { git = 'https://github.com/kobayurii/near-lake-framework-rs.git', branch = '0.7.20' } -near-jsonrpc-client = { git = 'https://github.com/kobayurii/near-jsonrpc-client-rs.git', branch = '0.13.3' } +near-lake-framework = { git = 'https://github.com/kobayurii/near-lake-framework-rs.git', branch = 'fork/0.7.10' } +near-jsonrpc-client = { git = 'https://github.com/kobayurii/near-jsonrpc-client-rs.git', branch = 'fork/0.14.0' } diff --git a/cache-storage/Cargo.toml b/cache-storage/Cargo.toml index df7f1e68..bbf09c2d 100644 --- a/cache-storage/Cargo.toml +++ b/cache-storage/Cargo.toml @@ -12,7 +12,7 @@ license.workspace = true [dependencies] anyhow = "1.0.86" futures = "0.3.5" -redis = { version = "0.25.2", features = ["tokio-comp", "connection-manager"] } +redis = { version = "0.27.5", features = ["tokio-comp", "connection-manager"] } serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.85" diff --git a/cache-storage/src/lib.rs b/cache-storage/src/lib.rs index bb9ffcb7..c9e18964 100644 --- a/cache-storage/src/lib.rs +++ b/cache-storage/src/lib.rs @@ -21,7 +21,7 @@ impl RedisCacheStorage { .await?; redis::cmd("SELECT") .arg(database_number) - .query_async(&mut redis_client.clone()) + .query_async::<()>(&mut redis_client.clone()) .await?; Ok(Self { client: redis_client, @@ -54,7 +54,7 @@ impl RedisCacheStorage { redis::cmd("SET") .arg(&key) .arg(&value) - .query_async(&mut self.client.clone()) + .query_async::<()>(&mut self.client.clone()) .await?; Ok(()) } @@ -65,7 +65,7 @@ impl RedisCacheStorage { ) -> anyhow::Result<()> { redis::cmd("DEL") .arg(&key) - .query_async(&mut self.client.clone()) + .query_async::<()>(&mut self.client.clone()) .await?; Ok(()) } @@ -80,7 +80,7 @@ impl RedisCacheStorage { redis::cmd("RPUSH") .arg(&key) .arg(&value) - .query_async(&mut self.client.clone()) + .query_async::<()>(&mut self.client.clone()) .await?; Ok(()) } @@ -95,7 +95,7 @@ impl RedisCacheStorage { redis::cmd("RPUSHX") .arg(&key) .arg(&value) - .query_async(&mut self.client.clone()) + .query_async::<()>(&mut self.client.clone()) .await?; Ok(()) } @@ -170,7 +170,7 @@ impl BlocksByFinalityCache { ]) .await .into_iter() - .collect::>()?; + .collect::>()?; }; Ok(()) diff --git a/logic-state-indexer/src/configs.rs b/logic-state-indexer/src/configs.rs index b90da712..d1a6c84c 100644 --- a/logic-state-indexer/src/configs.rs +++ b/logic-state-indexer/src/configs.rs @@ -1,4 +1,6 @@ pub use clap::{Parser, Subcommand}; +use near_chain_configs::GenesisConfig; +use near_primitives::epoch_manager::{AllEpochConfig, EpochConfig}; /// NEAR Indexer for Explorer /// Watches for stream of blocks from the chain @@ -50,3 +52,19 @@ pub(crate) async fn final_block_height( tracing::debug!(target: crate::INDEXER, "Fetching final block from NEAR RPC",); near_client.final_block_height().await } + +// Helper function to get shard layout for latest protocol version +pub async fn shard_layout( + genesis_config: GenesisConfig, +) -> anyhow::Result { + let default_epoch_config = EpochConfig::from(&genesis_config); + let all_epoch_config = AllEpochConfig::new( + true, + genesis_config.protocol_version, + default_epoch_config, + &genesis_config.chain_id, + ); + let epoch_config = + all_epoch_config.for_protocol_version(near_primitives::version::PROTOCOL_VERSION); + Ok(epoch_config.shard_layout) +} diff --git a/logic-state-indexer/src/lib.rs b/logic-state-indexer/src/lib.rs index bdeb634e..6f089942 100644 --- a/logic-state-indexer/src/lib.rs +++ b/logic-state-indexer/src/lib.rs @@ -64,7 +64,7 @@ impl StateChangesToStore { futures::future::join_all(futures) .await .into_iter() - .collect::>()?; + .collect::>()?; } Ok(()) } @@ -89,7 +89,7 @@ impl StateChangesToStore { futures::future::join_all(futures) .await .into_iter() - .collect::>()?; + .collect::>()?; } Ok(()) } @@ -114,7 +114,7 @@ impl StateChangesToStore { futures::future::join_all(futures) .await .into_iter() - .collect::>()?; + .collect::>()?; } Ok(()) } @@ -139,7 +139,7 @@ impl StateChangesToStore { futures::future::join_all(futures) .await .into_iter() - .collect::>()?; + .collect::>()?; } Ok(()) } @@ -163,7 +163,7 @@ impl StateChangesToStore { ]) .await .into_iter() - .collect::>()?; + .collect::>()?; Ok(()) } @@ -267,7 +267,7 @@ pub async fn handle_streamer_message( ]) .await .into_iter() - .collect::>()?; + .collect::>()?; metrics::BLOCK_PROCESSED_TOTAL.inc(); // Prometheus Gauge Metric type do not support u64 diff --git a/logic-state-indexer/src/near_client/mod.rs b/logic-state-indexer/src/near_client/mod.rs index 93c5de1e..280983c3 100644 --- a/logic-state-indexer/src/near_client/mod.rs +++ b/logic-state-indexer/src/near_client/mod.rs @@ -6,11 +6,6 @@ pub trait NearClient { /// Returns the final block height from the NEAR Protocol or an error if the call fails. fn final_block_height(&self) -> impl std::future::Future> + Send; - /// Returns the ProtocolConfigView from the NEAR Protocol or an error if the call fails. - fn protocol_config( - &self, - ) -> impl std::future::Future> + Send; - /// Returns the current epoch information from the NEAR Protocol or an error if the call fails. fn validators_by_epoch_id( &self, @@ -46,19 +41,6 @@ impl NearClient for NearJsonRpc { Ok(block_height.header.height) } - async fn protocol_config(&self) -> anyhow::Result { - let protocol_config = self - .client - .call(near_jsonrpc_client::methods::EXPERIMENTAL_protocol_config::RpcProtocolConfigRequest { - block_reference: near_primitives::types::BlockReference::Finality( - near_primitives::types::Finality::Final, - ), - }) - .await - .map_err(|e| anyhow::anyhow!("Failed to get protocol config: {:?}", e))?; - Ok(protocol_config) - } - async fn validators_by_epoch_id( &self, epoch_id: near_indexer_primitives::CryptoHash, diff --git a/near-state-indexer/Cargo.toml b/near-state-indexer/Cargo.toml index f20c0868..f6160c94 100644 --- a/near-state-indexer/Cargo.toml +++ b/near-state-indexer/Cargo.toml @@ -37,6 +37,7 @@ logic-state-indexer.workspace = true near-o11y.workspace = true near-chain-configs.workspace = true near-client.workspace = true +near-config-utils.workspace = true near-indexer.workspace = true near-indexer-primitives.workspace = true diff --git a/near-state-indexer/src/configs.rs b/near-state-indexer/src/configs.rs index dbff8d8f..bf4be19a 100644 --- a/near-state-indexer/src/configs.rs +++ b/near-state-indexer/src/configs.rs @@ -72,7 +72,11 @@ impl From for near_indexer::InitConfigArgs { download_genesis: config_args.download_genesis, download_genesis_url: config_args.download_genesis_url, download_records_url: config_args.download_records_url, - download_config: config_args.download_config, + download_config: if config_args.download_config { + Some(near_config_utils::DownloadConfigType::RPC) + } else { + None + }, download_config_url: config_args.download_config_url, boot_nodes: config_args.boot_nodes, max_gas_burnt_view: config_args.max_gas_burnt_view, diff --git a/near-state-indexer/src/main.rs b/near-state-indexer/src/main.rs index 51aa0f32..3d6c1abe 100644 --- a/near-state-indexer/src/main.rs +++ b/near-state-indexer/src/main.rs @@ -82,13 +82,14 @@ async fn run(home_dir: std::path::PathBuf) -> anyhow::Result<()> { let stream = indexer.streamer(); let (view_client, client) = indexer.client_actors(); + let genesis_config = indexer.near_config().genesis.config.clone(); + let shard_layout = logic_state_indexer::configs::shard_layout(genesis_config).await?; let near_client = near_client::NearViewClient::new(view_client.clone()); - let protocol_config_view = near_client.protocol_config().await?; tracing::info!(target: INDEXER, "Connecting to db..."); let db_manager = database::prepare_db_manager::( &state_indexer_config.database, - protocol_config_view.shard_layout.clone(), + shard_layout.clone(), ) .await?; @@ -123,7 +124,7 @@ async fn run(home_dir: std::path::PathBuf) -> anyhow::Result<()> { &near_client, state_indexer_config.clone(), std::sync::Arc::clone(&stats), - &protocol_config_view.shard_layout, + &shard_layout, ) }) .buffer_unordered(state_indexer_config.general.concurrency); diff --git a/near-state-indexer/src/near_client.rs b/near-state-indexer/src/near_client.rs index 62a1b832..992e427c 100644 --- a/near-state-indexer/src/near_client.rs +++ b/near-state-indexer/src/near_client.rs @@ -27,18 +27,6 @@ impl crate::NearClient for NearViewClient { Ok(block.header.height) } - async fn protocol_config(&self) -> anyhow::Result { - Ok(self - .view_client - .send( - near_client::GetProtocolConfig(near_primitives::types::BlockReference::Finality( - near_primitives::types::Finality::Final, - )) - .with_span_context(), - ) - .await??) - } - async fn validators_by_epoch_id( &self, epoch_id: near_indexer_primitives::CryptoHash, diff --git a/rpc-server/Dockerfile b/rpc-server/Dockerfile index de34a892..30a9d91f 100644 --- a/rpc-server/Dockerfile +++ b/rpc-server/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.79 AS builder +FROM rust:1.81 AS builder ARG features="default" ARG profile="release" WORKDIR /tmp/ diff --git a/rpc-server/src/config.rs b/rpc-server/src/config.rs index f3271afc..41aafb7f 100644 --- a/rpc-server/src/config.rs +++ b/rpc-server/src/config.rs @@ -134,6 +134,7 @@ impl ServerContext { let default_epoch_config = EpochConfig::from(&genesis_info.genesis_config); let all_epoch_config = AllEpochConfig::new( true, + genesis_info.genesis_config.protocol_version, default_epoch_config, &genesis_info.genesis_config.chain_id, ); diff --git a/rpc-server/src/modules/network/methods.rs b/rpc-server/src/modules/network/methods.rs index 3e73e43f..290fc456 100644 --- a/rpc-server/src/modules/network/methods.rs +++ b/rpc-server/src/modules/network/methods.rs @@ -400,6 +400,7 @@ async fn protocol_config_call( // and returns the EpochConfig that should be used for this protocol version. let all_epoch_config = AllEpochConfig::new( true, + data.genesis_info.genesis_config.protocol_version, default_epoch_config, &data.genesis_info.genesis_config.chain_id, ); @@ -442,6 +443,7 @@ async fn protocol_config_call( account_creation_config: runtime_config.account_creation_config.clone(), congestion_control_config: runtime_config.congestion_control_config, witness_config: runtime_config.witness_config, + use_state_stored_receipt: runtime_config.use_state_stored_receipt, }, }; Ok(protocol_config.into()) diff --git a/rust-toolchain b/rust-toolchain index b3a8c61e..dbd41264 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.79.0 +1.81.0 diff --git a/state-indexer/Dockerfile b/state-indexer/Dockerfile index b09010c8..b1a9b4a3 100644 --- a/state-indexer/Dockerfile +++ b/state-indexer/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.79 AS builder +FROM rust:1.81 AS builder ARG features="default" ARG profile="release" WORKDIR /tmp/ diff --git a/state-indexer/src/main.rs b/state-indexer/src/main.rs index df2a3f8d..170ad1e1 100644 --- a/state-indexer/src/main.rs +++ b/state-indexer/src/main.rs @@ -1,7 +1,7 @@ use clap::Parser; use futures::StreamExt; -use logic_state_indexer::{configs, handle_streamer_message, metrics, NearClient, INDEXER}; +use logic_state_indexer::{configs, handle_streamer_message, metrics, INDEXER}; #[tokio::main] async fn main() -> anyhow::Result<()> { @@ -19,15 +19,15 @@ async fn main() -> anyhow::Result<()> { // we use the Referer header to ensure we take it from the native RPC node let rpc_client = near_jsonrpc_client::JsonRpcClient::connect(&indexer_config.general.near_rpc_url) .header(("Referer", indexer_config.general.referer_header_value.clone()))?; + let genesis_config = rpc_client + .call(near_jsonrpc_client::methods::EXPERIMENTAL_genesis_config::RpcGenesisConfigRequest) + .await?; + let shard_layout = configs::shard_layout(genesis_config).await?; let near_client = logic_state_indexer::NearJsonRpc::new(rpc_client); - let protocol_config_view = near_client.protocol_config().await?; - - let db_manager = database::prepare_db_manager::( - &indexer_config.database, - protocol_config_view.shard_layout.clone(), - ) - .await?; + let db_manager = + database::prepare_db_manager::(&indexer_config.database, shard_layout.clone()) + .await?; let start_block_height = configs::get_start_block_height( &near_client, &db_manager, @@ -55,7 +55,7 @@ async fn main() -> anyhow::Result<()> { &near_client, indexer_config.clone(), std::sync::Arc::clone(&stats), - &protocol_config_view.shard_layout, + &shard_layout, ) }) .buffer_unordered(indexer_config.general.concurrency); diff --git a/tx-indexer/Dockerfile b/tx-indexer/Dockerfile index bd9b4da3..0e686afd 100644 --- a/tx-indexer/Dockerfile +++ b/tx-indexer/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.79 AS builder +FROM rust:1.81 AS builder ARG features="default" ARG profile="release" WORKDIR /tmp/ diff --git a/tx-indexer/src/main.rs b/tx-indexer/src/main.rs index 97d5ffda..4af238b5 100644 --- a/tx-indexer/src/main.rs +++ b/tx-indexer/src/main.rs @@ -1,6 +1,7 @@ use clap::Parser; use futures::{FutureExt, StreamExt}; - +use near_indexer_primitives::near_primitives; +use near_indexer_primitives::near_primitives::epoch_manager::{AllEpochConfig, EpochConfig}; use tx_details_storage::TxDetailsStorage; mod collector; @@ -31,23 +32,25 @@ async fn main() -> anyhow::Result<()> { near_jsonrpc_client::JsonRpcClient::connect(&indexer_config.general.near_rpc_url); tracing::info!(target: INDEXER, "Fetch protocol config..."); - let protocol_config_view = rpc_client - .call( - near_jsonrpc_client::methods::EXPERIMENTAL_protocol_config::RpcProtocolConfigRequest { - block_reference: - near_indexer_primitives::near_primitives::types::BlockReference::Finality( - near_indexer_primitives::near_primitives::types::Finality::Final, - ), - }, - ) + let genesis_config = rpc_client + .call(near_jsonrpc_client::methods::EXPERIMENTAL_genesis_config::RpcGenesisConfigRequest) .await?; + let default_epoch_config = EpochConfig::from(&genesis_config); + let all_epoch_config = AllEpochConfig::new( + true, + genesis_config.protocol_version, + default_epoch_config, + &genesis_config.chain_id, + ); + let epoch_config = + all_epoch_config.for_protocol_version(near_primitives::version::PROTOCOL_VERSION); tracing::info!(target: INDEXER, "Connecting to db..."); let db_manager: std::sync::Arc> = std::sync::Arc::new(Box::new( database::prepare_db_manager::( &indexer_config.database, - protocol_config_view.shard_layout.clone(), + epoch_config.shard_layout.clone(), ) .await?, )); @@ -70,7 +73,7 @@ async fn main() -> anyhow::Result<()> { let tx_collecting_storage = std::sync::Arc::new( storage::CacheStorage::init_with_restore( indexer_config.general.redis_url.to_string(), - protocol_config_view.shard_layout, + epoch_config.shard_layout, ) .await?, ); diff --git a/tx-indexer/src/storage.rs b/tx-indexer/src/storage.rs index 6b044db9..0703aae4 100644 --- a/tx-indexer/src/storage.rs +++ b/tx-indexer/src/storage.rs @@ -101,7 +101,7 @@ impl CacheStorage { futures::future::join_all(tx_futures) .await .into_iter() - .collect::>()?; + .collect::>()?; tracing::debug!( target: STORAGE, "Restored {} transactions after interruption", From 70bb8c1941ce93ba1acd1ac925416c9fe82be67a Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Wed, 6 Nov 2024 14:11:36 +0200 Subject: [PATCH 2/9] Corrected state size calculation logic (#371) * fix to calculate state size * clippy * fix calculate state size limit * changelog --- CHANGELOG.md | 11 +++++++++ rpc-server/src/config.rs | 4 ++++ rpc-server/src/metrics.rs | 10 +++++++- rpc-server/src/modules/blocks/mod.rs | 9 ------- .../modules/queries/contract_runner/mod.rs | 24 ++++++++++++++++--- rpc-server/src/modules/queries/methods.rs | 14 ++++++++++- 6 files changed, 58 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 605db366..89f1c42b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - nearcore v2.3.0 - rust v1.81.0 +### What's Changed +* Corrected state size calculation logic. +* Integrated cargo_pkg_version metric to reflect the current server version. +* Delete unnecessary debug logs about update blocks by finalities + +## [0.3.1](https://github.com/near/read-rpc/releases/tag/v0.3.1) + +### Supported Nearcore Version +- nearcore v2.3.0 +- rust v1.81.0 + ### What's Changed * Improved bulk insertion of state_changes, reducing database requests from hundreds to a maximum of 7 per block. * Configuration improvement. Create default config.toml on start application to loaded parameters from the environment variables. diff --git a/rpc-server/src/config.rs b/rpc-server/src/config.rs index 41aafb7f..4cf116b1 100644 --- a/rpc-server/src/config.rs +++ b/rpc-server/src/config.rs @@ -154,6 +154,10 @@ impl ServerContext { let compiled_contract_code_cache = std::sync::Arc::new(CompiledCodeCache::new(contract_code_cache_size_in_bytes)); + crate::metrics::CARGO_PKG_VERSION + .with_label_values(&[NEARD_VERSION]) + .inc(); + Ok(Self { s3_client, db_manager: std::sync::Arc::new(Box::new(db_manager)), diff --git a/rpc-server/src/metrics.rs b/rpc-server/src/metrics.rs index 206f3509..745b90a4 100644 --- a/rpc-server/src/metrics.rs +++ b/rpc-server/src/metrics.rs @@ -1,5 +1,5 @@ use actix_web::{get, Responder}; -use prometheus::{Encoder, IntCounterVec, IntGauge, IntGaugeVec, Opts}; +use prometheus::{CounterVec, Encoder, IntCounterVec, IntGauge, IntGaugeVec, Opts}; type Result = std::result::Result; @@ -113,6 +113,14 @@ lazy_static! { "Optimistic updating status. 0: working, 1: not working", ).unwrap(); + pub(crate) static ref CARGO_PKG_VERSION: CounterVec = { + let opts = Opts::new("cargo_pkg_version", "Cargo package version. This is used to track the version of the running server.") + .variable_label("version"); + let counter_vec = CounterVec::new(opts, &["version"]).expect("metric can be created"); + prometheus::register(Box::new(counter_vec.clone())).unwrap(); + counter_vec + }; + pub(crate) static ref LEGACY_DATABASE_TX_DETAILS: IntCounterVec = register_int_counter_vec( "legacy_database_tx_details", "Total number of calls to the legacy database for transaction details", diff --git a/rpc-server/src/modules/blocks/mod.rs b/rpc-server/src/modules/blocks/mod.rs index 7fb9e714..e4fac836 100644 --- a/rpc-server/src/modules/blocks/mod.rs +++ b/rpc-server/src/modules/blocks/mod.rs @@ -335,10 +335,6 @@ impl BlocksInfoByFinality { // Update final block info in the cache. // Executes every second. pub async fn update_final_block(&self, block_info: BlockInfo) { - tracing::debug!( - "Update final block info: {:?}", - block_info.block_cache.block_height - ); let mut final_block_lock = self.final_block.write().await; final_block_lock.block_cache = block_info.block_cache; final_block_lock.block_view = block_info.block_view; @@ -348,11 +344,6 @@ impl BlocksInfoByFinality { // Update optimistic block changes and optimistic block info in the cache. // Executes every second. pub async fn update_optimistic_block(&self, block_info: BlockInfo) { - tracing::debug!( - "Update optimistic block info: {:?}", - block_info.block_cache.block_height - ); - let mut optimistic_changes_lock = self.optimistic_changes.write().await; optimistic_changes_lock.account_changes = block_info.changes_in_block_account_map().await; diff --git a/rpc-server/src/modules/queries/contract_runner/mod.rs b/rpc-server/src/modules/queries/contract_runner/mod.rs index b21062d3..470e4f03 100644 --- a/rpc-server/src/modules/queries/contract_runner/mod.rs +++ b/rpc-server/src/modules/queries/contract_runner/mod.rs @@ -1,9 +1,8 @@ use std::collections::HashMap; -use near_vm_runner::ContractRuntimeCache; - use crate::modules::blocks::BlocksInfoByFinality; use code_storage::CodeStorage; +use near_vm_runner::ContractRuntimeCache; mod code_storage; @@ -137,12 +136,31 @@ pub async fn run_contract( block_hash: block.block_hash, } })?; + println!("Contract code len {}", code.data.len()); contract_code_cache.put(code_hash, code.data.clone()).await; Contract::new(Some(code.data), code_hash) } } }; + // We need to calculate the state size of the contract to determine if we should prefetch the state or not. + // The state size is the storage usage minus the code size. + // If the state size is less than the prefetch_state_size_limit, we prefetch the state. + let code_len = if let Some(contract_code) = &contract_code.contract_code { + contract_code.code().len() + } else if let Some(code) = contract_code_cache.get(&code_hash).await { + code.len() + } else { + db_manager + .get_contract_code(account_id, block.block_height, "query_call_function") + .await + .map(|code| code.data.len()) + .unwrap_or_default() + }; + let state_size = contract + .data + .storage_usage() + .saturating_sub(code_len as u64); // Init an external database interface for the Runtime logic let code_storage = CodeStorage::init( db_manager.clone(), @@ -150,7 +168,7 @@ pub async fn run_contract( block.block_height, validators, optimistic_data, - contract.data.storage_usage() <= prefetch_state_size_limit, + state_size <= prefetch_state_size_limit, ) .await; diff --git a/rpc-server/src/modules/queries/methods.rs b/rpc-server/src/modules/queries/methods.rs index 3d628b48..92d85d6b 100644 --- a/rpc-server/src/modules/queries/methods.rs +++ b/rpc-server/src/modules/queries/methods.rs @@ -443,7 +443,19 @@ async fn view_state( block_hash: block.block_hash, }, )?; - if prefix.is_empty() && account.data.storage_usage() > data.prefetch_state_size_limit { + + // Calculate the state size excluding the contract code size to check if it's too large to fetch. + // The state size is the storage usage minus the code size. + // more details: nearcore/runtime/runtime/src/state_viewer/mod.rs:150 + let code_len = data + .db_manager + .get_contract_code(account_id, block.block_height, "query_view_state") + .await + .map(|code| code.data.len() as u64) + .unwrap_or_default(); + let state_size = account.data.storage_usage().saturating_sub(code_len); + // If the prefix is empty and the state size is larger than the limit, return an error. + if prefix.is_empty() && state_size > data.prefetch_state_size_limit { return Err( near_jsonrpc::primitives::types::query::RpcQueryError::TooLargeContractState { contract_account_id: account_id.clone(), From 0d0c9e91a2c6b6d4795bed037a2949b27de34bd3 Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Thu, 14 Nov 2024 13:10:21 +0200 Subject: [PATCH 3/9] Release/0.3.2 (#374) * Corrected state size calculation logic (#371) * fix to calculate state size * clippy * fix calculate state size limit * changelog * release 0.3.2 * remove println --- .cargo/config.toml | 2 +- CHANGELOG.md | 11 + Cargo.lock | 603 +++++++++++++---------- Cargo.toml | 30 +- configuration/src/configs/lake.rs | 6 +- rpc-server/src/config.rs | 6 +- rpc-server/src/modules/blocks/methods.rs | 4 +- rpc-server/src/modules/blocks/utils.rs | 4 +- 8 files changed, 389 insertions(+), 277 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 65e1005d..59cef669 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ [env] -NEARCORE_VERSION = "2.3.0" +NEARCORE_VERSION = "2.3.1" diff --git a/CHANGELOG.md b/CHANGELOG.md index 89f1c42b..f08951d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/near/read-rpc/compare/main...develop) +## [0.3.2](https://github.com/near/read-rpc/releases/tag/v0.3.2) + +### What's Changed +* Corrected state size calculation logic. +* Integrated cargo_pkg_version metric to reflect the current server version. +* Delete unnecessary debug logs about update blocks by finalities + +### Supported Nearcore Version +- nearcore v2.3.1 +- rust v1.81.0 + ## [0.3.1](https://github.com/near/read-rpc/releases/tag/v0.3.1) ### Supported Nearcore Version diff --git a/Cargo.lock b/Cargo.lock index 9b02a274..7e34ba74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -104,7 +104,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.26", "http 0.2.12", "httparse", "httpdate", @@ -527,6 +527,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "attohttpc" version = "0.19.1" @@ -568,7 +574,7 @@ dependencies = [ "derive_more", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "itoa", "log", @@ -901,17 +907,17 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.1.1", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "http-body 1.0.1", "httparse", "hyper 0.14.31", - "hyper-rustls", + "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", "pin-utils", - "rustls", + "rustls 0.21.12", "tokio", "tracing", ] @@ -1418,7 +1424,7 @@ dependencies = [ [[package]] name = "cache-storage" -version = "0.3.1" +version = "0.3.2" dependencies = [ "anyhow", "futures", @@ -1611,7 +1617,7 @@ dependencies = [ [[package]] name = "configuration" -version = "0.3.1" +version = "0.3.2" dependencies = [ "anyhow", "aws-credential-types", @@ -2101,7 +2107,7 @@ dependencies = [ [[package]] name = "database" -version = "0.3.1" +version = "0.3.2" dependencies = [ "anyhow", "async-trait", @@ -2111,8 +2117,8 @@ dependencies = [ "futures", "hex", "lazy_static", - "near-crypto 2.3.0", - "near-primitives 2.3.0", + "near-crypto 2.3.1", + "near-primitives 2.3.1", "prometheus", "readnode-primitives", "serde_json", @@ -3001,6 +3007,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util 0.7.12", + "tracing", +] + [[package]] name = "hashbrown" version = "0.11.2" @@ -3208,7 +3233,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -3231,6 +3256,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -3251,10 +3277,27 @@ dependencies = [ "http 0.2.12", "hyper 0.14.31", "log", - "rustls", + "rustls 0.21.12", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.5.0", + "hyper-util", + "rustls 0.23.16", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", ] [[package]] @@ -3717,7 +3760,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logic-state-indexer" -version = "0.3.1" +version = "0.3.2" dependencies = [ "actix-web", "anyhow", @@ -3730,10 +3773,10 @@ dependencies = [ "humantime", "itertools 0.13.0", "lazy_static", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-indexer-primitives", - "near-jsonrpc-client 0.13.0", - "near-primitives 2.3.0", + "near-jsonrpc-client 0.14.1", + "near-primitives 2.3.1", "prometheus", "readnode-primitives", "tokio", @@ -4010,14 +4053,14 @@ dependencies = [ [[package]] name = "near-async" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "derive_more", "futures", "near-async-derive", - "near-o11y 2.3.0", + "near-o11y 2.3.1", "near-performance-metrics", "near-time", "once_cell", @@ -4030,8 +4073,8 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "proc-macro2", "quote", @@ -4040,16 +4083,16 @@ dependencies = [ [[package]] name = "near-cache" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "lru 0.12.5", ] [[package]] name = "near-chain" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "assert_matches", @@ -4064,22 +4107,22 @@ dependencies = [ "lru 0.12.5", "near-async", "near-cache", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-chain-primitives", "near-client-primitives", - "near-crypto 2.3.0", + "near-crypto 2.3.1", "near-epoch-manager", "near-mainnet-res", "near-network", - "near-o11y 2.3.0", - "near-parameters 2.3.0", + "near-o11y 2.3.1", + "near-parameters 2.3.1", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.3.0", + "near-primitives 2.3.1", "near-schema-checker-lib", "near-store", - "near-vm-runner 2.3.0", + "near-vm-runner 2.3.1", "node-runtime", "num-rational", "once_cell", @@ -4120,18 +4163,18 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "anyhow", "bytesize", "chrono", "derive_more", - "near-config-utils 2.3.0", - "near-crypto 2.3.0", - "near-o11y 2.3.0", - "near-parameters 2.3.0", - "near-primitives 2.3.0", + "near-config-utils 2.3.1", + "near-crypto 2.3.1", + "near-o11y 2.3.1", + "near-parameters 2.3.1", + "near-primitives 2.3.1", "near-time", "num-rational", "serde", @@ -4144,11 +4187,11 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ - "near-crypto 2.3.0", - "near-primitives 2.3.0", + "near-crypto 2.3.1", + "near-primitives 2.3.1", "near-time", "thiserror", "time", @@ -4157,8 +4200,8 @@ dependencies = [ [[package]] name = "near-chunks" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "borsh 1.5.1", @@ -4169,16 +4212,16 @@ dependencies = [ "lru 0.12.5", "near-async", "near-chain", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-chunks-primitives", - "near-crypto 2.3.0", + "near-crypto 2.3.1", "near-epoch-manager", "near-network", - "near-o11y 2.3.0", + "near-o11y 2.3.1", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.3.0", + "near-primitives 2.3.1", "near-store", "rand 0.8.5", "reed-solomon-erasure 6.0.0", @@ -4189,17 +4232,17 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "near-chain-primitives", - "near-primitives 2.3.0", + "near-primitives 2.3.1", ] [[package]] name = "near-client" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "actix-rt", @@ -4216,23 +4259,23 @@ dependencies = [ "near-async", "near-cache", "near-chain", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-chain-primitives", "near-chunks", "near-client-primitives", - "near-crypto 2.3.0", + "near-crypto 2.3.1", "near-dyn-configs", "near-epoch-manager", "near-network", - "near-o11y 2.3.0", - "near-parameters 2.3.0", + "near-o11y 2.3.1", + "near-parameters 2.3.1", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.3.0", + "near-primitives 2.3.1", "near-store", "near-telemetry", - "near-vm-runner 2.3.0", + "near-vm-runner 2.3.1", "num-rational", "once_cell", "percent-encoding", @@ -4256,16 +4299,16 @@ dependencies = [ [[package]] name = "near-client-primitives" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "chrono", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-chain-primitives", "near-chunks-primitives", - "near-crypto 2.3.0", - "near-primitives 2.3.0", + "near-crypto 2.3.1", + "near-primitives 2.3.1", "near-time", "serde", "serde_json", @@ -4290,8 +4333,8 @@ dependencies = [ [[package]] name = "near-config-utils" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "anyhow", "json_comments", @@ -4328,8 +4371,8 @@ dependencies = [ [[package]] name = "near-crypto" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "blake2 0.10.6", "borsh 1.5.1", @@ -4339,9 +4382,9 @@ dependencies = [ "ed25519-dalek", "hex", "near-account-id", - "near-config-utils 2.3.0", + "near-config-utils 2.3.1", "near-schema-checker-lib", - "near-stdx 2.3.0", + "near-stdx 2.3.1", "primitive-types", "rand 0.8.5", "secp256k1", @@ -4353,14 +4396,14 @@ dependencies = [ [[package]] name = "near-dyn-configs" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "anyhow", - "near-chain-configs 2.3.0", - "near-crypto 2.3.0", - "near-o11y 2.3.0", - "near-primitives 2.3.0", + "near-chain-configs 2.3.1", + "near-crypto 2.3.1", + "near-o11y 2.3.1", + "near-primitives 2.3.1", "near-time", "prometheus", "serde", @@ -4372,17 +4415,17 @@ dependencies = [ [[package]] name = "near-epoch-manager" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "borsh 1.5.1", "itertools 0.10.5", "near-cache", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-chain-primitives", - "near-crypto 2.3.0", - "near-o11y 2.3.0", - "near-primitives 2.3.0", + "near-crypto 2.3.1", + "near-o11y 2.3.1", + "near-primitives 2.3.1", "near-schema-checker-lib", "near-store", "num-bigint 0.3.3", @@ -4407,29 +4450,29 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ - "near-primitives-core 2.3.0", + "near-primitives-core 2.3.1", ] [[package]] name = "near-indexer" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "anyhow", "futures", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-client", - "near-config-utils 2.3.0", - "near-crypto 2.3.0", + "near-config-utils 2.3.1", + "near-crypto 2.3.1", "near-dyn-configs", "near-indexer-primitives", - "near-o11y 2.3.0", - "near-parameters 2.3.0", - "near-primitives 2.3.0", + "near-o11y 2.3.1", + "near-parameters 2.3.1", + "near-primitives 2.3.1", "near-store", "nearcore", "node-runtime", @@ -4442,18 +4485,18 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ - "near-primitives 2.3.0", + "near-primitives 2.3.1", "serde", "serde_json", ] [[package]] name = "near-jsonrpc" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "actix-cors 0.6.5", @@ -4464,14 +4507,14 @@ dependencies = [ "futures", "hex", "near-async", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-client", "near-client-primitives", - "near-jsonrpc-client 2.3.0", - "near-jsonrpc-primitives 2.3.0", + "near-jsonrpc-client 2.3.1", + "near-jsonrpc-primitives 2.3.1", "near-network", - "near-o11y 2.3.0", - "near-primitives 2.3.0", + "near-o11y 2.3.1", + "near-primitives 2.3.1", "serde", "serde_json", "serde_with", @@ -4501,16 +4544,16 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "0.13.0" -source = "git+https://github.com/kobayurii/near-jsonrpc-client-rs.git?branch=fork/0.14.0#fe1f68feab15045138cd76c084da45f444a5ce10" +version = "0.14.1" +source = "git+https://github.com/kobayurii/near-jsonrpc-client-rs.git?branch=fork/0.14.1#465a11096b7dfd4a49e496ea5ec268376bbf5694" dependencies = [ "borsh 1.5.1", "lazy_static", "log", - "near-chain-configs 2.3.0", - "near-crypto 2.3.0", - "near-jsonrpc-primitives 2.3.0", - "near-primitives 2.3.0", + "near-chain-configs 2.3.1", + "near-crypto 2.3.1", + "near-jsonrpc-primitives 2.3.1", + "near-primitives 2.3.1", "reqwest 0.12.9", "serde", "serde_json", @@ -4519,14 +4562,14 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix-http", "awc", "futures", - "near-jsonrpc-primitives 2.3.0", - "near-primitives 2.3.0", + "near-jsonrpc-primitives 2.3.1", + "near-primitives 2.3.1", "serde", "serde_json", ] @@ -4549,14 +4592,14 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "arbitrary", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-client-primitives", - "near-crypto 2.3.0", - "near-primitives 2.3.0", + "near-crypto 2.3.1", + "near-primitives 2.3.1", "near-schema-checker-lib", "serde", "serde_json", @@ -4567,7 +4610,7 @@ dependencies = [ [[package]] name = "near-lake-framework" version = "0.0.0" -source = "git+https://github.com/kobayurii/near-lake-framework-rs.git?branch=fork/0.7.10#5f6b9b1c785a98692a8d017b2154c29e8aa0e2d5" +source = "git+https://github.com/kobayurii/near-lake-framework-rs.git?branch=fork/0.7.12#da23d64b525b2b848d723545fe21c214602656e7" dependencies = [ "anyhow", "async-stream", @@ -4580,6 +4623,7 @@ dependencies = [ "derive_builder", "futures", "near-indexer-primitives", + "reqwest 0.12.9", "serde", "serde_json", "thiserror", @@ -4590,19 +4634,19 @@ dependencies = [ [[package]] name = "near-mainnet-res" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "near-account-id", - "near-chain-configs 2.3.0", - "near-primitives 2.3.0", + "near-chain-configs 2.3.1", + "near-primitives 2.3.1", "serde_json", ] [[package]] name = "near-network" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "anyhow", @@ -4621,13 +4665,13 @@ dependencies = [ "itertools 0.10.5", "lru 0.12.5", "near-async", - "near-chain-configs 2.3.0", - "near-crypto 2.3.0", - "near-fmt 2.3.0", - "near-o11y 2.3.0", + "near-chain-configs 2.3.1", + "near-crypto 2.3.1", + "near-fmt 2.3.1", + "near-o11y 2.3.1", "near-performance-metrics", "near-performance-metrics-macros", - "near-primitives 2.3.0", + "near-primitives 2.3.1", "near-schema-checker-lib", "near-store", "opentelemetry 0.22.0", @@ -4681,14 +4725,14 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "base64 0.21.7", "clap", - "near-crypto 2.3.0", - "near-primitives-core 2.3.0", + "near-crypto 2.3.1", + "near-primitives-core 2.3.1", "opentelemetry 0.22.0", "opentelemetry-otlp 0.15.0", "opentelemetry-semantic-conventions 0.14.0", @@ -4725,13 +4769,13 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "borsh 1.5.1", "enum-map", "near-account-id", - "near-primitives-core 2.3.0", + "near-primitives-core 2.3.1", "near-schema-checker-lib", "num-rational", "serde", @@ -4743,8 +4787,8 @@ dependencies = [ [[package]] name = "near-performance-metrics" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "bitflags 1.3.2", @@ -4758,8 +4802,8 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "quote", "syn 2.0.85", @@ -4767,13 +4811,13 @@ dependencies = [ [[package]] name = "near-pool" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "borsh 1.5.1", - "near-crypto 2.3.0", - "near-o11y 2.3.0", - "near-primitives 2.3.0", + "near-crypto 2.3.1", + "near-o11y 2.3.1", + "near-primitives 2.3.1", "rand 0.8.5", ] @@ -4821,8 +4865,8 @@ dependencies = [ [[package]] name = "near-primitives" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "arbitrary", "base64 0.21.7", @@ -4837,12 +4881,12 @@ dependencies = [ "enum-map", "hex", "itertools 0.10.5", - "near-crypto 2.3.0", - "near-fmt 2.3.0", - "near-parameters 2.3.0", - "near-primitives-core 2.3.0", + "near-crypto 2.3.1", + "near-fmt 2.3.1", + "near-parameters 2.3.1", + "near-primitives-core 2.3.1", "near-schema-checker-lib", - "near-stdx 2.3.0", + "near-stdx 2.3.1", "near-time", "num-rational", "ordered-float 4.4.0", @@ -4885,8 +4929,8 @@ dependencies = [ [[package]] name = "near-primitives-core" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "arbitrary", "base64 0.21.7", @@ -4905,8 +4949,8 @@ dependencies = [ [[package]] name = "near-rosetta-rpc" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "actix-cors 0.6.5", @@ -4917,14 +4961,14 @@ dependencies = [ "futures", "hex", "near-account-id", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-client", "near-client-primitives", - "near-crypto 2.3.0", + "near-crypto 2.3.1", "near-network", - "near-o11y 2.3.0", - "near-parameters 2.3.0", - "near-primitives 2.3.0", + "near-o11y 2.3.1", + "near-parameters 2.3.1", + "near-primitives 2.3.1", "node-runtime", "paperclip", "serde", @@ -4959,13 +5003,13 @@ dependencies = [ [[package]] name = "near-schema-checker-core" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" [[package]] name = "near-schema-checker-lib" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "near-schema-checker-core", "near-schema-checker-macro", @@ -4973,12 +5017,12 @@ dependencies = [ [[package]] name = "near-schema-checker-macro" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" [[package]] name = "near-state-indexer" -version = "0.3.1" +version = "0.3.2" dependencies = [ "actix", "actix-web", @@ -4989,12 +5033,12 @@ dependencies = [ "database", "futures", "logic-state-indexer", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-client", - "near-config-utils 2.3.0", + "near-config-utils 2.3.1", "near-indexer", "near-indexer-primitives", - "near-o11y 2.3.0", + "near-o11y 2.3.1", "once_cell", "openssl-probe", "rustc_version 0.4.1", @@ -5012,13 +5056,13 @@ checksum = "855fd5540e3b4ff6fedf12aba2db1ee4b371b36f465da1363a6d022b27cb43b8" [[package]] name = "near-stdx" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" [[package]] name = "near-store" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "actix-rt", @@ -5033,16 +5077,16 @@ dependencies = [ "itertools 0.10.5", "itoa", "lru 0.12.5", - "near-chain-configs 2.3.0", - "near-crypto 2.3.0", - "near-fmt 2.3.0", - "near-o11y 2.3.0", - "near-parameters 2.3.0", - "near-primitives 2.3.0", + "near-chain-configs 2.3.1", + "near-crypto 2.3.1", + "near-fmt 2.3.1", + "near-o11y 2.3.1", + "near-parameters 2.3.1", + "near-primitives 2.3.1", "near-schema-checker-lib", - "near-stdx 2.3.0", + "near-stdx 2.3.1", "near-time", - "near-vm-runner 2.3.0", + "near-vm-runner 2.3.1", "num_cpus", "rand 0.8.5", "rayon", @@ -5061,14 +5105,14 @@ dependencies = [ [[package]] name = "near-telemetry" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "awc", "futures", "near-async", - "near-o11y 2.3.0", + "near-o11y 2.3.1", "near-performance-metrics", "near-performance-metrics-macros", "near-time", @@ -5080,8 +5124,8 @@ dependencies = [ [[package]] name = "near-time" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "serde", "time", @@ -5090,8 +5134,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "enumset", "finite-wasm", @@ -5106,8 +5150,8 @@ dependencies = [ [[package]] name = "near-vm-compiler-singlepass" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -5126,8 +5170,8 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -5178,8 +5222,8 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "anyhow", "blst", @@ -5190,12 +5234,12 @@ dependencies = [ "finite-wasm", "lru 0.12.5", "memoffset 0.8.0", - "near-crypto 2.3.0", - "near-o11y 2.3.0", - "near-parameters 2.3.0", - "near-primitives-core 2.3.0", + "near-crypto 2.3.1", + "near-o11y 2.3.1", + "near-parameters 2.3.1", + "near-primitives-core 2.3.1", "near-schema-checker-lib", - "near-stdx 2.3.0", + "near-stdx 2.3.1", "near-vm-compiler", "near-vm-compiler-singlepass", "near-vm-engine", @@ -5234,8 +5278,8 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "indexmap 1.9.3", "num-traits", @@ -5245,8 +5289,8 @@ dependencies = [ [[package]] name = "near-vm-vm" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "backtrace", "cc", @@ -5266,18 +5310,18 @@ dependencies = [ [[package]] name = "near-wallet-contract" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "anyhow", - "near-primitives-core 2.3.0", - "near-vm-runner 2.3.0", + "near-primitives-core 2.3.1", + "near-vm-runner 2.3.1", ] [[package]] name = "nearcore" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", "actix-rt", @@ -5297,27 +5341,27 @@ dependencies = [ "indicatif", "near-async", "near-chain", - "near-chain-configs 2.3.0", + "near-chain-configs 2.3.1", "near-chunks", "near-client", "near-client-primitives", - "near-config-utils 2.3.0", - "near-crypto 2.3.0", + "near-config-utils 2.3.1", + "near-crypto 2.3.1", "near-dyn-configs", "near-epoch-manager", "near-jsonrpc", - "near-jsonrpc-primitives 2.3.0", + "near-jsonrpc-primitives 2.3.1", "near-mainnet-res", "near-network", - "near-o11y 2.3.0", - "near-parameters 2.3.0", + "near-o11y 2.3.1", + "near-parameters 2.3.1", "near-performance-metrics", "near-pool", - "near-primitives 2.3.0", + "near-primitives 2.3.1", "near-rosetta-rpc", "near-store", "near-telemetry", - "near-vm-runner 2.3.0", + "near-vm-runner 2.3.1", "node-runtime", "num-rational", "rand 0.8.5", @@ -5365,17 +5409,17 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.3.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.0-fork#2555f66fbb0ce2ba98aec7400fef596d0441d74e" +version = "2.3.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "borsh 1.5.1", - "near-crypto 2.3.0", - "near-o11y 2.3.0", - "near-parameters 2.3.0", - "near-primitives 2.3.0", - "near-primitives-core 2.3.0", + "near-crypto 2.3.1", + "near-o11y 2.3.1", + "near-parameters 2.3.1", + "near-primitives 2.3.1", + "near-primitives-core 2.3.1", "near-store", - "near-vm-runner 2.3.0", + "near-vm-runner 2.3.1", "near-wallet-contract", "num-bigint 0.3.3", "num-traits", @@ -6106,7 +6150,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "perf-testing" -version = "0.3.1" +version = "0.3.2" dependencies = [ "anyhow", "chrono", @@ -6626,7 +6670,7 @@ dependencies = [ [[package]] name = "read-rpc-server" -version = "0.3.1" +version = "0.3.2" dependencies = [ "actix-cors 0.7.0", "actix-http", @@ -6646,15 +6690,15 @@ dependencies = [ "lru 0.12.5", "mimalloc", "near-async", - "near-chain-configs 2.3.0", - "near-crypto 2.3.0", + "near-chain-configs 2.3.1", + "near-crypto 2.3.1", "near-indexer-primitives", "near-jsonrpc", - "near-jsonrpc-client 0.13.0", + "near-jsonrpc-client 0.14.1", "near-lake-framework", - "near-parameters 2.3.0", - "near-primitives 2.3.0", - "near-vm-runner 2.3.0", + "near-parameters 2.3.1", + "near-primitives 2.3.1", + "near-vm-runner 2.3.1", "prometheus", "readnode-primitives", "rustc_version 0.4.1", @@ -6670,7 +6714,7 @@ dependencies = [ [[package]] name = "readnode-primitives" -version = "0.3.1" +version = "0.3.2" dependencies = [ "anyhow", "borsh 1.5.1", @@ -6857,7 +6901,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.31", @@ -6875,7 +6919,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", - "system-configuration", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tokio-util 0.7.12", @@ -6899,10 +6943,12 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "http-body-util", "hyper 1.5.0", + "hyper-rustls 0.27.3", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -6919,6 +6965,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", + "system-configuration 0.6.1", "tokio", "tokio-native-tls", "tokio-util 0.7.12", @@ -7163,10 +7210,23 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -7213,6 +7273,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.18" @@ -7940,7 +8011,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state-indexer" -version = "0.3.1" +version = "0.3.2" dependencies = [ "anyhow", "clap", @@ -7948,7 +8019,7 @@ dependencies = [ "database", "futures", "logic-state-indexer", - "near-jsonrpc-client 0.13.0", + "near-jsonrpc-client 0.14.1", "near-lake-framework", "openssl-probe", "rustc_version 0.4.1", @@ -8105,7 +8176,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "system-configuration-sys 0.6.0", ] [[package]] @@ -8118,6 +8200,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -8346,7 +8438,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.16", + "rustls-pki-types", "tokio", ] @@ -8443,7 +8546,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.31", @@ -8473,7 +8576,7 @@ dependencies = [ "axum", "base64 0.21.7", "bytes", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.31", @@ -8723,7 +8826,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tx-details-storage" -version = "0.3.1" +version = "0.3.2" dependencies = [ "anyhow", "google-cloud-storage", @@ -8731,7 +8834,7 @@ dependencies = [ [[package]] name = "tx-indexer" -version = "0.3.1" +version = "0.3.2" dependencies = [ "actix-web", "anyhow", @@ -8745,7 +8848,7 @@ dependencies = [ "humantime", "lazy_static", "near-indexer-primitives", - "near-jsonrpc-client 0.13.0", + "near-jsonrpc-client 0.14.1", "near-lake-framework", "prometheus", "readnode-primitives", diff --git a/Cargo.toml b/Cargo.toml index 538250d0..4e50cb43 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.3.1" +version = "0.3.2" authors = ["Near Inc "] edition = "2021" rust-version = "1.81.0" @@ -51,23 +51,23 @@ tx-details-storage = { path = "tx-details-storage" } logic-state-indexer = { path = "logic-state-indexer" } # Please, update the supported nearcore version in .cargo/config.toml file -near-async = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-indexer = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-client = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-config-utils = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-o11y = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-indexer-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-chain-configs = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-crypto = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-jsonrpc = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-parameters = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork" } -near-vm-runner = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.0-fork", features = [ +near-async = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-indexer = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-client = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-config-utils = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-o11y = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-indexer-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-chain-configs = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-crypto = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-jsonrpc = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-parameters = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } +near-vm-runner = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork", features = [ "wasmer0_vm", "wasmer2_vm", "wasmtime_vm", "near_vm", ] } -near-lake-framework = { git = 'https://github.com/kobayurii/near-lake-framework-rs.git', branch = 'fork/0.7.10' } -near-jsonrpc-client = { git = 'https://github.com/kobayurii/near-jsonrpc-client-rs.git', branch = 'fork/0.14.0' } +near-jsonrpc-client = { git = 'https://github.com/kobayurii/near-jsonrpc-client-rs.git', branch = 'fork/0.14.1' } +near-lake-framework = { git = 'https://github.com/kobayurii/near-lake-framework-rs.git', branch = 'fork/0.7.12' } diff --git a/configuration/src/configs/lake.rs b/configuration/src/configs/lake.rs index d4782bfb..f8d2335b 100644 --- a/configuration/src/configs/lake.rs +++ b/configuration/src/configs/lake.rs @@ -44,11 +44,9 @@ impl LakeConfig { .expect("Failed to build LakeConfig")) } - pub async fn lake_s3_client(&self) -> near_lake_framework::s3_fetchers::LakeS3Client { + pub async fn lake_s3_client(&self) -> near_lake_framework::LakeS3Client { let s3_config = self.s3_config().await; - near_lake_framework::s3_fetchers::LakeS3Client::new(aws_sdk_s3::Client::from_conf( - s3_config, - )) + near_lake_framework::LakeS3Client::new(aws_sdk_s3::Client::from_conf(s3_config)) } } diff --git a/rpc-server/src/config.rs b/rpc-server/src/config.rs index 4cf116b1..85cefaef 100644 --- a/rpc-server/src/config.rs +++ b/rpc-server/src/config.rs @@ -20,7 +20,7 @@ pub struct GenesisInfo { impl GenesisInfo { pub async fn get( near_rpc_client: &crate::utils::JsonRpcClient, - s3_client: &near_lake_framework::s3_fetchers::LakeS3Client, + s3_client: &near_lake_framework::LakeS3Client, s3_bucket_name: &str, ) -> Self { tracing::info!("Get genesis config..."); @@ -32,7 +32,7 @@ impl GenesisInfo { .await .expect("Error to get genesis config"); - let genesis_block = near_lake_framework::s3_fetchers::fetch_block( + let genesis_block = near_lake_framework::s3::fetchers::fetch_block( s3_client, s3_bucket_name, genesis_config.genesis_height, @@ -50,7 +50,7 @@ impl GenesisInfo { #[derive(Clone)] pub struct ServerContext { /// Lake s3 client - pub s3_client: near_lake_framework::s3_fetchers::LakeS3Client, + pub s3_client: near_lake_framework::LakeS3Client, /// Database manager pub db_manager: std::sync::Arc>, /// TransactionDetails storage diff --git a/rpc-server/src/modules/blocks/methods.rs b/rpc-server/src/modules/blocks/methods.rs index ae355c9c..cb3ab87d 100644 --- a/rpc-server/src/modules/blocks/methods.rs +++ b/rpc-server/src/modules/blocks/methods.rs @@ -359,7 +359,7 @@ pub async fn fetch_block( { data.blocks_info_by_finality.optimistic_block_view().await } else { - near_lake_framework::s3_fetchers::fetch_block( + near_lake_framework::s3::fetchers::fetch_block( &data.s3_client, &data.s3_bucket_name, block_height, @@ -615,7 +615,7 @@ async fn fetch_shards_by_cache_block( .collect::>() .into_iter() .map(|shard_id| { - near_lake_framework::s3_fetchers::fetch_shard( + near_lake_framework::s3::fetchers::fetch_shard( &data.s3_client, &data.s3_bucket_name, cache_block.block_height, diff --git a/rpc-server/src/modules/blocks/utils.rs b/rpc-server/src/modules/blocks/utils.rs index e81000f1..d2358100 100644 --- a/rpc-server/src/modules/blocks/utils.rs +++ b/rpc-server/src/modules/blocks/utils.rs @@ -46,7 +46,7 @@ pub async fn check_block_height( tracing::instrument(skip(s3_client)) )] pub async fn fetch_chunk_from_s3( - s3_client: &near_lake_framework::s3_fetchers::LakeS3Client, + s3_client: &near_lake_framework::LakeS3Client, s3_bucket_name: &str, block_height: near_primitives::types::BlockHeight, shard_id: near_primitives::types::ShardId, @@ -57,7 +57,7 @@ pub async fn fetch_chunk_from_s3( block_height, shard_id ); - match near_lake_framework::s3_fetchers::fetch_shard( + match near_lake_framework::s3::fetchers::fetch_shard( s3_client, s3_bucket_name, block_height, From c1d13c6d48103f5e523ee7063bd2b5a6bc0ac6aa Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Fri, 15 Nov 2024 10:32:52 +0200 Subject: [PATCH 4/9] Support new method EXPERIMENTAL_congestion_level (#376) --- CHANGELOG.md | 1 + rpc-server/src/main.rs | 6 +++ rpc-server/src/modules/blocks/methods.rs | 63 +++++++++++++++++++++-- rpc-server/src/modules/network/methods.rs | 25 +++++---- 4 files changed, 80 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f08951d0..87867aef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Corrected state size calculation logic. * Integrated cargo_pkg_version metric to reflect the current server version. * Delete unnecessary debug logs about update blocks by finalities +* Support new method `EXPERIMENTAL_congestion_level` ### Supported Nearcore Version - nearcore v2.3.1 diff --git a/rpc-server/src/main.rs b/rpc-server/src/main.rs index 848fb32e..11d869d8 100644 --- a/rpc-server/src/main.rs +++ b/rpc-server/src/main.rs @@ -176,6 +176,12 @@ async fn rpc_handler( }) .await } + "EXPERIMENTAL_congestion_level" => { + process_method_call(request, |params| { + modules::blocks::methods::congestion_level(data, params) + }) + .await + } "EXPERIMENTAL_genesis_config" => { process_method_call(request, |_: ()| { modules::network::methods::genesis_config(data) diff --git a/rpc-server/src/modules/blocks/methods.rs b/rpc-server/src/modules/blocks/methods.rs index cb3ab87d..ef3fc0b7 100644 --- a/rpc-server/src/modules/blocks/methods.rs +++ b/rpc-server/src/modules/blocks/methods.rs @@ -52,7 +52,7 @@ pub async fn chunk( near_jsonrpc::primitives::types::chunks::RpcChunkError, > { tracing::debug!("`chunk` called with parameters: {:?}", request_data); - let chunk_result = fetch_chunk(&data, request_data.chunk_reference.clone()).await; + let chunk_result = fetch_chunk(&data, request_data.chunk_reference.clone(), "chunk").await; #[cfg(feature = "shadow-data-consistency")] { crate::utils::shadow_compare_results_handler( @@ -67,6 +67,58 @@ pub async fn chunk( chunk_result } +// EXPERIMENTAL_congestion_level rpc method implementation +#[cfg_attr(feature = "tracing-instrumentation", tracing::instrument(skip(data)))] +pub async fn congestion_level( + data: Data, + request_data: near_jsonrpc::primitives::types::congestion::RpcCongestionLevelRequest, +) -> Result< + near_jsonrpc::primitives::types::congestion::RpcCongestionLevelResponse, + near_jsonrpc::primitives::types::congestion::RpcCongestionLevelError, +> { + tracing::debug!( + "`EXPERIMENTAL_congestion_level` called with parameters: {:?}", + request_data + ); + let chunk_view = fetch_chunk( + &data, + request_data.chunk_reference.clone(), + "EXPERIMENTAL_congestion_level", + ) + .await? + .chunk_view; + let config_result = crate::modules::network::methods::protocol_config_call( + &data, + near_primitives::types::BlockReference::BlockId(near_primitives::types::BlockId::Height( + chunk_view.header.height_included, + )), + "EXPERIMENTAL_congestion_level", + ) + .await; + let config = config_result.map_err(|err: near_jsonrpc::primitives::types::config::RpcProtocolConfigError| match err { + near_jsonrpc::primitives::types::config::RpcProtocolConfigError::UnknownBlock { error_message } => { + near_jsonrpc::primitives::types::congestion::RpcCongestionLevelError::UnknownBlock { + error_message, + } + } + near_jsonrpc::primitives::types::config::RpcProtocolConfigError::InternalError { error_message } => { + near_jsonrpc::primitives::types::congestion::RpcCongestionLevelError::InternalError { + error_message, + } + } + })?; + let congestion_level = chunk_view + .header + .congestion_info + .map(|info| info.congestion_level(config.runtime_config.congestion_control_config)) + .unwrap_or(0.0); + Ok( + near_jsonrpc::primitives::types::congestion::RpcCongestionLevelResponse { + congestion_level, + }, + ) +} + /// `EXPERIMENTAL_changes` rpc method implementation /// calls proxy_rpc_call to get `EXPERIMENTAL_changes` from near-rpc if request parameters not supported by read-rpc /// as example: BlockReference for Finality::None is not supported by read-rpc @@ -379,6 +431,7 @@ pub async fn fetch_block( pub async fn fetch_chunk( data: &Data, chunk_reference: near_jsonrpc::primitives::types::chunks::ChunkReference, + method_name: &str, ) -> Result< near_jsonrpc::primitives::types::chunks::RpcChunkResponse, near_jsonrpc::primitives::types::chunks::RpcChunkError, @@ -400,7 +453,7 @@ pub async fn fetch_chunk( } near_primitives::types::BlockId::Hash(block_hash) => data .db_manager - .get_block_height_by_hash(block_hash, "chunk") + .get_block_height_by_hash(block_hash, method_name) .await .map_err(|err| { tracing::error!("Failed to fetch block by hash: {}", err); @@ -412,7 +465,7 @@ pub async fn fetch_chunk( // Check if the chunk stored in block with the given height if let Ok(block_height_shard_id) = data .db_manager - .get_block_by_height_and_shard_id(block_height, shard_id, "chunk") + .get_block_by_height_and_shard_id(block_height, shard_id, method_name) .await { (block_height_shard_id.0, block_height_shard_id.1) @@ -422,7 +475,7 @@ pub async fn fetch_chunk( } near_jsonrpc::primitives::types::chunks::ChunkReference::ChunkHash { chunk_id } => data .db_manager - .get_block_by_chunk_hash(chunk_id, "chunk") + .get_block_by_chunk_hash(chunk_id, method_name) .await .map_err( |_err| near_jsonrpc::primitives::types::chunks::RpcChunkError::UnknownChunk { @@ -444,7 +497,7 @@ pub async fn fetch_chunk( &near_primitives::types::BlockReference::BlockId(near_primitives::types::BlockId::Height( block_height, )), - "chunk", + method_name, Some(block_height), ) .await; diff --git a/rpc-server/src/modules/network/methods.rs b/rpc-server/src/modules/network/methods.rs index 290fc456..0baa5ac1 100644 --- a/rpc-server/src/modules/network/methods.rs +++ b/rpc-server/src/modules/network/methods.rs @@ -297,7 +297,12 @@ pub async fn protocol_config( request_data ); - let config_view = protocol_config_call(&data, request_data.block_reference.clone()).await; + let config_view = protocol_config_call( + &data, + request_data.block_reference.clone(), + "EXPERIMENTAL_protocol_config", + ) + .await; #[cfg(feature = "shadow-data-consistency")] { @@ -366,21 +371,21 @@ async fn validators_call( Ok(validators.validators_info) } -async fn protocol_config_call( +pub async fn protocol_config_call( data: &Data, block_reference: near_primitives::types::BlockReference, + method_name: &str, ) -> Result< near_chain_configs::ProtocolConfigView, near_jsonrpc::primitives::types::config::RpcProtocolConfigError, > { - let protocol_version = - get_protocol_version(data, block_reference, "EXPERIMENTAL_protocol_config") - .await - .map_err(|err| { - near_jsonrpc::primitives::types::config::RpcProtocolConfigError::UnknownBlock { - error_message: err.to_string(), - } - })?; + let protocol_version = get_protocol_version(data, block_reference, method_name) + .await + .map_err(|err| { + near_jsonrpc::primitives::types::config::RpcProtocolConfigError::UnknownBlock { + error_message: err.to_string(), + } + })?; // Stores runtime config for each protocol version // Create store of runtime configs for the given chain id. // From 270d603d0afeda9e4e8ad72281254d7c8ac01bcd Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Tue, 19 Nov 2024 15:23:46 +0200 Subject: [PATCH 5/9] remove println after dubug --- rpc-server/src/modules/queries/contract_runner/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/rpc-server/src/modules/queries/contract_runner/mod.rs b/rpc-server/src/modules/queries/contract_runner/mod.rs index 470e4f03..8d41b6ac 100644 --- a/rpc-server/src/modules/queries/contract_runner/mod.rs +++ b/rpc-server/src/modules/queries/contract_runner/mod.rs @@ -136,7 +136,6 @@ pub async fn run_contract( block_hash: block.block_hash, } })?; - println!("Contract code len {}", code.data.len()); contract_code_cache.put(code_hash, code.data.clone()).await; Contract::new(Some(code.data), code_hash) } From 691ea83452ac3a76341fc529a1fb6bf644f76cbc Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Fri, 22 Nov 2024 15:24:40 +0200 Subject: [PATCH 6/9] add metric to calculate database reads queries by account_id, method_name and table_name (#377) --- Cargo.lock | 753 +++++++++++++++++----------- database/src/metrics.rs | 6 + database/src/postgres/rpc_server.rs | 64 +++ rpc-server/src/metrics.rs | 7 - 4 files changed, 537 insertions(+), 293 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7e34ba74..99b1a049 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -130,7 +130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -269,7 +269,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -280,7 +280,7 @@ checksum = "b6ac1e58cded18cb28ddc17143c4dea5345b3ad575e14f32f66e4054a56eb271" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -357,9 +357,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "android-tzdata" @@ -378,9 +378,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.17" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -393,9 +393,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" @@ -427,15 +427,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.91" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -454,9 +454,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.5.2" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assert-json-diff" @@ -504,7 +504,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -515,7 +515,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -591,9 +591,9 @@ dependencies = [ [[package]] name = "aws-config" -version = "1.5.9" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6448cfb224dd6a9b9ac734f58622dd0d4751f3589f3b777345745f46b2eb14" +checksum = "9b49afaa341e8dd8577e1a2200468f98956d6eda50bcf4a53246cc00174ba924" dependencies = [ "aws-credential-types", "aws-runtime", @@ -608,7 +608,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.1", + "fastrand 2.2.0", "hex", "http 0.2.12", "ring 0.17.8", @@ -672,7 +672,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.1", + "fastrand 2.2.0", "http 0.2.12", "http-body 0.4.6", "once_cell", @@ -684,9 +684,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.58.0" +version = "1.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0656a79cf5e6ab0d4bb2465cd750a7a2fd7ea26c062183ed94225f5782e22365" +checksum = "0e531658a0397d22365dfe26c3e1c0c8448bf6a3a2d8a098ded802f2b1261615" dependencies = [ "aws-credential-types", "aws-runtime", @@ -702,7 +702,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", - "fastrand 2.1.1", + "fastrand 2.2.0", "hex", "hmac", "http 0.2.12", @@ -718,9 +718,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.47.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8776850becacbd3a82a4737a9375ddb5c6832a51379f24443a98e61513f852c" +checksum = "09677244a9da92172c8dc60109b4a9658597d4d298b188dd0018b6a66b410ca4" dependencies = [ "aws-credential-types", "aws-runtime", @@ -740,9 +740,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.48.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0007b5b8004547133319b6c4e87193eee2a0bcb3e4c18c75d09febe9dab7b383" +checksum = "81fea2f3a8bb3bd10932ae7ad59cc59f65f270fc9183a7e91f501dc5efbef7ee" dependencies = [ "aws-credential-types", "aws-runtime", @@ -762,9 +762,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.47.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fffaa356e7f1c725908b75136d53207fa714e348f365671df14e95a60530ad3" +checksum = "6ada54e5f26ac246dc79727def52f7f8ed38915cb47781e2a72213957dc3a7d5" dependencies = [ "aws-credential-types", "aws-runtime", @@ -906,7 +906,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "fastrand 2.1.1", + "fastrand 2.2.0", "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", @@ -924,9 +924,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.7.2" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" +checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -941,9 +941,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.8" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c9cdc179e6afbf5d391ab08c85eac817b51c87e1892a5edb5f7bbdc64314b4" +checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510" dependencies = [ "base64-simd", "bytes", @@ -1132,7 +1132,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -1193,17 +1193,15 @@ dependencies = [ [[package]] name = "blake3" -version = "0.3.8" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", "arrayvec", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "constant_time_eq", - "crypto-mac", - "digest 0.9.0", ] [[package]] @@ -1239,71 +1237,25 @@ dependencies = [ [[package]] name = "borsh" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" -dependencies = [ - "borsh-derive 0.9.3", - "hashbrown 0.11.2", -] - -[[package]] -name = "borsh" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" dependencies = [ - "borsh-derive 1.5.1", + "borsh-derive", "cfg_aliases", ] [[package]] name = "borsh-derive" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" dependencies = [ "once_cell", - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.85", - "syn_derive", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" -dependencies = [ + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.87", ] [[package]] @@ -1443,9 +1395,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.1.31" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -1516,9 +1468,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -1526,9 +1478,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -1545,14 +1497,14 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "cloud-storage" @@ -1633,7 +1585,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "toml 0.8.19", + "toml", "tracing", "tracing-opentelemetry 0.19.0", "tracing-stackdriver", @@ -1663,9 +1615,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -1711,9 +1663,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" dependencies = [ "libc", ] @@ -1981,9 +1933,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.77+curl-8.10.1" +version = "0.4.78+curl-8.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f469e8a5991f277a208224f6c7ad72ecb5f986e36d09ae1f2c1bb9259478a480" +checksum = "8eec768341c5c7789611ae51cf6c459099f22e64a5d5d0ce4892434e33821eaf" dependencies = [ "cc", "libc", @@ -2019,7 +1971,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2067,7 +2019,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2089,7 +2041,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2112,7 +2064,7 @@ dependencies = [ "anyhow", "async-trait", "bigdecimal", - "borsh 1.5.1", + "borsh", "configuration", "futures", "hex", @@ -2173,18 +2125,18 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2228,7 +2180,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2281,6 +2233,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "dissimilar" version = "1.0.9" @@ -2459,7 +2422,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2480,7 +2443,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2564,9 +2527,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "ff" @@ -2617,9 +2580,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -2781,7 +2744,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3009,9 +2972,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -3026,15 +2989,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.8", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -3065,9 +3019,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" dependencies = [ "allocator-api2", "equivalent", @@ -3249,14 +3203,14 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -3291,9 +3245,9 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", - "rustls 0.23.16", + "rustls 0.23.17", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -3333,7 +3287,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "native-tls", "tokio", @@ -3352,7 +3306,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.5.0", + "hyper 1.5.1", "pin-project-lite", "socket2", "tokio", @@ -3383,6 +3337,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -3399,6 +3471,27 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + [[package]] name = "im" version = "15.1.0" @@ -3437,7 +3530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.1", "serde", ] @@ -3535,9 +3628,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "7a73e9fe3c49d7afb2ace819fa181a287ce54a0983eda4e0eb05c22f82ffe534" [[package]] name = "jobserver" @@ -3630,9 +3723,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libloading" @@ -3716,6 +3809,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "local-channel" version = "0.1.5" @@ -3764,7 +3863,7 @@ version = "0.3.2" dependencies = [ "actix-web", "anyhow", - "borsh 1.5.1", + "borsh", "clap", "configuration", "database", @@ -3799,7 +3898,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.0", + "hashbrown 0.15.1", ] [[package]] @@ -3864,7 +3963,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -4047,7 +4146,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" dependencies = [ - "borsh 1.5.1", + "borsh", "serde", ] @@ -4078,7 +4177,7 @@ source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -4096,7 +4195,7 @@ source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff dependencies = [ "actix", "assert_matches", - "borsh 1.5.1", + "borsh", "bytesize", "chrono", "crossbeam-channel", @@ -4204,7 +4303,7 @@ version = "2.3.1" source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "actix", - "borsh 1.5.1", + "borsh", "chrono", "derive_more", "futures", @@ -4248,7 +4347,7 @@ dependencies = [ "actix-rt", "anyhow", "async-trait", - "borsh 1.5.1", + "borsh", "bytesize", "chrono", "cloud-storage", @@ -4349,7 +4448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2991d2912218a80ec0733ac87f84fa803accea105611eea209d4419271957667" dependencies = [ "blake2 0.9.2", - "borsh 1.5.1", + "borsh", "bs58", "c2-chacha", "curve25519-dalek", @@ -4375,7 +4474,7 @@ version = "2.3.1" source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "blake2 0.10.6", - "borsh 1.5.1", + "borsh", "bs58", "curve25519-dalek", "derive_more", @@ -4418,7 +4517,7 @@ name = "near-epoch-manager" version = "2.3.1" source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ - "borsh 1.5.1", + "borsh", "itertools 0.10.5", "near-cache", "near-chain-configs 2.3.1", @@ -4529,7 +4628,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18ad81e015f7aced8925d5b9ba3f369b36da9575c15812cfd0786bc1213284ca" dependencies = [ - "borsh 1.5.1", + "borsh", "lazy_static", "log", "near-chain-configs 0.20.1", @@ -4547,7 +4646,7 @@ name = "near-jsonrpc-client" version = "0.14.1" source = "git+https://github.com/kobayurii/near-jsonrpc-client-rs.git?branch=fork/0.14.1#465a11096b7dfd4a49e496ea5ec268376bbf5694" dependencies = [ - "borsh 1.5.1", + "borsh", "lazy_static", "log", "near-chain-configs 2.3.1", @@ -4652,7 +4751,7 @@ dependencies = [ "anyhow", "arc-swap", "async-trait", - "borsh 1.5.1", + "borsh", "bytes", "bytesize", "chrono", @@ -4755,7 +4854,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9f16a59b6c3e69b0585be951af6fe42a0ba86c0e207cb8c63badd19efd16680" dependencies = [ "assert_matches", - "borsh 1.5.1", + "borsh", "enum-map", "near-account-id", "near-primitives-core 0.20.1", @@ -4772,7 +4871,7 @@ name = "near-parameters" version = "2.3.1" source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ - "borsh 1.5.1", + "borsh", "enum-map", "near-account-id", "near-primitives-core 2.3.1", @@ -4806,7 +4905,7 @@ version = "2.3.1" source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -4814,7 +4913,7 @@ name = "near-pool" version = "2.3.1" source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ - "borsh 1.5.1", + "borsh", "near-crypto 2.3.1", "near-o11y 2.3.1", "near-primitives 2.3.1", @@ -4829,7 +4928,7 @@ checksum = "0462b067732132babcc89d5577db3bfcb0a1bcfbaaed3f2db4c11cd033666314" dependencies = [ "arbitrary", "base64 0.21.7", - "borsh 1.5.1", + "borsh", "bytesize", "cfg-if 1.0.0", "chrono", @@ -4871,7 +4970,7 @@ dependencies = [ "arbitrary", "base64 0.21.7", "bitvec", - "borsh 1.5.1", + "borsh", "bytes", "bytesize", "cfg-if 1.0.0", @@ -4889,7 +4988,7 @@ dependencies = [ "near-stdx 2.3.1", "near-time", "num-rational", - "ordered-float 4.4.0", + "ordered-float 4.5.0", "primitive-types", "rand 0.8.5", "rand_chacha 0.3.1", @@ -4913,7 +5012,7 @@ checksum = "8443eb718606f572c438be6321a097a8ebd69f8e48d953885b4f16601af88225" dependencies = [ "arbitrary", "base64 0.21.7", - "borsh 1.5.1", + "borsh", "bs58", "derive_more", "enum-map", @@ -4934,7 +5033,7 @@ source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff dependencies = [ "arbitrary", "base64 0.21.7", - "borsh 1.5.1", + "borsh", "bs58", "derive_more", "enum-map", @@ -4986,7 +5085,7 @@ checksum = "80fca203c51edd9595ec14db1d13359fb9ede32314990bf296b6c5c4502f6ab7" dependencies = [ "quote", "serde", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -4998,7 +5097,7 @@ dependencies = [ "fs2", "near-rpc-error-core", "serde", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -5067,7 +5166,7 @@ dependencies = [ "actix", "actix-rt", "anyhow", - "borsh 1.5.1", + "borsh", "bytesize", "crossbeam", "derive-where", @@ -5197,7 +5296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c56c80bdb1954808f59bd36a9112377197b38d424991383bf05f52d0fe2e0da5" dependencies = [ "base64 0.21.7", - "borsh 1.5.1", + "borsh", "ed25519-dalek", "enum-map", "memoffset 0.8.0", @@ -5227,7 +5326,7 @@ source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff dependencies = [ "anyhow", "blst", - "borsh 1.5.1", + "borsh", "bytesize", "ed25519-dalek", "enum-map", @@ -5328,7 +5427,7 @@ dependencies = [ "actix-web", "anyhow", "awc", - "borsh 1.5.1", + "borsh", "bytesize", "chrono", "cloud-storage", @@ -5412,7 +5511,7 @@ name = "node-runtime" version = "2.3.1" source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" dependencies = [ - "borsh 1.5.1", + "borsh", "near-crypto 2.3.1", "near-o11y 2.3.1", "near-parameters 2.3.1", @@ -5630,7 +5729,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -5641,9 +5740,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.4.0+3.4.0" +version = "300.4.1+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" dependencies = [ "cc", ] @@ -5865,7 +5964,7 @@ dependencies = [ "glob", "once_cell", "opentelemetry 0.22.0", - "ordered-float 4.4.0", + "ordered-float 4.5.0", "percent-encoding", "rand 0.8.5", "thiserror", @@ -5884,11 +5983,11 @@ dependencies = [ [[package]] name = "ordered-float" -version = "4.4.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e7ccb95e240b7c9506a3d544f10d935e142cc90b0a1d56954fb44d89ad6b97" +checksum = "c65ee1f9701bf938026630b455d5315f490640234259037edb259798b3bcf85e" dependencies = [ - "borsh 1.5.1", + "borsh", "num-traits", "rand 0.8.5", "serde", @@ -6194,7 +6293,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -6290,7 +6389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -6303,15 +6402,6 @@ dependencies = [ "uint", ] -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml 0.5.11", -] - [[package]] name = "proc-macro-crate" version = "3.2.0" @@ -6432,7 +6522,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -6504,9 +6594,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" dependencies = [ "cc", ] @@ -6677,7 +6767,7 @@ dependencies = [ "actix-web", "anyhow", "assert-json-diff", - "borsh 1.5.1", + "borsh", "cache-storage", "chrono", "configuration", @@ -6717,7 +6807,7 @@ name = "readnode-primitives" version = "0.3.2" dependencies = [ "anyhow", - "borsh 1.5.1", + "borsh", "near-indexer-primitives", "num-traits", "serde", @@ -6827,7 +6917,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -6842,9 +6932,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -6943,11 +7033,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-rustls 0.27.3", "hyper-tls 0.6.0", "hyper-util", @@ -7191,9 +7281,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.38" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno 0.3.9", @@ -7216,9 +7306,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" dependencies = [ "once_cell", "rustls-pki-types", @@ -7315,9 +7405,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -7392,9 +7482,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -7423,9 +7513,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -7463,13 +7553,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -7483,9 +7573,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -7501,7 +7591,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -7552,7 +7642,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -8117,27 +8207,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.85" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.85", -] - [[package]] name = "sync_wrapper" version = "0.1.2" @@ -8153,6 +8231,17 @@ dependencies = [ "futures-core", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "sysinfo" version = "0.24.7" @@ -8230,12 +8319,12 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.1.1", + "fastrand 2.2.0", "once_cell", "rustix", "windows-sys 0.59.0", @@ -8243,22 +8332,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.65" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.65" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -8334,6 +8423,16 @@ dependencies = [ "time-core", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.8.0" @@ -8351,9 +8450,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -8386,7 +8485,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -8448,7 +8547,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.16", + "rustls 0.23.17", "rustls-pki-types", "tokio", ] @@ -8491,15 +8590,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.8.19" @@ -8650,9 +8740,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b87073920bcce23e9f5cb0d2671e9f01d6803bb5229c159b2f5ce6806d73ffc" +checksum = "54a9f5c1aca50ebebf074ee665b9f99f2e84906dcf6b993a0d0090edb835166d" dependencies = [ "actix-web", "mutually_exclusive_features", @@ -8681,7 +8771,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -8838,7 +8928,7 @@ version = "0.3.2" dependencies = [ "actix-web", "anyhow", - "borsh 1.5.1", + "borsh", "cache-storage", "clap", "configuration", @@ -8898,9 +8988,9 @@ checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -8955,12 +9045,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" dependencies = [ "form_urlencoded", - "idna", + "idna 1.0.3", "percent-encoding", ] @@ -8970,6 +9060,18 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -8991,7 +9093,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" dependencies = [ - "idna", + "idna 0.5.0", "once_cell", "regex", "serde", @@ -9012,7 +9114,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -9100,7 +9202,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -9134,7 +9236,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9251,18 +9353,18 @@ dependencies = [ [[package]] name = "wasmer-runtime-core-near" -version = "0.18.3" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3fac37da3c625e98708c5dd92d3f642aaf700fd077168d3d0fff277ec6a165" +checksum = "af9c54899b847f8bab6d47295487c9827f14cc411bd70b168e87a4ea017ccd7e" dependencies = [ "bincode", "blake3", - "borsh 0.9.3", + "borsh", "cc", "digest 0.8.1", "errno 0.2.8", "hex", - "indexmap 1.9.3", + "indexmap 2.6.0", "lazy_static", "libc", "nix 0.15.0", @@ -9295,12 +9397,12 @@ dependencies = [ [[package]] name = "wasmer-singlepass-backend-near" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6edd0ba6c0bcf9b279186d4dbe81649dda3e5ef38f586865943de4dcd653f8" +checksum = "9358673d39c3b4a15374fba0536bfe5e50485e7c826de50d2dbef8c96df07674" dependencies = [ "bincode", - "borsh 0.9.3", + "borsh", "byteorder", "dynasm 1.2.3", "dynasmrt 1.2.3", @@ -9592,7 +9694,7 @@ checksum = "09b5575a75e711ca6c36bb9ad647c93541cdc8e34218031acba5da3f35919dd3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -9898,6 +10000,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -9909,9 +10023,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" +checksum = "af310deaae937e48a26602b730250b4949e125f468f11e6990be3e5304ddd96f" [[package]] name = "xmlparser" @@ -9934,6 +10048,30 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -9952,7 +10090,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", ] [[package]] @@ -9972,7 +10131,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -9988,6 +10147,28 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "zstd" version = "0.13.2" diff --git a/database/src/metrics.rs b/database/src/metrics.rs index 7ba79cb9..ea0adfa2 100644 --- a/database/src/metrics.rs +++ b/database/src/metrics.rs @@ -38,4 +38,10 @@ lazy_static! { &["method_name", "table_name"] ) .unwrap(); + pub(crate) static ref ACCOUTS_DATABASE_READ_QUERIES: IntCounterVec = register_int_counter_vec( + "account_database_read_queries_counter", + "Total number of accounts database reads queries by method_name and table_name", + &["account_id", "shard_id", "method_name", "table_name"] + ) + .unwrap(); } diff --git a/database/src/postgres/rpc_server.rs b/database/src/postgres/rpc_server.rs index ffe593b5..f6b06bcb 100644 --- a/database/src/postgres/rpc_server.rs +++ b/database/src/postgres/rpc_server.rs @@ -69,6 +69,14 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); + crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + .with_label_values(&[ + account_id.as_ref(), + &shard_id_pool.shard_id.to_string(), + method_name, + "state_changes_data", + ]) + .inc(); let page_state = if let Some(page_state_token) = page_token { borsh::from_slice::(&hex::decode(page_state_token)?)? } else { @@ -150,6 +158,14 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); + crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + .with_label_values(&[ + account_id.as_ref(), + &shard_id_pool.shard_id.to_string(), + method_name, + "state_changes_data", + ]) + .inc(); let mut items = std::collections::HashMap::new(); let mut stream = sqlx::query_as::<_, (String, Vec)>( " @@ -207,6 +223,14 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); + crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + .with_label_values(&[ + account_id.as_ref(), + &shard_id_pool.shard_id.to_string(), + method_name, + "state_changes_data", + ]) + .inc(); let mut items = std::collections::HashMap::new(); let mut stream = sqlx::query_as::<_, (String, Vec)>( " @@ -264,6 +288,14 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); + crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + .with_label_values(&[ + account_id.as_ref(), + &shard_id_pool.shard_id.to_string(), + method_name, + "state_changes_data", + ]) + .inc(); let (data_value,): (Vec,) = sqlx::query_as( " SELECT data_value @@ -297,6 +329,14 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_account", ]) .inc(); + crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + .with_label_values(&[ + account_id.as_ref(), + &shard_id_pool.shard_id.to_string(), + method_name, + "state_changes_account", + ]) + .inc(); let (block_height, block_hash, data_value): (bigdecimal::BigDecimal, String, Vec) = sqlx::query_as( " @@ -334,6 +374,14 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_contract", ]) .inc(); + crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + .with_label_values(&[ + account_id.as_ref(), + &shard_id_pool.shard_id.to_string(), + method_name, + "state_changes_contract", + ]) + .inc(); let (block_height, block_hash, contract_code): (bigdecimal::BigDecimal, String, Vec) = sqlx::query_as( " @@ -372,6 +420,14 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_access_key", ]) .inc(); + crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + .with_label_values(&[ + account_id.as_ref(), + &shard_id_pool.shard_id.to_string(), + method_name, + "state_changes_access_key", + ]) + .inc(); let key_data = borsh::to_vec(&public_key)?; let (block_height, block_hash, data_value): (bigdecimal::BigDecimal, String, Vec) = sqlx::query_as( @@ -412,6 +468,14 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_access_key", ]) .inc(); + crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + .with_label_values(&[ + account_id.as_ref(), + &shard_id_pool.shard_id.to_string(), + method_name, + "state_changes_access_key", + ]) + .inc(); let mut access_keys = vec![]; let mut stream = sqlx::query_as::<_, (String, Vec, bigdecimal::BigDecimal)>( " diff --git a/rpc-server/src/metrics.rs b/rpc-server/src/metrics.rs index 745b90a4..5af0d36e 100644 --- a/rpc-server/src/metrics.rs +++ b/rpc-server/src/metrics.rs @@ -121,13 +121,6 @@ lazy_static! { counter_vec }; - pub(crate) static ref LEGACY_DATABASE_TX_DETAILS: IntCounterVec = register_int_counter_vec( - "legacy_database_tx_details", - "Total number of calls to the legacy database for transaction details", - // This declares a label named `lookup_type` to differentiate "finished" and "in_progress" transaction lookups - &["lookup_type"] - ).unwrap(); - // Error metrics // 0: ReadRPC success, NEAR RPC success" // 1: ReadRPC success, NEAR RPC error" From 40a889015807b013f8ecef829e77969102457c71 Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Mon, 25 Nov 2024 13:19:59 +0200 Subject: [PATCH 7/9] correct mistake in the var name --- database/src/metrics.rs | 2 +- database/src/postgres/rpc_server.rs | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/database/src/metrics.rs b/database/src/metrics.rs index ea0adfa2..9b0cbef2 100644 --- a/database/src/metrics.rs +++ b/database/src/metrics.rs @@ -38,7 +38,7 @@ lazy_static! { &["method_name", "table_name"] ) .unwrap(); - pub(crate) static ref ACCOUTS_DATABASE_READ_QUERIES: IntCounterVec = register_int_counter_vec( + pub(crate) static ref ACCOUNTS_DATABASE_READ_QUERIES: IntCounterVec = register_int_counter_vec( "account_database_read_queries_counter", "Total number of accounts database reads queries by method_name and table_name", &["account_id", "shard_id", "method_name", "table_name"] diff --git a/database/src/postgres/rpc_server.rs b/database/src/postgres/rpc_server.rs index f6b06bcb..5f0bb6b6 100644 --- a/database/src/postgres/rpc_server.rs +++ b/database/src/postgres/rpc_server.rs @@ -69,7 +69,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); - crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES .with_label_values(&[ account_id.as_ref(), &shard_id_pool.shard_id.to_string(), @@ -158,7 +158,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); - crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES .with_label_values(&[ account_id.as_ref(), &shard_id_pool.shard_id.to_string(), @@ -223,7 +223,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); - crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES .with_label_values(&[ account_id.as_ref(), &shard_id_pool.shard_id.to_string(), @@ -288,7 +288,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); - crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES .with_label_values(&[ account_id.as_ref(), &shard_id_pool.shard_id.to_string(), @@ -329,7 +329,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_account", ]) .inc(); - crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES .with_label_values(&[ account_id.as_ref(), &shard_id_pool.shard_id.to_string(), @@ -374,7 +374,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_contract", ]) .inc(); - crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES .with_label_values(&[ account_id.as_ref(), &shard_id_pool.shard_id.to_string(), @@ -420,7 +420,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_access_key", ]) .inc(); - crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES .with_label_values(&[ account_id.as_ref(), &shard_id_pool.shard_id.to_string(), @@ -468,7 +468,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_access_key", ]) .inc(); - crate::metrics::ACCOUTS_DATABASE_READ_QUERIES + crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES .with_label_values(&[ account_id.as_ref(), &shard_id_pool.shard_id.to_string(), From 745508b5f7ccb751a131a5e8fe4df36f63d3fe0b Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Tue, 26 Nov 2024 17:27:24 +0200 Subject: [PATCH 8/9] remove heavy metrics (#379) --- database/src/metrics.rs | 6 --- database/src/postgres/rpc_server.rs | 64 ----------------------------- 2 files changed, 70 deletions(-) diff --git a/database/src/metrics.rs b/database/src/metrics.rs index 9b0cbef2..7ba79cb9 100644 --- a/database/src/metrics.rs +++ b/database/src/metrics.rs @@ -38,10 +38,4 @@ lazy_static! { &["method_name", "table_name"] ) .unwrap(); - pub(crate) static ref ACCOUNTS_DATABASE_READ_QUERIES: IntCounterVec = register_int_counter_vec( - "account_database_read_queries_counter", - "Total number of accounts database reads queries by method_name and table_name", - &["account_id", "shard_id", "method_name", "table_name"] - ) - .unwrap(); } diff --git a/database/src/postgres/rpc_server.rs b/database/src/postgres/rpc_server.rs index 5f0bb6b6..ffe593b5 100644 --- a/database/src/postgres/rpc_server.rs +++ b/database/src/postgres/rpc_server.rs @@ -69,14 +69,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); - crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES - .with_label_values(&[ - account_id.as_ref(), - &shard_id_pool.shard_id.to_string(), - method_name, - "state_changes_data", - ]) - .inc(); let page_state = if let Some(page_state_token) = page_token { borsh::from_slice::(&hex::decode(page_state_token)?)? } else { @@ -158,14 +150,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); - crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES - .with_label_values(&[ - account_id.as_ref(), - &shard_id_pool.shard_id.to_string(), - method_name, - "state_changes_data", - ]) - .inc(); let mut items = std::collections::HashMap::new(); let mut stream = sqlx::query_as::<_, (String, Vec)>( " @@ -223,14 +207,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); - crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES - .with_label_values(&[ - account_id.as_ref(), - &shard_id_pool.shard_id.to_string(), - method_name, - "state_changes_data", - ]) - .inc(); let mut items = std::collections::HashMap::new(); let mut stream = sqlx::query_as::<_, (String, Vec)>( " @@ -288,14 +264,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_data", ]) .inc(); - crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES - .with_label_values(&[ - account_id.as_ref(), - &shard_id_pool.shard_id.to_string(), - method_name, - "state_changes_data", - ]) - .inc(); let (data_value,): (Vec,) = sqlx::query_as( " SELECT data_value @@ -329,14 +297,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_account", ]) .inc(); - crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES - .with_label_values(&[ - account_id.as_ref(), - &shard_id_pool.shard_id.to_string(), - method_name, - "state_changes_account", - ]) - .inc(); let (block_height, block_hash, data_value): (bigdecimal::BigDecimal, String, Vec) = sqlx::query_as( " @@ -374,14 +334,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_contract", ]) .inc(); - crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES - .with_label_values(&[ - account_id.as_ref(), - &shard_id_pool.shard_id.to_string(), - method_name, - "state_changes_contract", - ]) - .inc(); let (block_height, block_hash, contract_code): (bigdecimal::BigDecimal, String, Vec) = sqlx::query_as( " @@ -420,14 +372,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_access_key", ]) .inc(); - crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES - .with_label_values(&[ - account_id.as_ref(), - &shard_id_pool.shard_id.to_string(), - method_name, - "state_changes_access_key", - ]) - .inc(); let key_data = borsh::to_vec(&public_key)?; let (block_height, block_hash, data_value): (bigdecimal::BigDecimal, String, Vec) = sqlx::query_as( @@ -468,14 +412,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { "state_changes_access_key", ]) .inc(); - crate::metrics::ACCOUNTS_DATABASE_READ_QUERIES - .with_label_values(&[ - account_id.as_ref(), - &shard_id_pool.shard_id.to_string(), - method_name, - "state_changes_access_key", - ]) - .inc(); let mut access_keys = vec![]; let mut stream = sqlx::query_as::<_, (String, Vec, bigdecimal::BigDecimal)>( " From 8ba12054cd6b55a02dfa183d5763de36da9794a0 Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Tue, 10 Dec 2024 14:03:00 +0200 Subject: [PATCH 9/9] 1. update nearcore to 2.4.0 (#381) 2. release 0.3.3 --- .cargo/config.toml | 2 +- CHANGELOG.md | 6 + Cargo.lock | 814 ++++++++++++----------- Cargo.toml | 32 +- configuration/Cargo.toml | 4 +- configuration/src/configs/database.rs | 2 +- database/Cargo.toml | 4 +- database/src/postgres/rpc_server.rs | 1 + database/src/postgres/tx_indexer.rs | 30 +- logic-state-indexer/Cargo.toml | 1 - logic-state-indexer/src/lib.rs | 2 +- near-state-indexer/Cargo.toml | 1 - readnode-primitives/src/lib.rs | 5 +- rpc-server/Cargo.toml | 4 +- rpc-server/Dockerfile | 2 +- rpc-server/src/modules/blocks/methods.rs | 4 +- rpc-server/src/modules/blocks/utils.rs | 2 +- rust-toolchain | 2 +- state-indexer/Dockerfile | 2 +- tx-details-storage/Cargo.toml | 2 +- tx-indexer/Cargo.toml | 1 - tx-indexer/Dockerfile | 2 +- tx-indexer/src/collector.rs | 4 +- tx-indexer/src/storage.rs | 6 +- 24 files changed, 483 insertions(+), 452 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 59cef669..c1a03e98 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ [env] -NEARCORE_VERSION = "2.3.1" +NEARCORE_VERSION = "2.4.0" diff --git a/CHANGELOG.md b/CHANGELOG.md index 87867aef..3ebd1936 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/near/read-rpc/compare/main...develop) +## [0.3.3](https://github.com/near/read-rpc/releases/tag/v0.3.3) + +### Supported Nearcore Version +- nearcore v2.4.0 +- rust v1.82.0 + ## [0.3.2](https://github.com/near/read-rpc/releases/tag/v0.3.2) ### What's Changed diff --git a/Cargo.lock b/Cargo.lock index 99b1a049..3bdc2130 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -481,7 +481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -642,7 +642,7 @@ dependencies = [ "rust-ini", "serde", "serde-xml-rs", - "thiserror", + "thiserror 1.0.69", "time", "url", ] @@ -653,7 +653,7 @@ version = "0.25.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9aed3f9c7eac9be28662fdb3b0f4d1951e812f7c64fed4f0327ba702f459b3b" dependencies = [ - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1096,10 +1096,12 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bigdecimal" -version = "0.3.1" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" +checksum = "7f31f3af01c5c65a07985c804d3366560e6fa7883d640a122819b14ec327482c" dependencies = [ + "autocfg", + "libm", "num-bigint 0.4.6", "num-integer", "num-traits", @@ -1376,7 +1378,7 @@ dependencies = [ [[package]] name = "cache-storage" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "futures", @@ -1569,7 +1571,7 @@ dependencies = [ [[package]] name = "configuration" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "aws-credential-types", @@ -2059,7 +2061,7 @@ dependencies = [ [[package]] name = "database" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "async-trait", @@ -2069,8 +2071,8 @@ dependencies = [ "futures", "hex", "lazy_static", - "near-crypto 2.3.1", - "near-primitives 2.3.1", + "near-crypto 2.4.0", + "near-primitives 2.4.0", "prometheus", "readnode-primitives", "serde_json", @@ -2452,16 +2454,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "erased-serde" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" -dependencies = [ - "serde", - "typeid", -] - [[package]] name = "errno" version = "0.2.8" @@ -2510,6 +2502,17 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "fallible-iterator" version = "0.3.0" @@ -2557,7 +2560,7 @@ dependencies = [ "dissimilar", "num-traits", "prefix-sum-vec", - "thiserror", + "thiserror 1.0.69", "wasm-encoder 0.27.0", "wasmparser 0.105.0", "wasmprinter", @@ -2867,9 +2870,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "google-cloud-auth" -version = "0.16.0" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1112c453c2e155b3e683204ffff52bcc6d6495d04b68d9e90cd24161270c5058" +checksum = "e57a13fbacc5e9c41ded3ad8d0373175a6b7a6ad430d99e89d314ac121b7ab06" dependencies = [ "async-trait", "base64 0.21.7", @@ -2880,7 +2883,7 @@ dependencies = [ "reqwest 0.12.9", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "tracing", @@ -2894,15 +2897,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f" dependencies = [ "reqwest 0.12.9", - "thiserror", + "thiserror 1.0.69", "tokio", ] [[package]] name = "google-cloud-storage" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0c5b7469142d91bd77959e69375bede324a5def07c7f29aa0d582586cba305" +checksum = "e81dff54dbfa83705c896179ecaa4f384bfbfac90f3b637f38541443275b8a3f" dependencies = [ "anyhow", "async-stream", @@ -2924,7 +2927,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "tracing", @@ -3030,9 +3033,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown 0.14.5", ] @@ -3051,9 +3054,6 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "heck" @@ -3461,16 +3461,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "1.0.3" @@ -3585,7 +3575,7 @@ dependencies = [ "crossbeam-utils", "curl", "curl-sys", - "event-listener", + "event-listener 2.5.3", "futures-lite", "http 0.2.12", "log", @@ -3617,15 +3607,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.12" @@ -3782,9 +3763,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -3859,7 +3840,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logic-state-indexer" -version = "0.3.2" +version = "0.3.3" dependencies = [ "actix-web", "anyhow", @@ -3870,12 +3851,11 @@ dependencies = [ "futures", "hex", "humantime", - "itertools 0.13.0", "lazy_static", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-indexer-primitives", - "near-jsonrpc-client 0.14.1", - "near-primitives 2.3.1", + "near-jsonrpc-client 0.15.0", + "near-primitives 2.4.0", "prometheus", "readnode-primitives", "tokio", @@ -4152,14 +4132,14 @@ dependencies = [ [[package]] name = "near-async" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "derive_more", "futures", "near-async-derive", - "near-o11y 2.3.1", + "near-o11y 2.4.0", "near-performance-metrics", "near-time", "once_cell", @@ -4172,8 +4152,8 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "proc-macro2", "quote", @@ -4182,16 +4162,16 @@ dependencies = [ [[package]] name = "near-cache" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "lru 0.12.5", ] [[package]] name = "near-chain" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "assert_matches", @@ -4204,24 +4184,25 @@ dependencies = [ "itertools 0.10.5", "itoa", "lru 0.12.5", + "more-asserts", "near-async", "near-cache", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-chain-primitives", "near-client-primitives", - "near-crypto 2.3.1", + "near-crypto 2.4.0", "near-epoch-manager", "near-mainnet-res", "near-network", - "near-o11y 2.3.1", - "near-parameters 2.3.1", + "near-o11y 2.4.0", + "near-parameters 2.4.0", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.3.1", + "near-primitives 2.4.0", "near-schema-checker-lib", "near-store", - "near-vm-runner 2.3.1", + "near-vm-runner 2.4.0", "node-runtime", "num-rational", "once_cell", @@ -4231,10 +4212,10 @@ dependencies = [ "serde", "strum", "tempfile", - "thiserror", + "thiserror 2.0.6", "time", + "tokio", "tracing", - "yansi", ] [[package]] @@ -4262,18 +4243,18 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "anyhow", "bytesize", "chrono", "derive_more", - "near-config-utils 2.3.1", - "near-crypto 2.3.1", - "near-o11y 2.3.1", - "near-parameters 2.3.1", - "near-primitives 2.3.1", + "near-config-utils 2.4.0", + "near-crypto 2.4.0", + "near-o11y 2.4.0", + "near-parameters 2.4.0", + "near-primitives 2.4.0", "near-time", "num-rational", "serde", @@ -4286,21 +4267,21 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ - "near-crypto 2.3.1", - "near-primitives 2.3.1", + "near-crypto 2.4.0", + "near-primitives 2.4.0", "near-time", - "thiserror", + "thiserror 2.0.6", "time", "tracing", ] [[package]] name = "near-chunks" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "borsh", @@ -4311,16 +4292,16 @@ dependencies = [ "lru 0.12.5", "near-async", "near-chain", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-chunks-primitives", - "near-crypto 2.3.1", + "near-crypto 2.4.0", "near-epoch-manager", "near-network", - "near-o11y 2.3.1", + "near-o11y 2.4.0", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.3.1", + "near-primitives 2.4.0", "near-store", "rand 0.8.5", "reed-solomon-erasure 6.0.0", @@ -4331,17 +4312,17 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "near-chain-primitives", - "near-primitives 2.3.1", + "near-primitives 2.4.0", ] [[package]] name = "near-client" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "actix-rt", @@ -4358,23 +4339,23 @@ dependencies = [ "near-async", "near-cache", "near-chain", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-chain-primitives", "near-chunks", "near-client-primitives", - "near-crypto 2.3.1", + "near-crypto 2.4.0", "near-dyn-configs", "near-epoch-manager", "near-network", - "near-o11y 2.3.1", - "near-parameters 2.3.1", + "near-o11y 2.4.0", + "near-parameters 2.4.0", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.3.1", + "near-primitives 2.4.0", "near-store", "near-telemetry", - "near-vm-runner 2.3.1", + "near-vm-runner 2.4.0", "num-rational", "once_cell", "percent-encoding", @@ -4389,33 +4370,34 @@ dependencies = [ "strum", "sysinfo", "tempfile", - "thiserror", + "thiserror 2.0.6", "time", "tokio", + "tokio-stream", + "tokio-util 0.7.12", "tracing", "yansi", ] [[package]] name = "near-client-primitives" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "chrono", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-chain-primitives", "near-chunks-primitives", - "near-crypto 2.3.1", - "near-primitives 2.3.1", + "near-crypto 2.4.0", + "near-primitives 2.4.0", "near-time", "serde", "serde_json", "strum", - "thiserror", + "thiserror 2.0.6", "time", "tracing", - "yansi", ] [[package]] @@ -4426,18 +4408,18 @@ checksum = "2ae1eaab1d545a9be7a55b6ef09f365c2017f93a03063547591d12c0c6d27e58" dependencies = [ "anyhow", "json_comments", - "thiserror", + "thiserror 1.0.69", "tracing", ] [[package]] name = "near-config-utils" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "anyhow", "json_comments", - "thiserror", + "thiserror 2.0.6", "tracing", ] @@ -4465,13 +4447,13 @@ dependencies = [ "serde", "serde_json", "subtle", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "near-crypto" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "blake2 0.10.6", "borsh", @@ -4481,50 +4463,50 @@ dependencies = [ "ed25519-dalek", "hex", "near-account-id", - "near-config-utils 2.3.1", + "near-config-utils 2.4.0", "near-schema-checker-lib", - "near-stdx 2.3.1", + "near-stdx 2.4.0", "primitive-types", "rand 0.8.5", "secp256k1", "serde", "serde_json", "subtle", - "thiserror", + "thiserror 2.0.6", ] [[package]] name = "near-dyn-configs" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "anyhow", - "near-chain-configs 2.3.1", - "near-crypto 2.3.1", - "near-o11y 2.3.1", - "near-primitives 2.3.1", + "near-chain-configs 2.4.0", + "near-crypto 2.4.0", + "near-o11y 2.4.0", + "near-primitives 2.4.0", "near-time", "prometheus", "serde", "serde_json", - "thiserror", + "thiserror 2.0.6", "tokio", "tracing", ] [[package]] name = "near-epoch-manager" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "borsh", "itertools 0.10.5", "near-cache", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-chain-primitives", - "near-crypto 2.3.1", - "near-o11y 2.3.1", - "near-primitives 2.3.1", + "near-crypto 2.4.0", + "near-o11y 2.4.0", + "near-primitives 2.4.0", "near-schema-checker-lib", "near-store", "num-bigint 0.3.3", @@ -4549,29 +4531,29 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ - "near-primitives-core 2.3.1", + "near-primitives-core 2.4.0", ] [[package]] name = "near-indexer" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "anyhow", "futures", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-client", - "near-config-utils 2.3.1", - "near-crypto 2.3.1", + "near-config-utils 2.4.0", + "near-crypto 2.4.0", "near-dyn-configs", "near-indexer-primitives", - "near-o11y 2.3.1", - "near-parameters 2.3.1", - "near-primitives 2.3.1", + "near-o11y 2.4.0", + "near-parameters 2.4.0", + "near-primitives 2.4.0", "near-store", "nearcore", "node-runtime", @@ -4584,18 +4566,18 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ - "near-primitives 2.3.1", + "near-primitives 2.4.0", "serde", "serde_json", ] [[package]] name = "near-jsonrpc" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "actix-cors 0.6.5", @@ -4606,14 +4588,14 @@ dependencies = [ "futures", "hex", "near-async", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-client", "near-client-primitives", - "near-jsonrpc-client 2.3.1", - "near-jsonrpc-primitives 2.3.1", + "near-jsonrpc-client 2.4.0", + "near-jsonrpc-primitives 2.4.0", "near-network", - "near-o11y 2.3.1", - "near-primitives 2.3.1", + "near-o11y 2.4.0", + "near-primitives 2.4.0", "serde", "serde_json", "serde_with", @@ -4638,37 +4620,37 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "near-jsonrpc-client" -version = "0.14.1" -source = "git+https://github.com/kobayurii/near-jsonrpc-client-rs.git?branch=fork/0.14.1#465a11096b7dfd4a49e496ea5ec268376bbf5694" +version = "0.15.0" +source = "git+https://github.com/kobayurii/near-jsonrpc-client-rs.git?branch=fork/0.15.0#dcf9cd18b0ec1ad2595b5eb4a039eaddec1e1a8e" dependencies = [ "borsh", "lazy_static", "log", - "near-chain-configs 2.3.1", - "near-crypto 2.3.1", - "near-jsonrpc-primitives 2.3.1", - "near-primitives 2.3.1", + "near-chain-configs 2.4.0", + "near-crypto 2.4.0", + "near-jsonrpc-primitives 2.4.0", + "near-primitives 2.4.0", "reqwest 0.12.9", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "near-jsonrpc-client" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix-http", "awc", "futures", - "near-jsonrpc-primitives 2.3.1", - "near-primitives 2.3.1", + "near-jsonrpc-primitives 2.4.0", + "near-primitives 2.4.0", "serde", "serde_json", ] @@ -4686,30 +4668,30 @@ dependencies = [ "near-rpc-error-macro", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "near-jsonrpc-primitives" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "arbitrary", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-client-primitives", - "near-crypto 2.3.1", - "near-primitives 2.3.1", + "near-crypto 2.4.0", + "near-primitives 2.4.0", "near-schema-checker-lib", "serde", "serde_json", - "thiserror", + "thiserror 2.0.6", "time", ] [[package]] name = "near-lake-framework" version = "0.0.0" -source = "git+https://github.com/kobayurii/near-lake-framework-rs.git?branch=fork/0.7.12#da23d64b525b2b848d723545fe21c214602656e7" +source = "git+https://github.com/kobayurii/near-lake-framework-rs.git?branch=fork/0.7.11-fork#6b1875ab584d01523ee039a1b3d6d5d22be55b9b" dependencies = [ "anyhow", "async-stream", @@ -4725,7 +4707,7 @@ dependencies = [ "reqwest 0.12.9", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -4733,19 +4715,19 @@ dependencies = [ [[package]] name = "near-mainnet-res" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "near-account-id", - "near-chain-configs 2.3.1", - "near-primitives 2.3.1", + "near-chain-configs 2.4.0", + "near-primitives 2.4.0", "serde_json", ] [[package]] name = "near-network" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "anyhow", @@ -4764,13 +4746,13 @@ dependencies = [ "itertools 0.10.5", "lru 0.12.5", "near-async", - "near-chain-configs 2.3.1", - "near-crypto 2.3.1", - "near-fmt 2.3.1", - "near-o11y 2.3.1", + "near-chain-configs 2.4.0", + "near-crypto 2.4.0", + "near-fmt 2.4.0", + "near-o11y 2.4.0", "near-performance-metrics", "near-performance-metrics-macros", - "near-primitives 2.3.1", + "near-primitives 2.4.0", "near-schema-checker-lib", "near-store", "opentelemetry 0.22.0", @@ -4786,7 +4768,7 @@ dependencies = [ "smart-default", "strum", "stun", - "thiserror", + "thiserror 2.0.6", "time", "tokio", "tokio-stream", @@ -4814,7 +4796,7 @@ dependencies = [ "serde", "serde_json", "strum", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-appender", @@ -4824,14 +4806,14 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "base64 0.21.7", "clap", - "near-crypto 2.3.1", - "near-primitives-core 2.3.1", + "near-crypto 2.4.0", + "near-primitives-core 2.4.0", "opentelemetry 0.22.0", "opentelemetry-otlp 0.15.0", "opentelemetry-semantic-conventions 0.14.0", @@ -4839,7 +4821,7 @@ dependencies = [ "prometheus", "serde", "serde_json", - "thiserror", + "thiserror 2.0.6", "tokio", "tracing", "tracing-appender", @@ -4863,31 +4845,31 @@ dependencies = [ "serde_repr", "serde_yaml", "strum", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "near-parameters" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "borsh", "enum-map", "near-account-id", - "near-primitives-core 2.3.1", + "near-primitives-core 2.4.0", "near-schema-checker-lib", "num-rational", "serde", "serde_repr", "serde_yaml", "strum", - "thiserror", + "thiserror 2.0.6", ] [[package]] name = "near-performance-metrics" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "bitflags 1.3.2", @@ -4901,8 +4883,8 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "quote", "syn 2.0.87", @@ -4910,13 +4892,13 @@ dependencies = [ [[package]] name = "near-pool" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "borsh", - "near-crypto 2.3.1", - "near-o11y 2.3.1", - "near-primitives 2.3.1", + "near-crypto 2.4.0", + "near-o11y 2.4.0", + "near-primitives 2.4.0", "rand 0.8.5", ] @@ -4957,15 +4939,15 @@ dependencies = [ "sha3", "smart-default", "strum", - "thiserror", + "thiserror 1.0.69", "time", "tracing", ] [[package]] name = "near-primitives" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "arbitrary", "base64 0.21.7", @@ -4980,12 +4962,12 @@ dependencies = [ "enum-map", "hex", "itertools 0.10.5", - "near-crypto 2.3.1", - "near-fmt 2.3.1", - "near-parameters 2.3.1", - "near-primitives-core 2.3.1", + "near-crypto 2.4.0", + "near-fmt 2.4.0", + "near-parameters 2.4.0", + "near-primitives-core 2.4.0", "near-schema-checker-lib", - "near-stdx 2.3.1", + "near-stdx 2.4.0", "near-time", "num-rational", "ordered-float 4.5.0", @@ -4999,7 +4981,7 @@ dependencies = [ "sha3", "smart-default", "strum", - "thiserror", + "thiserror 2.0.6", "tracing", "zstd", ] @@ -5023,13 +5005,13 @@ dependencies = [ "serde_with", "sha2", "strum", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "near-primitives-core" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "arbitrary", "base64 0.21.7", @@ -5043,13 +5025,13 @@ dependencies = [ "serde", "serde_repr", "sha2", - "thiserror", + "thiserror 2.0.6", ] [[package]] name = "near-rosetta-rpc" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "actix-cors 0.6.5", @@ -5060,20 +5042,20 @@ dependencies = [ "futures", "hex", "near-account-id", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-client", "near-client-primitives", - "near-crypto 2.3.1", + "near-crypto 2.4.0", "near-network", - "near-o11y 2.3.1", - "near-parameters 2.3.1", - "near-primitives 2.3.1", + "near-o11y 2.4.0", + "near-parameters 2.4.0", + "near-primitives 2.4.0", "node-runtime", "paperclip", "serde", "serde_json", "strum", - "thiserror", + "thiserror 2.0.6", "tokio", ] @@ -5102,13 +5084,13 @@ dependencies = [ [[package]] name = "near-schema-checker-core" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" [[package]] name = "near-schema-checker-lib" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "near-schema-checker-core", "near-schema-checker-macro", @@ -5116,12 +5098,12 @@ dependencies = [ [[package]] name = "near-schema-checker-macro" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" [[package]] name = "near-state-indexer" -version = "0.3.2" +version = "0.3.3" dependencies = [ "actix", "actix-web", @@ -5132,12 +5114,11 @@ dependencies = [ "database", "futures", "logic-state-indexer", - "near-chain-configs 2.3.1", "near-client", - "near-config-utils 2.3.1", + "near-config-utils 2.4.0", "near-indexer", "near-indexer-primitives", - "near-o11y 2.3.1", + "near-o11y 2.4.0", "once_cell", "openssl-probe", "rustc_version 0.4.1", @@ -5155,13 +5136,13 @@ checksum = "855fd5540e3b4ff6fedf12aba2db1ee4b371b36f465da1363a6d022b27cb43b8" [[package]] name = "near-stdx" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" [[package]] name = "near-store" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "actix-rt", @@ -5176,16 +5157,16 @@ dependencies = [ "itertools 0.10.5", "itoa", "lru 0.12.5", - "near-chain-configs 2.3.1", - "near-crypto 2.3.1", - "near-fmt 2.3.1", - "near-o11y 2.3.1", - "near-parameters 2.3.1", - "near-primitives 2.3.1", + "near-chain-configs 2.4.0", + "near-crypto 2.4.0", + "near-fmt 2.4.0", + "near-o11y 2.4.0", + "near-parameters 2.4.0", + "near-primitives 2.4.0", "near-schema-checker-lib", - "near-stdx 2.3.1", + "near-stdx 2.4.0", "near-time", - "near-vm-runner 2.3.1", + "near-vm-runner 2.4.0", "num_cpus", "rand 0.8.5", "rayon", @@ -5197,21 +5178,21 @@ dependencies = [ "smallvec", "strum", "tempfile", - "thiserror", + "thiserror 2.0.6", "tokio", "tracing", ] [[package]] name = "near-telemetry" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "awc", "futures", "near-async", - "near-o11y 2.3.1", + "near-o11y 2.4.0", "near-performance-metrics", "near-performance-metrics-macros", "near-time", @@ -5223,8 +5204,8 @@ dependencies = [ [[package]] name = "near-time" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "serde", "time", @@ -5233,8 +5214,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "enumset", "finite-wasm", @@ -5242,15 +5223,15 @@ dependencies = [ "near-vm-vm", "rkyv", "target-lexicon 0.12.16", - "thiserror", + "thiserror 2.0.6", "tracing", "wasmparser 0.99.0", ] [[package]] name = "near-vm-compiler-singlepass" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -5269,8 +5250,8 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -5285,7 +5266,7 @@ dependencies = [ "rustc-demangle", "rustix", "target-lexicon 0.12.16", - "thiserror", + "thiserror 2.0.6", "tracing", ] @@ -5314,15 +5295,15 @@ dependencies = [ "sha2", "sha3", "strum", - "thiserror", + "thiserror 1.0.69", "tracing", "zeropool-bn", ] [[package]] name = "near-vm-runner" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "anyhow", "blst", @@ -5333,12 +5314,12 @@ dependencies = [ "finite-wasm", "lru 0.12.5", "memoffset 0.8.0", - "near-crypto 2.3.1", - "near-o11y 2.3.1", - "near-parameters 2.3.1", - "near-primitives-core 2.3.1", + "near-crypto 2.4.0", + "near-o11y 2.4.0", + "near-parameters 2.4.0", + "near-primitives-core 2.4.0", "near-schema-checker-lib", - "near-stdx 2.3.1", + "near-stdx 2.4.0", "near-vm-compiler", "near-vm-compiler-singlepass", "near-vm-engine", @@ -5359,7 +5340,7 @@ dependencies = [ "sha3", "strum", "tempfile", - "thiserror", + "thiserror 2.0.6", "tracing", "wasm-encoder 0.27.0", "wasmer-compiler-near", @@ -5377,19 +5358,19 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "indexmap 1.9.3", "num-traits", "rkyv", - "thiserror", + "thiserror 2.0.6", ] [[package]] name = "near-vm-vm" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "backtrace", "cc", @@ -5402,25 +5383,25 @@ dependencies = [ "near-vm-types", "region", "rkyv", - "thiserror", + "thiserror 2.0.6", "tracing", "winapi", ] [[package]] name = "near-wallet-contract" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "anyhow", - "near-primitives-core 2.3.1", - "near-vm-runner 2.3.1", + "near-primitives-core 2.4.0", + "near-vm-runner 2.4.0", ] [[package]] name = "nearcore" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "actix", "actix-rt", @@ -5438,29 +5419,30 @@ dependencies = [ "hyper 0.14.31", "hyper-tls 0.5.0", "indicatif", + "itertools 0.10.5", "near-async", "near-chain", - "near-chain-configs 2.3.1", + "near-chain-configs 2.4.0", "near-chunks", "near-client", "near-client-primitives", - "near-config-utils 2.3.1", - "near-crypto 2.3.1", + "near-config-utils 2.4.0", + "near-crypto 2.4.0", "near-dyn-configs", "near-epoch-manager", "near-jsonrpc", - "near-jsonrpc-primitives 2.3.1", + "near-jsonrpc-primitives 2.4.0", "near-mainnet-res", "near-network", - "near-o11y 2.3.1", - "near-parameters 2.3.1", + "near-o11y 2.4.0", + "near-parameters 2.4.0", "near-performance-metrics", "near-pool", - "near-primitives 2.3.1", + "near-primitives 2.4.0", "near-rosetta-rpc", "near-store", "near-telemetry", - "near-vm-runner 2.3.1", + "near-vm-runner 2.4.0", "node-runtime", "num-rational", "rand 0.8.5", @@ -5475,7 +5457,7 @@ dependencies = [ "smart-default", "strum", "tempfile", - "thiserror", + "thiserror 2.0.6", "tokio", "tracing", "xz2", @@ -5508,17 +5490,17 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.3.1" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.3.1-fork#78d9ff37b1351edd97dab28fe3f48e55d222b41f" +version = "2.4.0" +source = "git+https://github.com/near/nearcore?rev=27974494a5f9f2fd3e534456dbf0bbe001bff1bd#27974494a5f9f2fd3e534456dbf0bbe001bff1bd" dependencies = [ "borsh", - "near-crypto 2.3.1", - "near-o11y 2.3.1", - "near-parameters 2.3.1", - "near-primitives 2.3.1", - "near-primitives-core 2.3.1", + "near-crypto 2.4.0", + "near-o11y 2.4.0", + "near-parameters 2.4.0", + "near-primitives 2.4.0", + "near-primitives-core 2.4.0", "near-store", - "near-vm-runner 2.3.1", + "near-vm-runner 2.4.0", "near-wallet-contract", "num-bigint 0.3.3", "num-traits", @@ -5526,7 +5508,7 @@ dependencies = [ "rayon", "serde_json", "sha2", - "thiserror", + "thiserror 2.0.6", "tracing", ] @@ -5776,7 +5758,7 @@ dependencies = [ "percent-encoding", "pin-project", "rand 0.8.5", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -5802,7 +5784,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", "urlencoding", ] @@ -5834,7 +5816,7 @@ dependencies = [ "opentelemetry 0.19.0", "opentelemetry-http", "opentelemetry-semantic-conventions 0.11.0", - "thiserror", + "thiserror 1.0.69", "thrift", "tokio", ] @@ -5851,7 +5833,7 @@ dependencies = [ "http 0.2.12", "opentelemetry 0.17.0", "prost 0.9.0", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic 0.6.2", "tonic-build", @@ -5871,7 +5853,7 @@ dependencies = [ "opentelemetry-semantic-conventions 0.14.0", "opentelemetry_sdk 0.22.1", "prost 0.12.6", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic 0.11.0", ] @@ -5924,7 +5906,7 @@ dependencies = [ "indexmap 1.9.3", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", "urlencoding", ] @@ -5945,7 +5927,7 @@ dependencies = [ "opentelemetry_api", "percent-encoding", "rand 0.8.5", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -5967,7 +5949,7 @@ dependencies = [ "ordered-float 4.5.0", "percent-encoding", "rand 0.8.5", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -6053,7 +6035,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", "url", ] @@ -6088,7 +6070,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6249,7 +6231,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "perf-testing" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "chrono", @@ -6435,6 +6417,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "proc-macro2" version = "1.0.89" @@ -6456,7 +6460,7 @@ dependencies = [ "memchr", "parking_lot 0.12.3", "protobuf 2.28.0", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6549,7 +6553,7 @@ checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" dependencies = [ "once_cell", "protobuf-support", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6564,7 +6568,7 @@ dependencies = [ "protobuf-parse", "regex", "tempfile", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6579,7 +6583,7 @@ dependencies = [ "protobuf 3.7.1", "protobuf-support", "tempfile", - "thiserror", + "thiserror 1.0.69", "which", ] @@ -6589,7 +6593,7 @@ version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" dependencies = [ - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6760,10 +6764,9 @@ dependencies = [ [[package]] name = "read-rpc-server" -version = "0.3.2" +version = "0.3.3" dependencies = [ "actix-cors 0.7.0", - "actix-http", "actix-web", "anyhow", "assert-json-diff", @@ -6772,7 +6775,6 @@ dependencies = [ "chrono", "configuration", "database", - "erased-serde", "futures", "futures-locks", "hex", @@ -6780,21 +6782,21 @@ dependencies = [ "lru 0.12.5", "mimalloc", "near-async", - "near-chain-configs 2.3.1", - "near-crypto 2.3.1", + "near-chain-configs 2.4.0", + "near-crypto 2.4.0", "near-indexer-primitives", "near-jsonrpc", - "near-jsonrpc-client 0.14.1", + "near-jsonrpc-client 0.15.0", "near-lake-framework", - "near-parameters 2.3.1", - "near-primitives 2.3.1", - "near-vm-runner 2.3.1", + "near-parameters 2.4.0", + "near-primitives 2.4.0", + "near-vm-runner 2.4.0", "prometheus", "readnode-primitives", "rustc_version 0.4.1", "serde", "serde_json", - "thiserror", + "thiserror 2.0.6", "tokio", "tokio-stream", "tracing", @@ -6804,7 +6806,7 @@ dependencies = [ [[package]] name = "readnode-primitives" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "borsh", @@ -6871,7 +6873,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7070,16 +7072,16 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" +checksum = "d1ccd3b55e711f91a9885a2fa6fbbb2e39db1776420b062efc058c6410f7e5e3" dependencies = [ "anyhow", "async-trait", "http 1.1.0", "reqwest 0.12.9", "serde", - "thiserror", + "thiserror 1.0.69", "tower-service", ] @@ -7236,7 +7238,7 @@ dependencies = [ "serde-xml-rs", "serde_derive", "sha2", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "tokio-stream", @@ -7538,7 +7540,7 @@ checksum = "65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa" dependencies = [ "log", "serde", - "thiserror", + "thiserror 1.0.69", "xml-rs", ] @@ -7765,7 +7767,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint 0.4.6", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -7810,6 +7812,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "smart-default" @@ -7896,9 +7901,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" dependencies = [ "sqlx-core", "sqlx-macros", @@ -7909,11 +7914,10 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" dependencies = [ - "ahash 0.8.11", "atoi", "bigdecimal", "byteorder", @@ -7921,12 +7925,13 @@ dependencies = [ "crc", "crossbeam-queue", "either", - "event-listener", + "event-listener 5.3.1", "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.14.5", "hashlink", "hex", "indexmap 2.6.0", @@ -7941,7 +7946,7 @@ dependencies = [ "sha2", "smallvec", "sqlformat", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -7950,26 +7955,26 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.109", + "syn 2.0.87", ] [[package]] name = "sqlx-macros-core" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -7981,7 +7986,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.109", + "syn 2.0.87", "tempfile", "tokio", "url", @@ -7989,12 +7994,12 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bigdecimal", "bitflags 2.6.0", "byteorder", @@ -8025,19 +8030,19 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "tracing", "whoami", ] [[package]] name = "sqlx-postgres" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bigdecimal", "bitflags 2.6.0", "byteorder", @@ -8065,16 +8070,16 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "tracing", "whoami", ] [[package]] name = "sqlx-sqlite" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" dependencies = [ "atoi", "flume", @@ -8087,10 +8092,10 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", "tracing", "url", - "urlencoding", ] [[package]] @@ -8101,7 +8106,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state-indexer" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "clap", @@ -8109,7 +8114,7 @@ dependencies = [ "database", "futures", "logic-state-indexer", - "near-jsonrpc-client 0.14.1", + "near-jsonrpc-client 0.15.0", "near-lake-framework", "openssl-probe", "rustc_version 0.4.1", @@ -8182,7 +8187,7 @@ dependencies = [ "rand 0.8.5", "ring 0.16.20", "subtle", - "thiserror", + "thiserror 1.0.69", "tokio", "url", "webrtc-util", @@ -8336,7 +8341,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +dependencies = [ + "thiserror-impl 2.0.6", ] [[package]] @@ -8350,6 +8364,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -8758,7 +8783,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.69", "time", "tracing-subscriber", ] @@ -8881,7 +8906,7 @@ dependencies = [ "Inflector", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "time", "tracing-core", "tracing-subscriber", @@ -8916,7 +8941,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tx-details-storage" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "google-cloud-storage", @@ -8924,11 +8949,10 @@ dependencies = [ [[package]] name = "tx-indexer" -version = "0.3.2" +version = "0.3.3" dependencies = [ "actix-web", "anyhow", - "borsh", "cache-storage", "clap", "configuration", @@ -8938,7 +8962,7 @@ dependencies = [ "humantime", "lazy_static", "near-indexer-primitives", - "near-jsonrpc-client 0.14.1", + "near-jsonrpc-client 0.15.0", "near-lake-framework", "prometheus", "readnode-primitives", @@ -8950,12 +8974,6 @@ dependencies = [ "tx-details-storage", ] -[[package]] -name = "typeid" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" - [[package]] name = "typenum" version = "1.17.0" @@ -9050,7 +9068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" dependencies = [ "form_urlencoded", - "idna 1.0.3", + "idna", "percent-encoding", ] @@ -9089,11 +9107,11 @@ dependencies = [ [[package]] name = "validator" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" +checksum = "d0b4a29d8709210980a09379f27ee31549b73292c87ab9899beee1c0d3be6303" dependencies = [ - "idna 0.5.0", + "idna", "once_cell", "regex", "serde", @@ -9105,13 +9123,13 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0bcf92720c40105ac4b2dda2a4ea3aa717d4d6a862cc217da653a4bd5c6b10" +checksum = "bac855a2ce6f843beb229757e6e570a42e837bcb15e5f449dd48d5747d41bf77" dependencies = [ "darling 0.20.10", "once_cell", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.87", @@ -9288,7 +9306,7 @@ dependencies = [ "rkyv", "smallvec", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmer-types-near", "wasmer-vm-near", "wasmparser 0.78.2", @@ -9326,7 +9344,7 @@ dependencies = [ "more-asserts", "rustc-demangle", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmer-compiler-near", "wasmer-types-near", "wasmer-vm-near", @@ -9343,7 +9361,7 @@ dependencies = [ "leb128", "region", "rkyv", - "thiserror", + "thiserror 1.0.69", "wasmer-compiler-near", "wasmer-engine-near", "wasmer-types-near", @@ -9423,7 +9441,7 @@ checksum = "1ba154adffb0fbd33f5dabd3788a1744d846b43e6e090d44269c7ee8fa5743e4" dependencies = [ "indexmap 1.9.3", "rkyv", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -9441,7 +9459,7 @@ dependencies = [ "more-asserts", "region", "rkyv", - "thiserror", + "thiserror 1.0.69", "wasmer-types-near", "winapi", ] @@ -9556,7 +9574,7 @@ dependencies = [ "log", "object 0.32.2", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.115.0", "wasmtime-cranelift-shared", "wasmtime-environ", @@ -9594,7 +9612,7 @@ dependencies = [ "serde", "serde_derive", "target-lexicon 0.12.16", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.115.0", "wasmtime-types", ] @@ -9682,7 +9700,7 @@ dependencies = [ "cranelift-entity", "serde", "serde_derive", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.115.0", ] @@ -9739,7 +9757,7 @@ dependencies = [ "log", "nix 0.24.3", "rand 0.8.5", - "thiserror", + "thiserror 1.0.69", "tokio", "winapi", ] diff --git a/Cargo.toml b/Cargo.toml index 4e50cb43..4e9fff6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [workspace.package] -version = "0.3.2" +version = "0.3.3" authors = ["Near Inc "] edition = "2021" -rust-version = "1.81.0" +rust-version = "1.82.0" repository = "https://github.com/near/read-rpc" license = "MIT OR Apache-2.0" @@ -51,23 +51,23 @@ tx-details-storage = { path = "tx-details-storage" } logic-state-indexer = { path = "logic-state-indexer" } # Please, update the supported nearcore version in .cargo/config.toml file -near-async = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-indexer = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-client = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-config-utils = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-o11y = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-indexer-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-chain-configs = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-crypto = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-jsonrpc = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-parameters = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork" } -near-vm-runner = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.3.1-fork", features = [ +near-async = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-indexer = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-client = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-config-utils = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-o11y = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-primitives = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-chain-configs = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-crypto = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-jsonrpc = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-parameters = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" } +near-vm-runner = { git = "https://github.com/near/nearcore", rev = "27974494a5f9f2fd3e534456dbf0bbe001bff1bd" , features = [ "wasmer0_vm", "wasmer2_vm", "wasmtime_vm", "near_vm", ] } -near-jsonrpc-client = { git = 'https://github.com/kobayurii/near-jsonrpc-client-rs.git', branch = 'fork/0.14.1' } -near-lake-framework = { git = 'https://github.com/kobayurii/near-lake-framework-rs.git', branch = 'fork/0.7.12' } +near-jsonrpc-client = { git = 'https://github.com/kobayurii/near-jsonrpc-client-rs.git', branch = 'fork/0.15.0' } +near-lake-framework = { git = 'https://github.com/kobayurii/near-lake-framework-rs.git', branch = 'fork/0.7.11-fork' } diff --git a/configuration/Cargo.toml b/configuration/Cargo.toml index c9902522..6803c0dc 100644 --- a/configuration/Cargo.toml +++ b/configuration/Cargo.toml @@ -13,13 +13,13 @@ aws-credential-types = "1.1.4" aws-sdk-s3 = { version = "1.14.0", features = ["behavior-version-latest"] } aws-types = "1.1.4" dotenv = "0.15.0" -google-cloud-storage = "0.20.0" +google-cloud-storage = "0.23.0" lazy_static = "1.4.0" regex = "1.10.2" serde = "1.0.145" serde_derive = "1.0.145" serde_json = "1.0.108" -validator = { version = "0.18.1", features = ["derive"] } +validator = { version = "0.19.0", features = ["derive"] } opentelemetry = { version = "0.19", features = ["rt-tokio-current-thread"] } opentelemetry-jaeger = { version = "0.18", features = [ "rt-tokio-current-thread", diff --git a/configuration/src/configs/database.rs b/configuration/src/configs/database.rs index 054383ad..7196ce68 100644 --- a/configuration/src/configs/database.rs +++ b/configuration/src/configs/database.rs @@ -70,7 +70,7 @@ impl From for DatabaseConfig { shards_config: database_config .shards .into_iter() - .map(|shard| (shard.shard_id, shard.database_url)) + .map(|shard| (shard.shard_id.into(), shard.database_url)) .collect(), max_connections: database_config .max_connections diff --git a/database/Cargo.toml b/database/Cargo.toml index d2880176..5e88c08b 100644 --- a/database/Cargo.toml +++ b/database/Cargo.toml @@ -12,14 +12,14 @@ license.workspace = true [dependencies] anyhow = "1.0.86" async-trait = "0.1.66" -bigdecimal = "0.3.0" # Dependency of sqlx-core and sqlx-postgres is version 0.3.0 +bigdecimal = "0.4.7" borsh = "1.5.1" futures = "0.3.5" hex = "0.4.3" lazy_static = "1.4.0" prometheus = "0.13.4" serde_json = "1.0.117" -sqlx = { version = "0.7.1", features = [ +sqlx = { version = "0.8.2", features = [ "runtime-tokio-native-tls", "postgres", "migrate", diff --git a/database/src/postgres/rpc_server.rs b/database/src/postgres/rpc_server.rs index ffe593b5..65975b12 100644 --- a/database/src/postgres/rpc_server.rs +++ b/database/src/postgres/rpc_server.rs @@ -520,6 +520,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager { crate::metrics::META_DATABASE_READ_QUERIES .with_label_values(&[method_name, "chunks_duplicate"]) .inc(); + let shard_id: u64 = shard_id.into(); let result: (bigdecimal::BigDecimal, bigdecimal::BigDecimal) = sqlx::query_as( " SELECT included_in_block_height, shard_id diff --git a/database/src/postgres/tx_indexer.rs b/database/src/postgres/tx_indexer.rs index dca069f2..720c3dc1 100644 --- a/database/src/postgres/tx_indexer.rs +++ b/database/src/postgres/tx_indexer.rs @@ -17,21 +17,26 @@ impl crate::TxIndexerDbManager for crate::PostgresDBManager { "INSERT INTO receipts_map (receipt_id, parent_transaction_hash, receiver_id, block_height, block_hash, shard_id) ", ); query_builder.push_values(receipts.iter(), |mut values, receipt| { + let shard_id: u64 = receipt.shard_id.into(); values .push_bind(receipt.receipt_id.to_string()) .push_bind(receipt.parent_transaction_hash.to_string()) .push_bind(receipt.receiver_id.to_string()) .push_bind(bigdecimal::BigDecimal::from(receipt.block_height)) .push_bind(receipt.block_hash.to_string()) - .push_bind(bigdecimal::BigDecimal::from(receipt.shard_id)); + .push_bind(bigdecimal::BigDecimal::from(shard_id)); }); query_builder.push(" ON CONFLICT DO NOTHING;"); query_builder .build() - .execute(self.shards_pool.get(&shard_id).ok_or(anyhow::anyhow!( - "Database connection for Shard_{} not found", - shard_id - ))?) + .execute( + self.shards_pool + .get(&shard_id.into()) + .ok_or(anyhow::anyhow!( + "Database connection for Shard_{} not found", + shard_id + ))?, + ) .await?; Ok(()) } @@ -51,21 +56,26 @@ impl crate::TxIndexerDbManager for crate::PostgresDBManager { "INSERT INTO outcomes_map (outcome_id, parent_transaction_hash, receiver_id, block_height, block_hash, shard_id) ", ); query_builder.push_values(outcomes.iter(), |mut values, outcome| { + let shard_id: u64 = outcome.shard_id.into(); values .push_bind(outcome.outcome_id.to_string()) .push_bind(outcome.parent_transaction_hash.to_string()) .push_bind(outcome.receiver_id.to_string()) .push_bind(bigdecimal::BigDecimal::from(outcome.block_height)) .push_bind(outcome.block_hash.to_string()) - .push_bind(bigdecimal::BigDecimal::from(outcome.shard_id)); + .push_bind(bigdecimal::BigDecimal::from(shard_id)); }); query_builder.push(" ON CONFLICT DO NOTHING;"); query_builder .build() - .execute(self.shards_pool.get(&shard_id).ok_or(anyhow::anyhow!( - "Database connection for Shard_{} not found", - shard_id - ))?) + .execute( + self.shards_pool + .get(&shard_id.into()) + .ok_or(anyhow::anyhow!( + "Database connection for Shard_{} not found", + shard_id + ))?, + ) .await?; Ok(()) } diff --git a/logic-state-indexer/Cargo.toml b/logic-state-indexer/Cargo.toml index 7406f91c..92397f54 100644 --- a/logic-state-indexer/Cargo.toml +++ b/logic-state-indexer/Cargo.toml @@ -14,7 +14,6 @@ borsh = "1.3.1" clap = { version = "4.5.16", features = ["derive"] } futures = "0.3.5" hex = "0.4.3" -itertools = "0.13.0" humantime = "2.1.0" lazy_static = "1.4.0" prometheus = "0.13.1" diff --git a/logic-state-indexer/src/lib.rs b/logic-state-indexer/src/lib.rs index 6f089942..71f31897 100644 --- a/logic-state-indexer/src/lib.rs +++ b/logic-state-indexer/src/lib.rs @@ -223,7 +223,7 @@ pub async fn handle_streamer_message( .map(|chunk| { ( chunk.chunk_hash.to_string(), - chunk.shard_id, + chunk.shard_id.into(), chunk.height_included, ) }) diff --git a/near-state-indexer/Cargo.toml b/near-state-indexer/Cargo.toml index f6160c94..700d3360 100644 --- a/near-state-indexer/Cargo.toml +++ b/near-state-indexer/Cargo.toml @@ -35,7 +35,6 @@ database.workspace = true logic-state-indexer.workspace = true near-o11y.workspace = true -near-chain-configs.workspace = true near-client.workspace = true near-config-utils.workspace = true near-indexer.workspace = true diff --git a/readnode-primitives/src/lib.rs b/readnode-primitives/src/lib.rs index fa52d150..dcb003b6 100644 --- a/readnode-primitives/src/lib.rs +++ b/readnode-primitives/src/lib.rs @@ -355,10 +355,11 @@ where let block_hash = CryptoHash::from_str(&value.4).map_err(|err| { anyhow::anyhow!("Failed to parse `block_hash` to CryptoHash: {}", err) })?; - let shard_id = value + let shard_id: near_indexer_primitives::types::ShardId = value .5 .to_u64() - .ok_or_else(|| anyhow::anyhow!("Failed to parse `shard_id` to u64"))?; + .ok_or_else(|| anyhow::anyhow!("Failed to parse `shard_id` to u64"))? + .into(); Ok(ReceiptRecord { receipt_id, diff --git a/rpc-server/Cargo.toml b/rpc-server/Cargo.toml index 2f6b29bf..c1624bf9 100644 --- a/rpc-server/Cargo.toml +++ b/rpc-server/Cargo.toml @@ -12,14 +12,12 @@ anyhow = "1.0.51" rustc_version = "0.4" [dependencies] -actix-http = "3.6.0" actix-web = "4.5.1" actix-cors = "0.7.0" anyhow = "1.0.70" assert-json-diff = { version = "2.0.2", optional = true } borsh = "1.3.1" chrono = "0.4.19" -erased-serde = "0.4.2" futures = "0.3.24" futures-locks = "0.7.1" hex = "0.4.3" @@ -29,7 +27,7 @@ mimalloc = { version = "0.1.41", default-features = false } prometheus = "0.13.1" serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.85" -thiserror = "1.0.40" +thiserror = "2.0.6" tokio = { version = "1.36.0", features = ["full", "tracing"] } tokio-stream = { version = "0.1.12" } tracing = { version = "0.1.36", features = ["std"] } diff --git a/rpc-server/Dockerfile b/rpc-server/Dockerfile index 30a9d91f..e57bb43b 100644 --- a/rpc-server/Dockerfile +++ b/rpc-server/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.81 AS builder +FROM rust:1.82 AS builder ARG features="default" ARG profile="release" WORKDIR /tmp/ diff --git a/rpc-server/src/modules/blocks/methods.rs b/rpc-server/src/modules/blocks/methods.rs index ef3fc0b7..5a7a5dfb 100644 --- a/rpc-server/src/modules/blocks/methods.rs +++ b/rpc-server/src/modules/blocks/methods.rs @@ -470,7 +470,7 @@ pub async fn fetch_chunk( { (block_height_shard_id.0, block_height_shard_id.1) } else { - (block_height, shard_id) + (block_height, shard_id.into()) } } near_jsonrpc::primitives::types::chunks::ChunkReference::ChunkHash { chunk_id } => data @@ -488,7 +488,7 @@ pub async fn fetch_chunk( &data.s3_client, &data.s3_bucket_name, block_height, - shard_id, + shard_id.into(), ) .await?; // increase block category metrics diff --git a/rpc-server/src/modules/blocks/utils.rs b/rpc-server/src/modules/blocks/utils.rs index d2358100..254acc7d 100644 --- a/rpc-server/src/modules/blocks/utils.rs +++ b/rpc-server/src/modules/blocks/utils.rs @@ -61,7 +61,7 @@ pub async fn fetch_chunk_from_s3( s3_client, s3_bucket_name, block_height, - shard_id, + shard_id.into(), ) .await { diff --git a/rust-toolchain b/rust-toolchain index dbd41264..71fae54f 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.81.0 +1.82.0 diff --git a/state-indexer/Dockerfile b/state-indexer/Dockerfile index b1a9b4a3..45dabb31 100644 --- a/state-indexer/Dockerfile +++ b/state-indexer/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.81 AS builder +FROM rust:1.82 AS builder ARG features="default" ARG profile="release" WORKDIR /tmp/ diff --git a/tx-details-storage/Cargo.toml b/tx-details-storage/Cargo.toml index 89bf52f3..e2251ec3 100644 --- a/tx-details-storage/Cargo.toml +++ b/tx-details-storage/Cargo.toml @@ -11,4 +11,4 @@ license.workspace = true [dependencies] anyhow = "1.0.70" -google-cloud-storage = "0.20.0" +google-cloud-storage = "0.23.0" diff --git a/tx-indexer/Cargo.toml b/tx-indexer/Cargo.toml index 5e59bfaf..4a4681ea 100644 --- a/tx-indexer/Cargo.toml +++ b/tx-indexer/Cargo.toml @@ -14,7 +14,6 @@ rustc_version = "0.4" [dependencies] actix-web = "4.5.1" anyhow = "1.0.70" -borsh = "1.3.1" clap = { version = "4.5.16", features = ["derive"] } futures = "0.3.5" futures-locks = "0.7.1" diff --git a/tx-indexer/Dockerfile b/tx-indexer/Dockerfile index 0e686afd..7b4a307d 100644 --- a/tx-indexer/Dockerfile +++ b/tx-indexer/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.81 AS builder +FROM rust:1.82 AS builder ARG features="default" ARG profile="release" WORKDIR /tmp/ diff --git a/tx-indexer/src/collector.rs b/tx-indexer/src/collector.rs index 52f1058f..cb139f49 100644 --- a/tx-indexer/src/collector.rs +++ b/tx-indexer/src/collector.rs @@ -241,7 +241,7 @@ async fn extract_transactions_to_collect( new_transaction_details_to_collecting_pool( tx, block, - shard_id, + shard_id.into(), tx_collecting_storage, indexer_config, ) @@ -347,7 +347,7 @@ async fn process_shard( process_receipt_execution_outcome( tx_collecting_storage, block, - shard.shard_id, + shard.shard_id.into(), receipt_execution_outcome, ) }); diff --git a/tx-indexer/src/storage.rs b/tx-indexer/src/storage.rs index 0703aae4..0aa7da96 100644 --- a/tx-indexer/src/storage.rs +++ b/tx-indexer/src/storage.rs @@ -430,7 +430,7 @@ impl CacheStorage { receiver_id: receiver_id.clone(), block_height: block.height, block_hash: block.hash, - shard_id, + shard_id: shard_id.into(), }; let outcome_record = readnode_primitives::OutcomeRecord { outcome_id: *outcome_id, @@ -438,12 +438,12 @@ impl CacheStorage { receiver_id: receiver_id.clone(), block_height: block.height, block_hash: block.hash, - shard_id, + shard_id: shard_id.into(), }; self.outcomes_and_receipts_to_save .write() .await - .entry(database_shard_id) + .entry(database_shard_id.into()) .and_modify(|receipts_and_outcomes| { receipts_and_outcomes .receipts