From 9465ab890930145f32cc6e8aff0e83791739c3f7 Mon Sep 17 00:00:00 2001 From: Mario Halambek Date: Tue, 2 May 2023 14:27:53 +0200 Subject: [PATCH] bump to nearcore 1.32.2 --- Cargo.lock | 661 ++++++----------------------------------- indexer/Cargo.toml | 9 +- indexer/Dockerfile | 2 +- indexer/src/configs.rs | 7 +- 4 files changed, 100 insertions(+), 579 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5f00770..8caab25 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -329,17 +329,6 @@ dependencies = [ "derive_arbitrary", ] -[[package]] -name = "assert-json-diff" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259cbe96513d2f1073027a259fc2ca917feb3026a5a8d984e3628e490255cc0" -dependencies = [ - "extend", - "serde", - "serde_json", -] - [[package]] name = "async-mutex" version = "1.4.0" @@ -405,46 +394,17 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "741327a7f70e6e639bdb5061964c66250460c70ad3f59c3fe2a3a64ac1484e33" dependencies = [ - "aws-credential-types 0.53.0", - "aws-http 0.53.0", - "aws-sdk-sso 0.23.0", - "aws-sdk-sts 0.23.0", - "aws-smithy-async 0.53.1", - "aws-smithy-client 0.53.1", - "aws-smithy-http 0.53.1", - "aws-smithy-http-tower 0.53.1", - "aws-smithy-json 0.53.1", - "aws-smithy-types 0.53.1", - "aws-types 0.53.0", - "bytes", - "hex", - "http", - "hyper", - "ring", - "time 0.3.20", - "tokio", - "tower", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-config" -version = "0.54.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3d1e2a1f1ab3ac6c4b884e37413eaa03eb9d901e4fc68ee8f5c1d49721680e" -dependencies = [ - "aws-credential-types 0.54.1", - "aws-http 0.54.1", - "aws-sdk-sso 0.24.0", - "aws-sdk-sts 0.24.0", - "aws-smithy-async 0.54.4", - "aws-smithy-client 0.54.4", - "aws-smithy-http 0.54.4", - "aws-smithy-http-tower 0.54.4", - "aws-smithy-json 0.54.4", - "aws-smithy-types 0.54.4", - "aws-types 0.54.1", + "aws-credential-types", + "aws-http", + "aws-sdk-sso", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-types", "bytes", "hex", "http", @@ -463,21 +423,8 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f99dd587a46af58f8cf37773687ecec19d0373a5954942d7e0f405751fe2369" dependencies = [ - "aws-smithy-async 0.53.1", - "aws-smithy-types 0.53.1", - "tokio", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-credential-types" -version = "0.54.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0696a0523a39a19087747e4dafda0362dc867531e3d72a3f195564c84e5e08" -dependencies = [ - "aws-smithy-async 0.54.4", - "aws-smithy-types 0.54.4", + "aws-smithy-async", + "aws-smithy-types", "tokio", "tracing", "zeroize", @@ -489,23 +436,9 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13fdfc00c57d95e10bcf83d2331c4ae9ca460ca84dc983b2cdd692de87640389" dependencies = [ - "aws-smithy-http 0.53.1", - "aws-smithy-types 0.53.1", - "aws-types 0.53.0", - "http", - "regex", - "tracing", -] - -[[package]] -name = "aws-endpoint" -version = "0.54.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80a4f935ab6a1919fbfd6102a80c4fccd9ff5f47f94ba154074afe1051903261" -dependencies = [ - "aws-smithy-http 0.54.4", - "aws-smithy-types 0.54.4", - "aws-types 0.54.1", + "aws-smithy-http", + "aws-smithy-types", + "aws-types", "http", "regex", "tracing", @@ -517,29 +450,10 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74cdac70481d144bf7001c27884b95ee12c8f62e61db90320d59b673ae121cb8" dependencies = [ - "aws-credential-types 0.53.0", - "aws-smithy-http 0.53.1", - "aws-smithy-types 0.53.1", - "aws-types 0.53.0", - "bytes", - "http", - "http-body", - "lazy_static", - "percent-encoding", - "pin-project-lite", - "tracing", -] - -[[package]] -name = "aws-http" -version = "0.54.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82976ca4e426ee9ca3ffcf919d9b2c8d14d0cd80d43cc02173737a8f07f28d4d" -dependencies = [ - "aws-credential-types 0.54.1", - "aws-smithy-http 0.54.4", - "aws-smithy-types 0.54.4", - "aws-types 0.54.1", + "aws-credential-types", + "aws-smithy-http", + "aws-smithy-types", + "aws-types", "bytes", "http", "http-body", @@ -555,56 +469,21 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ae411cb03ea6df0d4c4340a0d3c15cab7b19715d091f76c5629f31acd6403f3" dependencies = [ - "aws-credential-types 0.53.0", - "aws-endpoint 0.53.0", - "aws-http 0.53.0", - "aws-sig-auth 0.53.0", - "aws-sigv4 0.53.2", - "aws-smithy-async 0.53.1", - "aws-smithy-checksums 0.53.1", - "aws-smithy-client 0.53.1", - "aws-smithy-eventstream 0.53.1", - "aws-smithy-http 0.53.1", - "aws-smithy-http-tower 0.53.1", - "aws-smithy-json 0.53.1", - "aws-smithy-types 0.53.1", - "aws-smithy-xml 0.53.1", - "aws-types 0.53.0", - "bytes", - "bytes-utils", - "fastrand", - "http", - "http-body", - "once_cell", - "percent-encoding", - "regex", - "tokio-stream", - "tower", - "tracing", - "url", -] - -[[package]] -name = "aws-sdk-s3" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1533be023eeac69668eb718b1c48af7bd5e26305ed770553d2877ab1f7507b68" -dependencies = [ - "aws-credential-types 0.54.1", - "aws-endpoint 0.54.1", - "aws-http 0.54.1", - "aws-sig-auth 0.54.1", - "aws-sigv4 0.54.2", - "aws-smithy-async 0.54.4", - "aws-smithy-checksums 0.54.4", - "aws-smithy-client 0.54.4", - "aws-smithy-eventstream 0.54.4", - "aws-smithy-http 0.54.4", - "aws-smithy-http-tower 0.54.4", - "aws-smithy-json 0.54.4", - "aws-smithy-types 0.54.4", - "aws-smithy-xml 0.54.4", - "aws-types 0.54.1", + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-checksums", + "aws-smithy-client", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", "bytes", "bytes-utils", "fastrand", @@ -625,17 +504,17 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5d2fb56182ac693a19364cc0bde22d95aef9be3663bf9b906ffbd0ab0a7c7d1" dependencies = [ - "aws-credential-types 0.53.0", - "aws-endpoint 0.53.0", - "aws-http 0.53.0", - "aws-sig-auth 0.53.0", - "aws-smithy-async 0.53.1", - "aws-smithy-client 0.53.1", - "aws-smithy-http 0.53.1", - "aws-smithy-http-tower 0.53.1", - "aws-smithy-json 0.53.1", - "aws-smithy-types 0.53.1", - "aws-types 0.53.0", + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-types", "bytes", "http", "regex", @@ -644,49 +523,25 @@ dependencies = [ "url", ] -[[package]] -name = "aws-sdk-sso" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0119bacf0c42f587506769390983223ba834e605f049babe514b2bd646dbb2" -dependencies = [ - "aws-credential-types 0.54.1", - "aws-endpoint 0.54.1", - "aws-http 0.54.1", - "aws-sig-auth 0.54.1", - "aws-smithy-async 0.54.4", - "aws-smithy-client 0.54.4", - "aws-smithy-http 0.54.4", - "aws-smithy-http-tower 0.54.4", - "aws-smithy-json 0.54.4", - "aws-smithy-types 0.54.4", - "aws-types 0.54.1", - "bytes", - "http", - "regex", - "tokio-stream", - "tower", -] - [[package]] name = "aws-sdk-sts" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a70adf3e9518c8d6d14f1239f6af04c019ffd260ab791e17deb11f1bce6a9f76" dependencies = [ - "aws-credential-types 0.53.0", - "aws-endpoint 0.53.0", - "aws-http 0.53.0", - "aws-sig-auth 0.53.0", - "aws-smithy-async 0.53.1", - "aws-smithy-client 0.53.1", - "aws-smithy-http 0.53.1", - "aws-smithy-http-tower 0.53.1", - "aws-smithy-json 0.53.1", - "aws-smithy-query 0.53.1", - "aws-smithy-types 0.53.1", - "aws-smithy-xml 0.53.1", - "aws-types 0.53.0", + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", "bytes", "http", "regex", @@ -695,58 +550,17 @@ dependencies = [ "url", ] -[[package]] -name = "aws-sdk-sts" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "270b6a33969ebfcb193512fbd5e8ee5306888ad6c6d5d775cdbfb2d50d94de26" -dependencies = [ - "aws-credential-types 0.54.1", - "aws-endpoint 0.54.1", - "aws-http 0.54.1", - "aws-sig-auth 0.54.1", - "aws-smithy-async 0.54.4", - "aws-smithy-client 0.54.4", - "aws-smithy-http 0.54.4", - "aws-smithy-http-tower 0.54.4", - "aws-smithy-json 0.54.4", - "aws-smithy-query 0.54.4", - "aws-smithy-types 0.54.4", - "aws-smithy-xml 0.54.4", - "aws-types 0.54.1", - "bytes", - "http", - "regex", - "tower", - "tracing", -] - [[package]] name = "aws-sig-auth" version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22af7f6515f8b51dabef87df1d901c9734e4e367791c6d0e1082f9f31528120e" dependencies = [ - "aws-credential-types 0.53.0", - "aws-sigv4 0.53.2", - "aws-smithy-eventstream 0.53.1", - "aws-smithy-http 0.53.1", - "aws-types 0.53.0", - "http", - "tracing", -] - -[[package]] -name = "aws-sig-auth" -version = "0.54.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "660a02a98ab1af83bd8d714afbab2d502ba9b18c49e7e4cddd6bf8837ff778cb" -dependencies = [ - "aws-credential-types 0.54.1", - "aws-sigv4 0.54.2", - "aws-smithy-eventstream 0.54.4", - "aws-smithy-http 0.54.4", - "aws-types 0.54.1", + "aws-credential-types", + "aws-sigv4", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-types", "http", "tracing", ] @@ -757,29 +571,8 @@ version = "0.53.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14500f741fb73a3c6cb173f8d96b433319a0e27c370a4e783b9ad693fc86210e" dependencies = [ - "aws-smithy-eventstream 0.53.1", - "aws-smithy-http 0.53.1", - "bytes", - "form_urlencoded", - "hex", - "hmac", - "http", - "once_cell", - "percent-encoding", - "regex", - "sha2 0.10.6", - "time 0.3.20", - "tracing", -] - -[[package]] -name = "aws-sigv4" -version = "0.54.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86529e7b64d902efea8fff52c1b2529368d04f90305cf632729e3713f6b57dc0" -dependencies = [ - "aws-smithy-eventstream 0.54.4", - "aws-smithy-http 0.54.4", + "aws-smithy-eventstream", + "aws-smithy-http", "bytes", "form_urlencoded", "hex", @@ -805,47 +598,14 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "aws-smithy-async" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63c712a28a4f2f2139759235c08bf98aca99d4fdf1b13c78c5f95613df0a5db9" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", - "tokio-stream", -] - [[package]] name = "aws-smithy-checksums" version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85e9e4d3c2296bcec2c03f9f769ac9b2424d972c2fe7afc0b59235447ac3a5c3" dependencies = [ - "aws-smithy-http 0.53.1", - "aws-smithy-types 0.53.1", - "bytes", - "crc32c", - "crc32fast", - "hex", - "http", - "http-body", - "md-5", - "pin-project-lite", - "sha1", - "sha2 0.10.6", - "tracing", -] - -[[package]] -name = "aws-smithy-checksums" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3875fb4b28606a5368a048016a28c15707f2b21238d5b2e4a23198f590e92c4" -dependencies = [ - "aws-smithy-http 0.54.4", - "aws-smithy-types 0.54.4", + "aws-smithy-http", + "aws-smithy-types", "bytes", "crc32c", "crc32fast", @@ -865,10 +625,10 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "710ca0f8dacddda5fbcaf5c3cd9d02da7913fd463a2ee9555b617bf168bedacb" dependencies = [ - "aws-smithy-async 0.53.1", - "aws-smithy-http 0.53.1", - "aws-smithy-http-tower 0.53.1", - "aws-smithy-types 0.53.1", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-types", "bytes", "fastrand", "http", @@ -882,49 +642,13 @@ dependencies = [ "tracing", ] -[[package]] -name = "aws-smithy-client" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104ca17f56cde00a10207169697dfe9c6810db339d52fb352707e64875b30a44" -dependencies = [ - "aws-smithy-async 0.54.4", - "aws-smithy-http 0.54.4", - "aws-smithy-http-tower 0.54.4", - "aws-smithy-protocol-test", - "aws-smithy-types 0.54.4", - "bytes", - "fastrand", - "http", - "http-body", - "hyper", - "hyper-rustls", - "lazy_static", - "pin-project-lite", - "serde", - "tokio", - "tower", - "tracing", -] - [[package]] name = "aws-smithy-eventstream" version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d1ff11ee22de3581114b60d4ae8e700638dacb5b5bbe6769726e251e6c3f20a" dependencies = [ - "aws-smithy-types 0.53.1", - "bytes", - "crc32fast", -] - -[[package]] -name = "aws-smithy-eventstream" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac250d8c0e42af0097a6837ffc5a6fb9f8ba4107bb53124c047c91bc2a58878f" -dependencies = [ - "aws-smithy-types 0.54.4", + "aws-smithy-types", "bytes", "crc32fast", ] @@ -935,31 +659,8 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29dcab29afbea7726f5c10c7be0c38666d7eb07db551580b3b26ed7cfb5d1935" dependencies = [ - "aws-smithy-eventstream 0.53.1", - "aws-smithy-types 0.53.1", - "bytes", - "bytes-utils", - "futures-core", - "http", - "http-body", - "hyper", - "once_cell", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tokio", - "tokio-util 0.7.3", - "tracing", -] - -[[package]] -name = "aws-smithy-http" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873f316f1833add0d3aa54ed1b0cd252ddd88c792a0cf839886400099971e844" -dependencies = [ - "aws-smithy-eventstream 0.54.4", - "aws-smithy-types 0.54.4", + "aws-smithy-eventstream", + "aws-smithy-types", "bytes", "bytes-utils", "futures-core", @@ -981,24 +682,8 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5856d2f1063c0f726a85f32dcd2a9f5a1d994eb27b156abccafc7260f3f471d" dependencies = [ - "aws-smithy-http 0.53.1", - "aws-smithy-types 0.53.1", - "bytes", - "http", - "http-body", - "pin-project-lite", - "tower", - "tracing", -] - -[[package]] -name = "aws-smithy-http-tower" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38231d3f5dac9ac7976f44e12803add1385119ffca9e5f050d8e980733d164" -dependencies = [ - "aws-smithy-http 0.54.4", - "aws-smithy-types 0.54.4", + "aws-smithy-http", + "aws-smithy-types", "bytes", "http", "http-body", @@ -1013,31 +698,7 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfb33659b68480495b5f906b946c8642928440118b1d7e26a25a067303ca01a5" dependencies = [ - "aws-smithy-types 0.53.1", -] - -[[package]] -name = "aws-smithy-json" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd83ff2b79e9f729746fcc8ad798676b68fe6ea72986571569a5306a277a182" -dependencies = [ - "aws-smithy-types 0.54.4", -] - -[[package]] -name = "aws-smithy-protocol-test" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d1c9bcb35ce11055ec128dab2c66a7ed47e2dfff99883e32c21a1ab6d6bee6" -dependencies = [ - "assert-json-diff", - "http", - "pretty_assertions", - "regex", - "roxmltree", - "serde_json", - "thiserror", + "aws-smithy-types", ] [[package]] @@ -1046,17 +707,7 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c4b21ee0e30ff046e87c7b7e017b99d445b42a81fe52c6e5139b23b795a98ae" dependencies = [ - "aws-smithy-types 0.53.1", - "urlencoding", -] - -[[package]] -name = "aws-smithy-query" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f0445dafe9d2cd50b44339ae3c3ed46549aad8ac696c52ad660b3e7ae8682b" -dependencies = [ - "aws-smithy-types 0.54.4", + "aws-smithy-types", "urlencoding", ] @@ -1066,20 +717,7 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2013465a070decdeb3e85ceb3370ae85ba05f56f914abfd89858d7281c4f12c3" dependencies = [ - "base64-simd 0.7.0", - "itoa", - "num-integer", - "ryu", - "time 0.3.20", -] - -[[package]] -name = "aws-smithy-types" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8161232eda10290f5136610a1eb9de56aceaccd70c963a26a260af20ac24794f" -dependencies = [ - "base64-simd 0.8.0", + "base64-simd", "itoa", "num-integer", "ryu", @@ -1095,42 +733,17 @@ dependencies = [ "xmlparser", ] -[[package]] -name = "aws-smithy-xml" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343ffe9a9bb3f542675f4df0e0d5933513d6ad038ca3907ad1767ba690a99684" -dependencies = [ - "xmlparser", -] - [[package]] name = "aws-types" version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61f00f4b0cdd345686e6389f3343a3020f93232d20040802b87673ddc2d02956" dependencies = [ - "aws-credential-types 0.53.0", - "aws-smithy-async 0.53.1", - "aws-smithy-client 0.53.1", - "aws-smithy-http 0.53.1", - "aws-smithy-types 0.53.1", - "http", - "rustc_version", - "tracing", -] - -[[package]] -name = "aws-types" -version = "0.54.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f15b34253b68cde08e39b0627cc6101bcca64351229484b4743392c035d057" -dependencies = [ - "aws-credential-types 0.54.1", - "aws-smithy-async 0.54.4", - "aws-smithy-client 0.54.4", - "aws-smithy-http 0.54.4", - "aws-smithy-types 0.54.4", + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-types", "http", "rustc_version", "tracing", @@ -1163,16 +776,6 @@ dependencies = [ "simd-abstraction", ] -[[package]] -name = "base64-simd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" -dependencies = [ - "outref 0.5.1", - "vsimd", -] - [[package]] name = "bigdecimal" version = "0.1.0" @@ -1696,16 +1299,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "curve25519-dalek" version = "3.2.1" @@ -1928,12 +1521,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - [[package]] name = "digest" version = "0.9.0" @@ -2074,18 +1661,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "extend" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "fastrand" version = "1.9.0" @@ -2527,10 +2102,9 @@ dependencies = [ "actix-rt", "actix-web", "anyhow", - "aws-config 0.54.1", - "aws-endpoint 0.54.1", - "aws-sdk-s3 0.24.0", - "aws-types 0.54.1", + "aws-config", + "aws-sdk-s3", + "aws-types", "borsh 0.7.2", "cached", "chrono", @@ -2538,7 +2112,6 @@ dependencies = [ "dotenv", "explorer-database", "futures", - "http", "itertools", "lazy_static", "near-jsonrpc-client", @@ -2925,10 +2498,10 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "aws-config 0.53.0", - "aws-credential-types 0.53.0", - "aws-sdk-s3 0.23.0", - "aws-types 0.53.0", + "aws-config", + "aws-credential-types", + "aws-sdk-s3", + "aws-types", "derive_builder", "futures", "near-indexer-primitives", @@ -3369,27 +2942,12 @@ version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - [[package]] name = "outref" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" -[[package]] -name = "outref" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" - [[package]] name = "overload" version = "0.1.1" @@ -3494,18 +3052,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "pretty_assertions" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" -dependencies = [ - "ctor", - "diff", - "output_vt100", - "yansi", -] - [[package]] name = "primitive-types" version = "0.10.1" @@ -3834,15 +3380,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "roxmltree" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" -dependencies = [ - "xmlparser", -] - [[package]] name = "rustc-hex" version = "2.1.0" @@ -4150,7 +3687,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" dependencies = [ - "outref 0.1.0", + "outref", ] [[package]] @@ -4798,12 +4335,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - [[package]] name = "want" version = "0.3.0" @@ -5143,12 +4674,6 @@ version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - [[package]] name = "zeroize" version = "1.3.0" diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index 211fdec..f2dc4c8 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -10,10 +10,9 @@ actix = "0.13.0" actix-rt = "2.2.0" actix-web = "=4.0.1" anyhow = "1.0.51" -aws-types = "0.54.1" -aws-sdk-s3 = "0.24.0" -aws-config = "0.54.1" -aws-endpoint = "0.54.1" +aws-types = "0.53" +aws-sdk-s3 = "0.23" +aws-config = "0.53" borsh = "0.7.1" cached = "0.23.0" chrono = "0.4.19" @@ -38,8 +37,6 @@ near-lake-framework = "0.7.1" explorer-database = { path = "../database" } -http = "0.2.8" - [features] default = [] account_changes = [] diff --git a/indexer/Dockerfile b/indexer/Dockerfile index fa71111..8a2fdd2 100644 --- a/indexer/Dockerfile +++ b/indexer/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.67.1 AS builder +FROM rust:1.68.0 AS builder WORKDIR /tmp/ COPY Cargo.toml Cargo.lock ./ COPY database database diff --git a/indexer/src/configs.rs b/indexer/src/configs.rs index 8269491..8d88a66 100644 --- a/indexer/src/configs.rs +++ b/indexer/src/configs.rs @@ -1,8 +1,7 @@ use aws_config::meta::region::RegionProviderChain; -use aws_sdk_s3::{Endpoint, Region}; +use aws_sdk_s3::Region; use clap::{Parser, Subcommand}; use explorer_database::{adapters, models}; -use http::Uri; use tracing_subscriber::EnvFilter; use near_jsonrpc_client::{methods, JsonRpcClient}; @@ -109,8 +108,8 @@ impl Opts { .or_default_provider() .or_else(Region::new(self.region.clone())); let aws_config = aws_config::from_env().region(region_provider).load().await; - let mut s3_conf = aws_sdk_s3::config::Config::Builder::from(&aws_config); - s3_conf = s3_conf.endpoint_url(self.endpoint.parse::().unwrap()); + let mut s3_conf = aws_sdk_s3::config::Builder::from(&aws_config); + s3_conf = s3_conf.endpoint_url(self.endpoint.clone()); config_builder .s3_bucket_name(self.bucket.clone()) .s3_region_name(self.region.clone())