diff --git a/.cargo/config.toml b/.cargo/config.toml index 05c7997b..4aa5392b 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ [env] -NEARCORE_VERSION = "2.0.0" +NEARCORE_VERSION = "2.1.1" diff --git a/CHANGELOG.md b/CHANGELOG.md index 39dd6f9d..e7e58274 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,16 @@ 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.2.13](https://github.com/near/read-rpc/releases/tag/v0.2.13) +### Supported Nearcore Version +- nearcore v2.1.1 +- rust v1.79.0 + +### What's Changed +* Update `nearcore` to v2.1.1 +* Update rust version to v1.79.0 + + ## [0.2.12](https://github.com/near/read-rpc/releases/tag/v0.2.12) ### Supported Nearcore Version - nearcore v2.0.0 diff --git a/Cargo.lock b/Cargo.lock index 70b93c39..ef9c35e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,9 +86,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" +checksum = "d48f96fc3003717aeb9856ca3d02a8c7de502667ad76eeacd830b48d2e91fac4" dependencies = [ "actix-codec", "actix-rt", @@ -130,7 +130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.8.0" +version = "4.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" +checksum = "9180d76e5cc7ccbc4d60a506f2c727730b154010262df5b910eb17dbe4b8cb38" dependencies = [ "actix-codec", "actix-http", @@ -242,6 +242,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", + "impl-more", "itoa", "language-tags", "log", @@ -268,7 +269,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -279,7 +280,7 @@ checksum = "7c7db3d5a9718568e4cf4a537cfd7070e6e6ff7481510d0237fb529ac850f6d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -306,6 +307,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.7.8" @@ -503,7 +510,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -514,7 +521,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -547,9 +554,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "awc" -version = "3.5.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6b67e44fb95d1dc9467e3930383e115f9b4ed60ca689db41409284e967a12d" +checksum = "79049b2461279b886e46f1107efc347ebecc7b88d74d023dda010551a124967b" dependencies = [ "actix-codec", "actix-http", @@ -581,9 +588,9 @@ dependencies = [ [[package]] name = "aws-config" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf6cfe2881cb1fcbba9ae946fb9a6480d3b7a714ca84c74925014a89ef3387a" +checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697" dependencies = [ "aws-credential-types", "aws-runtime", @@ -598,10 +605,9 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "hex", "http 0.2.12", - "hyper 0.14.30", "ring 0.17.8", "time", "tokio", @@ -649,9 +655,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c5f920ffd1e0526ec9e70e50bf444db50b204395a0fa7016bbf9e31ea1698f" +checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -662,9 +668,10 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "http 0.2.12", "http-body 0.4.6", + "once_cell", "percent-encoding", "pin-project-lite", "tracing", @@ -673,9 +680,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.42.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558bbcec8db82a1a8af1610afcb3b10d00652d25ad366a0558eecdff2400a1d1" +checksum = "4abf69a87be33b6f125a93d5046b5f7395c26d1f449bf8d3927f5577463b6de0" dependencies = [ "ahash 0.8.11", "aws-credential-types", @@ -692,7 +699,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "hex", "hmac", "http 0.2.12", @@ -708,9 +715,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.36.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6acca681c53374bf1d9af0e317a41d12a44902ca0f2d1e10e5cb5bb98ed74f35" +checksum = "11822090cf501c316c6f75711d77b96fba30658e3867a7762e5e2f5d32d31e81" dependencies = [ "aws-credential-types", "aws-runtime", @@ -730,9 +737,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79c6bdfe612503a526059c05c9ccccbf6bd9530b003673cb863e547fd7c0c9a" +checksum = "78a2a06ff89176123945d1bbe865603c4d7101bea216a550bb4d2e4e9ba74d74" dependencies = [ "aws-credential-types", "aws-runtime", @@ -752,9 +759,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.36.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e6ecdb2bd756f3b2383e6f0588dc10a4e65f5d551e70a56e0bfe0c884673ce" +checksum = "a20a91795850826a6f456f4a48eff1dfa59a0e69bdbf5b8c50518fd372106574" dependencies = [ "aws-credential-types", "aws-runtime", @@ -815,9 +822,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.60.11" +version = "0.60.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c4134cf3adaeacff34d588dbe814200357b0c466d730cf1c0d8054384a2de4" +checksum = "598b1689d001c4d4dc3cb386adb07d37786783aee3ac4b324bcadac116bf3d23" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -887,16 +894,16 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.6.2" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce87155eba55e11768b8c1afa607f3e864ae82f03caf63258b37455b0ad02537" +checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", @@ -914,9 +921,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30819352ed0a04ecf6a2f3477e344d2d1ba33d43e0f09ad9047c12e0d923616f" +checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -931,9 +938,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" +checksum = "6cee7cadb433c781d3299b916fbf620fea813bf38f49db282fb6858141a05cc8" dependencies = [ "base64-simd", "bytes", @@ -1033,7 +1040,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object 0.36.3", "rustc-demangle", ] @@ -1124,7 +1131,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -1214,6 +1221,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "blst" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874" +dependencies = [ + "cc", + "glob", + "threadpool", + "zeroize", +] + [[package]] name = "borsh" version = "0.9.3" @@ -1257,7 +1276,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "syn_derive", ] @@ -1407,12 +1426,13 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.1.8" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" +checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -1479,9 +1499,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.13" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -1489,9 +1509,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.13" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -1508,7 +1528,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -1580,7 +1600,7 @@ dependencies = [ [[package]] name = "configuration" -version = "0.2.12" +version = "0.2.13" dependencies = [ "anyhow", "aws-credential-types", @@ -1658,9 +1678,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpp_demangle" @@ -1673,9 +1693,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -2002,7 +2022,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2050,7 +2070,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2072,7 +2092,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2090,7 +2110,7 @@ dependencies = [ [[package]] name = "database" -version = "0.2.12" +version = "0.2.13" dependencies = [ "anyhow", "async-trait", @@ -2104,10 +2124,10 @@ dependencies = [ "futures", "hex", "lazy_static", - "near-chain-configs 2.0.0", - "near-crypto 2.0.0", + "near-chain-configs 2.1.1", + "near-crypto 2.1.1", "near-indexer-primitives", - "near-primitives 2.0.0", + "near-primitives 2.1.1", "num-bigint 0.4.6", "num-traits", "prettytable-rs", @@ -2189,7 +2209,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2200,7 +2220,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2244,7 +2264,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.0", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2289,7 +2309,7 @@ dependencies = [ "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2309,7 +2329,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" dependencies = [ - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2557,7 +2577,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2578,21 +2598,21 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "epoch-indexer" -version = "0.2.12" +version = "0.2.13" dependencies = [ "anyhow", "clap", "configuration", "database", "futures", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-indexer-primitives", - "near-jsonrpc-client 0.11.0", + "near-jsonrpc-client 0.12.0", "near-lake-framework", "readnode-primitives", "tokio", @@ -2684,9 +2704,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -2737,12 +2757,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -2873,7 +2893,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2978,7 +2998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator 0.3.0", - "indexmap 2.3.0", + "indexmap 2.4.0", "stable_deref_trait", ] @@ -3006,7 +3026,7 @@ dependencies = [ "google-cloud-token", "home", "jsonwebtoken 9.3.0", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde", "serde_json", "thiserror", @@ -3022,7 +3042,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f" dependencies = [ - "reqwest 0.12.5", + "reqwest 0.12.7", "thiserror", "tokio", ] @@ -3047,7 +3067,7 @@ dependencies = [ "percent-encoding", "pkcs8 0.10.2", "regex", - "reqwest 0.12.5", + "reqwest 0.12.7", "reqwest-middleware", "ring 0.17.8", "serde", @@ -3092,7 +3112,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.3.0", + "indexmap 2.4.0", "slab", "tokio", "tokio-util 0.7.11", @@ -3101,9 +3121,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -3111,7 +3131,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.3.0", + "indexmap 2.4.0", "slab", "tokio", "tokio-util 0.7.11", @@ -3182,6 +3202,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -3322,7 +3348,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -3499,9 +3525,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -3544,11 +3570,11 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -3628,9 +3654,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -3724,9 +3750,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" @@ -3783,9 +3809,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -3930,7 +3956,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -4080,13 +4106,22 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", @@ -4140,14 +4175,14 @@ dependencies = [ [[package]] name = "near-async" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "derive_more", "futures", "near-async-derive", - "near-o11y 2.0.0", + "near-o11y 2.1.1", "near-performance-metrics", "near-time", "once_cell", @@ -4160,26 +4195,26 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "near-cache" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ - "lru 0.7.8", + "lru 0.12.4", ] [[package]] name = "near-chain" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "assert_matches", @@ -4191,24 +4226,24 @@ dependencies = [ "enum-map", "itertools 0.10.5", "itoa", - "lru 0.7.8", + "lru 0.12.4", "near-async", "near-cache", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-chain-primitives", "near-client-primitives", - "near-crypto 2.0.0", + "near-crypto 2.1.1", "near-epoch-manager", "near-mainnet-res", "near-network", - "near-o11y 2.0.0", - "near-parameters 2.0.0", + "near-o11y 2.1.1", + "near-parameters 2.1.1", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.0.0", + "near-primitives 2.1.1", "near-store", - "near-vm-runner 2.0.0", + "near-vm-runner 2.1.1", "node-runtime", "num-rational", "once_cell", @@ -4248,19 +4283,19 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "anyhow", "bytesize", "chrono", "derive_more", - "near-async", - "near-config-utils 2.0.0", - "near-crypto 2.0.0", - "near-o11y 2.0.0", - "near-parameters 2.0.0", - "near-primitives 2.0.0", + "near-config-utils 2.1.1", + "near-crypto 2.1.1", + "near-o11y 2.1.1", + "near-parameters 2.1.1", + "near-primitives 2.1.1", + "near-time", "num-rational", "once_cell", "serde", @@ -4273,12 +4308,12 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ - "near-async", - "near-crypto 2.0.0", - "near-primitives 2.0.0", + "near-crypto 2.1.1", + "near-primitives 2.1.1", + "near-time", "thiserror", "time", "tracing", @@ -4286,8 +4321,8 @@ dependencies = [ [[package]] name = "near-chunks" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "borsh 1.5.1", @@ -4295,19 +4330,19 @@ dependencies = [ "derive_more", "futures", "itertools 0.10.5", - "lru 0.7.8", + "lru 0.12.4", "near-async", "near-chain", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-chunks-primitives", - "near-crypto 2.0.0", + "near-crypto 2.1.1", "near-epoch-manager", "near-network", - "near-o11y 2.0.0", + "near-o11y 2.1.1", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.0.0", + "near-primitives 2.1.1", "near-store", "once_cell", "rand 0.8.5", @@ -4319,17 +4354,17 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "near-chain-primitives", - "near-primitives 2.0.0", + "near-primitives 2.1.1", ] [[package]] name = "near-client" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "actix-rt", @@ -4342,27 +4377,27 @@ dependencies = [ "derive_more", "futures", "itertools 0.10.5", - "lru 0.7.8", + "lru 0.12.4", "near-async", "near-cache", "near-chain", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-chain-primitives", "near-chunks", "near-client-primitives", - "near-crypto 2.0.0", + "near-crypto 2.1.1", "near-dyn-configs", "near-epoch-manager", "near-network", - "near-o11y 2.0.0", - "near-parameters 2.0.0", + "near-o11y 2.1.1", + "near-parameters 2.1.1", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.0.0", + "near-primitives 2.1.1", "near-store", "near-telemetry", - "near-vm-runner 2.0.0", + "near-vm-runner 2.1.1", "num-rational", "once_cell", "percent-encoding", @@ -4386,17 +4421,17 @@ dependencies = [ [[package]] name = "near-client-primitives" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "chrono", - "near-async", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-chain-primitives", "near-chunks-primitives", - "near-crypto 2.0.0", - "near-primitives 2.0.0", + "near-crypto 2.1.1", + "near-primitives 2.1.1", + "near-time", "serde", "serde_json", "strum 0.24.1", @@ -4420,8 +4455,8 @@ dependencies = [ [[package]] name = "near-config-utils" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "anyhow", "json_comments", @@ -4458,8 +4493,8 @@ dependencies = [ [[package]] name = "near-crypto" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "blake2 0.10.6", "borsh 1.5.1", @@ -4469,10 +4504,11 @@ dependencies = [ "ed25519-dalek", "hex", "near-account-id", - "near-config-utils 2.0.0", - "near-stdx 2.0.0", + "near-config-utils 2.1.1", + "near-stdx 2.1.1", "once_cell", "primitive-types", + "rand 0.8.5", "secp256k1", "serde", "serde_json", @@ -4482,15 +4518,15 @@ dependencies = [ [[package]] name = "near-dyn-configs" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "anyhow", - "near-async", - "near-chain-configs 2.0.0", - "near-crypto 2.0.0", - "near-o11y 2.0.0", - "near-primitives 2.0.0", + "near-chain-configs 2.1.1", + "near-crypto 2.1.1", + "near-o11y 2.1.1", + "near-primitives 2.1.1", + "near-time", "once_cell", "prometheus", "serde", @@ -4502,17 +4538,17 @@ dependencies = [ [[package]] name = "near-epoch-manager" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "borsh 1.5.1", "itertools 0.10.5", "near-cache", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-chain-primitives", - "near-crypto 2.0.0", - "near-o11y 2.0.0", - "near-primitives 2.0.0", + "near-crypto 2.1.1", + "near-o11y 2.1.1", + "near-primitives 2.1.1", "near-store", "num-rational", "once_cell", @@ -4535,29 +4571,29 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ - "near-primitives-core 2.0.0", + "near-primitives-core 2.1.1", ] [[package]] name = "near-indexer" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "anyhow", "futures", "lazy_static", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-client", - "near-crypto 2.0.0", + "near-crypto 2.1.1", "near-dyn-configs", "near-indexer-primitives", - "near-o11y 2.0.0", - "near-parameters 2.0.0", - "near-primitives 2.0.0", + "near-o11y 2.1.1", + "near-parameters 2.1.1", + "near-primitives 2.1.1", "near-store", "nearcore", "node-runtime", @@ -4571,18 +4607,18 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ - "near-primitives 2.0.0", + "near-primitives 2.1.1", "serde", "serde_json", ] [[package]] name = "near-jsonrpc" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "actix-cors 0.6.5", @@ -4593,15 +4629,15 @@ dependencies = [ "futures", "hex", "near-async", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-client", "near-client-primitives", - "near-jsonrpc-client 2.0.0", - "near-jsonrpc-primitives 2.0.0", + "near-jsonrpc-client 2.1.1", + "near-jsonrpc-primitives 2.1.1", "near-network", - "near-o11y 2.0.0", - "near-primitives 2.0.0", - "near-rpc-error-macro 2.0.0", + "near-o11y 2.1.1", + "near-primitives 2.1.1", + "near-rpc-error-macro 2.1.1", "once_cell", "serde", "serde_json", @@ -4632,17 +4668,17 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "0.11.0" -source = "git+https://github.com/kobayurii/near-jsonrpc-client-rs.git?branch=0.11.1#b15d46d85cf16ff7191dd32fef51e1b5414a4ab8" +version = "0.12.0" +source = "git+https://github.com/kobayurii/near-jsonrpc-client-rs.git?branch=0.12.1#988fd4fa2447ecb827f8a0ac2c06da3ef68b8ca5" dependencies = [ "borsh 1.5.1", "lazy_static", "log", - "near-chain-configs 2.0.0", - "near-crypto 2.0.0", - "near-jsonrpc-primitives 2.0.0", - "near-primitives 2.0.0", - "reqwest 0.12.5", + "near-chain-configs 2.1.1", + "near-crypto 2.1.1", + "near-jsonrpc-primitives 2.1.1", + "near-primitives 2.1.1", + "reqwest 0.12.7", "serde", "serde_json", "thiserror", @@ -4650,14 +4686,14 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix-http", "awc", "futures", - "near-jsonrpc-primitives 2.0.0", - "near-primitives 2.0.0", + "near-jsonrpc-primitives 2.1.1", + "near-primitives 2.1.1", "serde", "serde_json", ] @@ -4680,15 +4716,15 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "arbitrary", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-client-primitives", - "near-crypto 2.0.0", - "near-primitives 2.0.0", - "near-rpc-error-macro 2.0.0", + "near-crypto 2.1.1", + "near-primitives 2.1.1", + "near-rpc-error-macro 2.1.1", "serde", "serde_json", "thiserror", @@ -4698,7 +4734,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.16#51d47b24f033f8d426517b8be3603d1545eb1041" +source = "git+https://github.com/kobayurii/near-lake-framework-rs.git?branch=0.7.17#a8e0d038201093da7f416e22a60533f5ab00f53f" dependencies = [ "anyhow", "async-stream", @@ -4721,19 +4757,19 @@ dependencies = [ [[package]] name = "near-mainnet-res" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "near-account-id", - "near-chain-configs 2.0.0", - "near-primitives 2.0.0", + "near-chain-configs 2.1.1", + "near-primitives 2.1.1", "serde_json", ] [[package]] name = "near-network" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "anyhow", @@ -4745,25 +4781,26 @@ dependencies = [ "chrono", "crossbeam-channel", "derive_more", + "enum-map", "futures", "futures-util", "im", "itertools 0.10.5", - "lru 0.7.8", + "lru 0.12.4", "near-async", - "near-chain-configs 2.0.0", - "near-crypto 2.0.0", - "near-fmt 2.0.0", - "near-o11y 2.0.0", + "near-chain-configs 2.1.1", + "near-crypto 2.1.1", + "near-fmt 2.1.1", + "near-o11y 2.1.1", "near-performance-metrics", "near-performance-metrics-macros", - "near-primitives 2.0.0", + "near-primitives 2.1.1", "near-store", "once_cell", "opentelemetry 0.22.0", "parking_lot 0.12.3", "pin-project", - "protobuf 3.5.0", + "protobuf 3.5.1", "protobuf-codegen", "rand 0.8.5", "rayon", @@ -4811,14 +4848,14 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "base64 0.21.7", "clap", - "near-crypto 2.0.0", - "near-primitives-core 2.0.0", + "near-crypto 2.1.1", + "near-primitives-core 2.1.1", "once_cell", "opentelemetry 0.22.0", "opentelemetry-otlp 0.15.0", @@ -4856,13 +4893,13 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "borsh 1.5.1", "enum-map", "near-account-id", - "near-primitives-core 2.0.0", + "near-primitives-core 2.1.1", "num-rational", "serde", "serde_repr", @@ -4873,8 +4910,8 @@ dependencies = [ [[package]] name = "near-performance-metrics" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "bitflags 1.3.2", @@ -4889,22 +4926,22 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "near-pool" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "borsh 1.5.1", - "near-crypto 2.0.0", - "near-o11y 2.0.0", - "near-primitives 2.0.0", + "near-crypto 2.1.1", + "near-o11y 2.1.1", + "near-primitives 2.1.1", "once_cell", "rand 0.8.5", ] @@ -4953,8 +4990,8 @@ dependencies = [ [[package]] name = "near-primitives" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "arbitrary", "base64 0.21.7", @@ -4965,16 +5002,17 @@ dependencies = [ "chrono", "derive_more", "easy-ext", + "enum-map", "hex", "itertools 0.10.5", - "near-crypto 2.0.0", - "near-fmt 2.0.0", - "near-parameters 2.0.0", - "near-primitives-core 2.0.0", - "near-rpc-error-macro 2.0.0", - "near-stdx 2.0.0", + "near-crypto 2.1.1", + "near-fmt 2.1.1", + "near-parameters 2.1.1", + "near-primitives-core 2.1.1", + "near-rpc-error-macro 2.1.1", + "near-stdx 2.1.1", + "near-structs-checker-lib", "near-time", - "near-vm-runner 2.0.0", "num-rational", "once_cell", "ordered-float 4.2.2", @@ -5017,8 +5055,8 @@ dependencies = [ [[package]] name = "near-primitives-core" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "arbitrary", "base64 0.21.7", @@ -5027,6 +5065,7 @@ dependencies = [ "derive_more", "enum-map", "near-account-id", + "near-structs-checker-lib", "num-rational", "serde", "serde_repr", @@ -5036,8 +5075,8 @@ dependencies = [ [[package]] name = "near-rosetta-rpc" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "actix-cors 0.6.5", @@ -5048,14 +5087,14 @@ dependencies = [ "futures", "hex", "near-account-id", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-client", "near-client-primitives", - "near-crypto 2.0.0", + "near-crypto 2.1.1", "near-network", - "near-o11y 2.0.0", - "near-parameters 2.0.0", - "near-primitives 2.0.0", + "near-o11y 2.1.1", + "near-parameters 2.1.1", + "near-primitives 2.1.1", "node-runtime", "paperclip", "serde", @@ -5073,17 +5112,17 @@ checksum = "80fca203c51edd9595ec14db1d13359fb9ede32314990bf296b6c5c4502f6ab7" dependencies = [ "quote", "serde", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "near-rpc-error-core" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "quote", "serde", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -5095,22 +5134,22 @@ dependencies = [ "fs2", "near-rpc-error-core 0.20.1", "serde", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "near-rpc-error-macro" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ - "near-rpc-error-core 2.0.0", + "near-rpc-error-core 2.1.1", "serde", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "near-state-indexer" -version = "0.2.12" +version = "0.2.13" dependencies = [ "actix", "actix-web", @@ -5122,10 +5161,10 @@ dependencies = [ "futures", "hex", "humantime", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-client", "near-indexer", - "near-o11y 2.0.0", + "near-o11y 2.1.1", "once_cell", "openssl-probe", "redis", @@ -5144,13 +5183,13 @@ checksum = "855fd5540e3b4ff6fedf12aba2db1ee4b371b36f465da1363a6d022b27cb43b8" [[package]] name = "near-stdx" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" [[package]] name = "near-store" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "actix-rt", @@ -5164,16 +5203,16 @@ dependencies = [ "hex", "itertools 0.10.5", "itoa", - "lru 0.7.8", - "near-async", - "near-chain-configs 2.0.0", - "near-crypto 2.0.0", - "near-fmt 2.0.0", - "near-o11y 2.0.0", - "near-parameters 2.0.0", - "near-primitives 2.0.0", - "near-stdx 2.0.0", - "near-vm-runner 2.0.0", + "lru 0.12.4", + "near-chain-configs 2.1.1", + "near-crypto 2.1.1", + "near-fmt 2.1.1", + "near-o11y 2.1.1", + "near-parameters 2.1.1", + "near-primitives 2.1.1", + "near-stdx 2.1.1", + "near-time", + "near-vm-runner 2.1.1", "num_cpus", "once_cell", "rand 0.8.5", @@ -5191,16 +5230,35 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-structs-checker-core" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" + +[[package]] +name = "near-structs-checker-lib" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" +dependencies = [ + "near-structs-checker-core", + "near-structs-checker-macro", +] + +[[package]] +name = "near-structs-checker-macro" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" + [[package]] name = "near-telemetry" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "awc", "futures", "near-async", - "near-o11y 2.0.0", + "near-o11y 2.1.1", "near-performance-metrics", "near-performance-metrics-macros", "once_cell", @@ -5212,8 +5270,8 @@ dependencies = [ [[package]] name = "near-time" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "once_cell", "serde", @@ -5223,8 +5281,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "enumset", "finite-wasm", @@ -5239,8 +5297,8 @@ dependencies = [ [[package]] name = "near-vm-compiler-singlepass" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -5260,8 +5318,8 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -5313,22 +5371,23 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "anyhow", + "blst", "borsh 1.5.1", "bytesize", "ed25519-dalek", "enum-map", "finite-wasm", - "lru 0.7.8", + "lru 0.12.4", "memoffset 0.8.0", - "near-crypto 2.0.0", - "near-o11y 2.0.0", - "near-parameters 2.0.0", - "near-primitives-core 2.0.0", - "near-stdx 2.0.0", + "near-crypto 2.1.1", + "near-o11y 2.1.1", + "near-parameters 2.1.1", + "near-primitives-core 2.1.1", + "near-stdx 2.1.1", "near-vm-compiler", "near-vm-compiler-singlepass", "near-vm-engine", @@ -5367,8 +5426,8 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "indexmap 1.9.3", "num-traits", @@ -5378,8 +5437,8 @@ dependencies = [ [[package]] name = "near-vm-vm" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "backtrace", "cc", @@ -5399,18 +5458,19 @@ dependencies = [ [[package]] name = "near-wallet-contract" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "anyhow", - "near-primitives-core 2.0.0", - "near-vm-runner 2.0.0", + "near-primitives-core 2.1.1", + "near-vm-runner 2.1.1", + "once_cell", ] [[package]] name = "nearcore" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "actix", "actix-rt", @@ -5430,27 +5490,27 @@ dependencies = [ "indicatif", "near-async", "near-chain", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-chunks", "near-client", "near-client-primitives", - "near-config-utils 2.0.0", - "near-crypto 2.0.0", + "near-config-utils 2.1.1", + "near-crypto 2.1.1", "near-dyn-configs", "near-epoch-manager", "near-jsonrpc", - "near-jsonrpc-primitives 2.0.0", + "near-jsonrpc-primitives 2.1.1", "near-mainnet-res", "near-network", - "near-o11y 2.0.0", - "near-parameters 2.0.0", + "near-o11y 2.1.1", + "near-parameters 2.1.1", "near-performance-metrics", "near-pool", - "near-primitives 2.0.0", + "near-primitives 2.1.1", "near-rosetta-rpc", "near-store", "near-telemetry", - "near-vm-runner 2.0.0", + "near-vm-runner 2.1.1", "node-runtime", "num-rational", "once_cell", @@ -5499,17 +5559,17 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.0.0" -source = "git+https://github.com/kobayurii/nearcore.git?branch=2.0.0-fork1#dee6256d011b1e2ed5cf83c7ad06308a128259da" +version = "2.1.1" +source = "git+https://github.com/kobayurii/nearcore.git?branch=2.1.1-fork#f58397fb20f74749c5bd041c51fe4b45abf20555" dependencies = [ "borsh 1.5.1", - "near-crypto 2.0.0", - "near-o11y 2.0.0", - "near-parameters 2.0.0", - "near-primitives 2.0.0", - "near-primitives-core 2.0.0", + "near-crypto 2.1.1", + "near-o11y 2.1.1", + "near-parameters 2.1.1", + "near-primitives 2.1.1", + "near-primitives-core 2.1.1", "near-store", - "near-vm-runner 2.0.0", + "near-vm-runner 2.1.1", "near-wallet-contract", "num-bigint 0.3.3", "num-traits", @@ -5635,7 +5695,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -5657,7 +5717,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -5674,7 +5734,7 @@ checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", "hashbrown 0.14.5", - "indexmap 2.3.0", + "indexmap 2.4.0", "memchr", ] @@ -5722,7 +5782,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -6242,7 +6302,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "perf-testing" -version = "0.2.12" +version = "0.2.13" dependencies = [ "anyhow", "chrono", @@ -6266,7 +6326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.3.0", + "indexmap 2.4.0", ] [[package]] @@ -6304,7 +6364,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -6422,12 +6482,12 @@ checksum = "aa06bd51638b6e76ac9ba9b6afb4164fa647bd2916d722f2623fbb6d1ed8bdba" [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -6593,7 +6653,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -6614,9 +6674,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "protobuf" -version = "3.5.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df67496db1a89596beaced1579212e9b7c53c22dca1d9745de00ead76573d514" +checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6" dependencies = [ "once_cell", "protobuf-support", @@ -6625,13 +6685,13 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.5.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab09155fad2d39333d3796f67845d43e29b266eea74f7bc93f153f707f126dc" +checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189" dependencies = [ "anyhow", "once_cell", - "protobuf 3.5.0", + "protobuf 3.5.1", "protobuf-parse", "regex", "tempfile", @@ -6640,14 +6700,14 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.5.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a16027030d4ec33e423385f73bb559821827e9ec18c50e7874e4d6de5a4e96f" +checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76" dependencies = [ "anyhow", - "indexmap 2.3.0", + "indexmap 2.4.0", "log", - "protobuf 3.5.0", + "protobuf 3.5.1", "protobuf-support", "tempfile", "thiserror", @@ -6656,9 +6716,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.5.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e2d30ab1878b2e72d1e2fc23ff5517799c9929e2cf81a8516f9f4dcf2b9cf3" +checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9" dependencies = [ "thiserror", ] @@ -6705,9 +6765,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -6840,7 +6900,7 @@ dependencies = [ [[package]] name = "read-rpc-server" -version = "0.2.12" +version = "0.2.13" dependencies = [ "actix-cors 0.7.0", "actix-http", @@ -6860,19 +6920,19 @@ dependencies = [ "lru 0.12.4", "mimalloc", "near-async", - "near-chain-configs 2.0.0", - "near-crypto 2.0.0", + "near-chain-configs 2.1.1", + "near-crypto 2.1.1", "near-indexer-primitives", "near-jsonrpc", - "near-jsonrpc-client 0.11.0", + "near-jsonrpc-client 0.12.0", "near-lake-framework", - "near-parameters 2.0.0", - "near-primitives 2.0.0", - "near-vm-runner 2.0.0", + "near-parameters 2.1.1", + "near-primitives 2.1.1", + "near-vm-runner 2.1.1", "prometheus", "readnode-primitives", "redis", - "reqwest 0.12.5", + "reqwest 0.12.7", "rustc_version 0.4.0", "serde", "serde_json", @@ -6887,11 +6947,11 @@ dependencies = [ [[package]] name = "readnode-primitives" -version = "0.2.12" +version = "0.2.13" dependencies = [ "anyhow", "borsh 1.5.1", - "near-chain-configs 2.0.0", + "near-chain-configs 2.1.1", "near-indexer-primitives", "num-traits", "serde", @@ -6957,9 +7017,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", @@ -7101,7 +7161,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.11", @@ -7111,21 +7171,21 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.50.0", + "winreg", ] [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "http-body-util", @@ -7147,7 +7207,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", - "system-configuration", + "system-configuration 0.6.1", "tokio", "tokio-native-tls", "tokio-util 0.7.11", @@ -7157,19 +7217,19 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.52.0", + "windows-registry", ] [[package]] name = "reqwest-middleware" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39346a33ddfe6be00cbc17a34ce996818b97b230b87229f10114693becca1268" +checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" dependencies = [ "anyhow", "async-trait", "http 1.1.0", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde", "thiserror", "tower-service", @@ -7233,9 +7293,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", @@ -7251,9 +7311,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ "proc-macro2", "quote", @@ -7582,7 +7642,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7679,9 +7739,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.205" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] @@ -7719,13 +7779,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.205" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7739,9 +7799,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", "memchr", @@ -7757,7 +7817,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7791,7 +7851,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.3.0", + "indexmap 2.4.0", "serde", "serde_derive", "serde_json", @@ -7808,7 +7868,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7817,7 +7877,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "itoa", "ryu", "serde", @@ -8063,7 +8123,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state-indexer" -version = "0.2.12" +version = "0.2.13" dependencies = [ "actix-web", "anyhow", @@ -8077,9 +8137,9 @@ dependencies = [ "humantime", "lazy_static", "near-indexer-primitives", - "near-jsonrpc-client 0.11.0", + "near-jsonrpc-client 0.12.0", "near-lake-framework", - "near-primitives 2.0.0", + "near-primitives 2.1.1", "openssl-probe", "prometheus", "tokio", @@ -8195,9 +8255,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -8213,7 +8273,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -8227,6 +8287,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "sysinfo" @@ -8266,7 +8329,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]] @@ -8279,6 +8353,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" @@ -8304,7 +8388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.1.0", + "fastrand 2.1.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -8338,7 +8422,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -8431,9 +8515,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.2" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", @@ -8466,7 +8550,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -8635,7 +8719,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", @@ -8648,7 +8732,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "toml_datetime", "winnow 0.5.40", ] @@ -8659,7 +8743,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", @@ -8758,15 +8842,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -8813,7 +8897,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -8968,7 +9052,7 @@ dependencies = [ [[package]] name = "tx-details-storage" -version = "0.2.12" +version = "0.2.13" dependencies = [ "anyhow", "google-cloud-storage", @@ -8976,7 +9060,7 @@ dependencies = [ [[package]] name = "tx-indexer" -version = "0.2.12" +version = "0.2.13" dependencies = [ "actix-web", "anyhow", @@ -8989,7 +9073,7 @@ dependencies = [ "humantime", "lazy_static", "near-indexer-primitives", - "near-jsonrpc-client 0.11.0", + "near-jsonrpc-client 0.12.0", "near-lake-framework", "prometheus", "readnode-primitives", @@ -9001,9 +9085,9 @@ dependencies = [ [[package]] name = "typeid" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" [[package]] name = "typenum" @@ -9055,9 +9139,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" [[package]] name = "unicode-segmentation" @@ -9186,34 +9270,35 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if 1.0.0", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -9223,9 +9308,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -9233,22 +9318,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-encoder" @@ -9487,7 +9572,7 @@ version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "semver 1.0.23", ] @@ -9512,7 +9597,7 @@ dependencies = [ "bumpalo", "cfg-if 1.0.0", "fxprof-processed-profile", - "indexmap 2.3.0", + "indexmap 2.4.0", "libc", "log", "object 0.32.2", @@ -9591,7 +9676,7 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli 0.28.1", - "indexmap 2.3.0", + "indexmap 2.4.0", "log", "object 0.32.2", "serde", @@ -9657,7 +9742,7 @@ dependencies = [ "anyhow", "cc", "cfg-if 1.0.0", - "indexmap 2.3.0", + "indexmap 2.4.0", "libc", "log", "mach", @@ -9697,7 +9782,7 @@ checksum = "09b5575a75e711ca6c36bb9ad647c93541cdc8e34218031acba5da3f35919dd3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -9708,9 +9793,9 @@ checksum = "9dafab2db172a53e23940e0fa3078c202f567ee5f13f4b42f66b694fab43c658" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -9817,6 +9902,36 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -9993,16 +10108,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - [[package]] name = "wyz" version = "0.5.1" @@ -10057,7 +10162,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -10065,6 +10170,20 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] [[package]] name = "zeropool-bn" diff --git a/Cargo.toml b/Cargo.toml index d0cd7855..b1fe5b09 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [workspace.package] -version = "0.2.12" +version = "0.2.13" authors = ["Near Inc "] edition = "2021" -rust-version = "1.78.0" +rust-version = "1.79.0" repository = "https://github.com/near/read-rpc" license = "MIT OR Apache-2.0" @@ -42,22 +42,22 @@ epoch-indexer = { path = "epoch-indexer" } tx-details-storage = { path = "tx-details-storage" } # Please, update the supported nearcore version in .cargo/config.toml file -near-async = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1" } -near-indexer = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1" } -near-client = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1" } -near-o11y = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1" } -near-indexer-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1" } -near-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1" } -near-chain-configs = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1" } -near-crypto = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1" } -near-jsonrpc = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1" } -near-parameters = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1" } -near-vm-runner = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.0.0-fork1", features = [ +near-async = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.1-fork" } +near-indexer = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.1-fork" } +near-client = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.1-fork" } +near-o11y = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.1-fork" } +near-indexer-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.1-fork" } +near-primitives = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.1-fork" } +near-chain-configs = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.1-fork" } +near-crypto = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.1-fork" } +near-jsonrpc = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.1-fork" } +near-parameters = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.1-fork" } +near-vm-runner = { git = 'https://github.com/kobayurii/nearcore.git', branch = "2.1.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 = '0.7.16' } -near-jsonrpc-client = { git = 'https://github.com/kobayurii/near-jsonrpc-client-rs.git', branch = '0.11.1' } +near-lake-framework = { git = 'https://github.com/kobayurii/near-lake-framework-rs.git', branch = '0.7.17' } +near-jsonrpc-client = { git = 'https://github.com/kobayurii/near-jsonrpc-client-rs.git', branch = '0.12.1' } diff --git a/rpc-server/Dockerfile b/rpc-server/Dockerfile index a84547c2..8c7cac43 100644 --- a/rpc-server/Dockerfile +++ b/rpc-server/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.78 AS builder +FROM rust:1.79 AS builder ARG features="default" WORKDIR /tmp/ diff --git a/rpc-server/src/config.rs b/rpc-server/src/config.rs index b943e046..668c49d5 100644 --- a/rpc-server/src/config.rs +++ b/rpc-server/src/config.rs @@ -46,6 +46,7 @@ impl GenesisInfo { } } +#[allow(unused)] #[derive(Clone)] pub struct ServerContext { /// Lake s3 client diff --git a/rpc-server/src/modules/queries/contract_runner/mod.rs b/rpc-server/src/modules/queries/contract_runner/mod.rs index 72e1178b..42271af7 100644 --- a/rpc-server/src/modules/queries/contract_runner/mod.rs +++ b/rpc-server/src/modules/queries/contract_runner/mod.rs @@ -1,6 +1,5 @@ use std::collections::HashMap; -use near_vm_runner::internal::VMKindExt; use near_vm_runner::ContractRuntimeCache; use crate::errors::FunctionCallError; @@ -10,11 +9,39 @@ use code_storage::CodeStorage; mod code_storage; +pub struct Contract { + pub contract_code: Option>, + pub hash: near_primitives::hash::CryptoHash, +} + +impl Contract { + pub fn new(code: Option>, hash: near_primitives::hash::CryptoHash) -> Self { + code.map(|code| Self { + contract_code: Some(std::sync::Arc::new(near_vm_runner::ContractCode::new( + code, + Some(hash), + ))), + hash, + }) + .unwrap_or_else(|| Self { + contract_code: None, + hash, + }) + } +} +impl near_vm_runner::Contract for Contract { + fn hash(&self) -> near_primitives::hash::CryptoHash { + self.hash + } + + fn get_code(&self) -> Option> { + self.contract_code.clone() + } +} + pub struct RunContractResponse { pub result: Vec, pub logs: Vec, - pub block_height: near_primitives::types::BlockHeight, - pub block_hash: near_primitives::hash::CryptoHash, } #[allow(clippy::too_many_arguments)] @@ -63,6 +90,7 @@ pub async fn run_contract( signer_account_pk: borsh::to_vec(&public_key).expect("Failed to serialize"), predecessor_account_id: account_id.clone(), input: args.to_vec(), + promise_results: Vec::new().into(), block_height: block.block_height, block_timestamp: block.block_timestamp, epoch_height, @@ -84,17 +112,17 @@ pub async fn run_contract( .clone(); let vm_config = near_parameters::vm::Config { vm_kind: config.vm_kind.replace_with_wasmtime_if_unsupported(), - ..config + ..near_parameters::vm::Config::clone(&config) }; let code_hash = contract.data.code_hash(); // Check if the contract code is already in the cache let key = near_vm_runner::get_contract_cache_key(code_hash, &vm_config); let contract_code = if compiled_contract_code_cache.has(&key).unwrap_or(false) { - None + Contract::new(None, code_hash) } else { - Some(match contract_code_cache.get(&code_hash).await { - Some(code) => near_vm_runner::ContractCode::new(code, Some(code_hash)), + match contract_code_cache.get(&code_hash).await { + Some(code) => Contract::new(Some(code), code_hash), None => { let code = db_manager .get_contract_code(account_id, block.block_height, "query_call_function") @@ -102,12 +130,10 @@ pub async fn run_contract( .map_err(|_| FunctionCallError::InvalidAccountId { requested_account_id: account_id.clone(), })?; - contract_code_cache - .put(contract.data.code_hash(), code.data.clone()) - .await; - near_vm_runner::ContractCode::new(code.data, Some(contract.data.code_hash())) + contract_code_cache.put(code_hash, code.data.clone()).await; + Contract::new(Some(code.data), code_hash) } - }) + } }; // Init an external scylla interface for the Runtime logic @@ -121,7 +147,6 @@ pub async fn run_contract( // Execute the contract in the near VM let result = run_code_in_vm_runner( - code_hash, contract_code, method_name.to_string(), context, @@ -146,12 +171,7 @@ pub async fn run_contract( near_vm_runner::logic::ReturnData::ReceiptIndex(_) | near_vm_runner::logic::ReturnData::None => vec![], }; - Ok(RunContractResponse { - result, - logs, - block_height: block.block_height, - block_hash: block.block_hash, - }) + Ok(RunContractResponse { result, logs }) } } @@ -188,11 +208,10 @@ async fn epoch_height_and_validators_with_balances( #[allow(clippy::too_many_arguments)] #[cfg_attr( feature = "tracing-instrumentation", - tracing::instrument(skip(context, code_storage, contract_code, compiled_contract_code_cache)) + tracing::instrument(skip(context, code_storage, contract, compiled_contract_code_cache)) )] async fn run_code_in_vm_runner( - code_hash: near_primitives::hash::CryptoHash, - contract_code: Option, + contract: Contract, method_name: String, context: near_vm_runner::logic::VMContext, mut code_storage: CodeStorage, @@ -204,30 +223,19 @@ async fn run_code_in_vm_runner( let results = tokio::task::spawn_blocking(move || { let _entered = span.entered(); - let promise_results = vec![]; - let fees = near_parameters::RuntimeFeesConfig::free(); - - let runtime = vm_config - .vm_kind - .runtime(vm_config.clone()) - .expect("runtime has not been enabled at compile time"); - - if let Some(code) = &contract_code { - runtime - .precompile(code, &compiled_contract_code_cache_handle) - .expect("Compilation failed") - .expect("Cache failed"); - }; - runtime.run( - code_hash, - None, + let prepared_contract = near_vm_runner::prepare( + &contract, + std::sync::Arc::from(vm_config.clone()), + Some(&compiled_contract_code_cache_handle), + context.make_gas_counter(&vm_config), &method_name, + ); + near_vm_runner::run( + prepared_contract, &mut code_storage, &context, - &fees, - &promise_results, - Some(&compiled_contract_code_cache_handle), + std::sync::Arc::from(near_parameters::RuntimeFeesConfig::free()), ) }) .await; diff --git a/rust-toolchain b/rust-toolchain index 54227249..b3a8c61e 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.78.0 +1.79.0 diff --git a/state-indexer/Dockerfile b/state-indexer/Dockerfile index 23391683..32f82595 100644 --- a/state-indexer/Dockerfile +++ b/state-indexer/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.78 AS builder +FROM rust:1.79 AS builder ARG features="default" WORKDIR /tmp/ diff --git a/tx-indexer/Dockerfile b/tx-indexer/Dockerfile index 0655c8ae..4b389a5a 100644 --- a/tx-indexer/Dockerfile +++ b/tx-indexer/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.78 AS builder +FROM rust:1.79 AS builder ARG features="default" WORKDIR /tmp/