diff --git a/Cargo.lock b/Cargo.lock index 133e4f89dd..bc3061bf9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -96,16 +96,15 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] @@ -130,24 +129,24 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "app-data" @@ -210,18 +209,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] @@ -273,9 +272,9 @@ dependencies = [ "hex-literal", "humantime", "indexmap 2.2.5", - "itertools 0.11.0", + "itertools 0.12.1", "maplit", - "mockall", + "mockall 0.12.1", "model", "num", "number", @@ -308,22 +307,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcdcf0d683fe9c23d32cf5b53c9918ea0a500375a9fb20109802552658e576c9" dependencies = [ "aws-credential-types 0.55.3", - "aws-http 0.55.3", + "aws-http", "aws-sdk-sso 0.28.0", "aws-sdk-sts 0.28.0", "aws-smithy-async 0.55.3", - "aws-smithy-client 0.55.3", + "aws-smithy-client", "aws-smithy-http 0.55.3", - "aws-smithy-http-tower 0.55.3", + "aws-smithy-http-tower", "aws-smithy-json 0.55.3", "aws-smithy-types 0.55.3", "aws-types 0.55.3", "bytes", "fastrand 1.9.0", "hex", - "http", + "http 0.2.9", "hyper", - "ring", + "ring 0.16.20", "time", "tokio", "tower", @@ -333,31 +332,32 @@ dependencies = [ [[package]] name = "aws-config" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3d533e0263bf453cc80af4c8bcc4d64e2aca293bd16f81633a36f1bf4a97cb" -dependencies = [ - "aws-credential-types 0.56.0", - "aws-http 0.56.0", - "aws-sdk-sso 0.29.0", - "aws-sdk-sts 0.29.0", - "aws-smithy-async 0.56.0", - "aws-smithy-client 0.56.0", - "aws-smithy-http 0.56.0", - "aws-smithy-http-tower 0.56.0", - "aws-smithy-json 0.56.0", - "aws-smithy-types 0.56.0", - "aws-types 0.56.0", +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2a89e0000cde82447155d64eeb71720b933b4396a6fbbebad3f8b4f88ca7b54" +dependencies = [ + "aws-credential-types 1.2.0", + "aws-runtime", + "aws-sdk-sso 1.20.0", + "aws-sdk-ssooidc", + "aws-sdk-sts 1.20.0", + "aws-smithy-async 1.2.1", + "aws-smithy-http 0.60.7", + "aws-smithy-json 0.60.7", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types 1.1.8", + "aws-types 1.2.0", "bytes", - "fastrand 2.0.0", + "fastrand 2.0.2", "hex", - "http", + "http 0.2.9", "hyper", - "ring", + "ring 0.17.8", "time", "tokio", - "tower", "tracing", + "url", "zeroize", ] @@ -377,15 +377,13 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "0.56.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4834ba01c5ad1ed9740aa222de62190e3c565d11ab7e72cc68314a258994567" +checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" dependencies = [ - "aws-smithy-async 0.56.0", - "aws-smithy-types 0.56.0", - "fastrand 2.0.0", - "tokio", - "tracing", + "aws-smithy-async 1.2.1", + "aws-smithy-runtime-api", + "aws-smithy-types 1.1.8", "zeroize", ] @@ -398,7 +396,7 @@ dependencies = [ "aws-smithy-http 0.55.3", "aws-smithy-types 0.55.3", "aws-types 0.55.3", - "http", + "http 0.2.9", "regex", "tracing", ] @@ -414,27 +412,8 @@ dependencies = [ "aws-smithy-types 0.55.3", "aws-types 0.55.3", "bytes", - "http", - "http-body", - "lazy_static", - "percent-encoding", - "pin-project-lite", - "tracing", -] - -[[package]] -name = "aws-http" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72badf9de83cc7d66b21b004f09241836823b8302afb25a24708769e576a8d8f" -dependencies = [ - "aws-credential-types 0.56.0", - "aws-smithy-http 0.56.0", - "aws-smithy-types 0.56.0", - "aws-types 0.56.0", - "bytes", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "lazy_static", "percent-encoding", "pin-project-lite", @@ -443,22 +422,24 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "0.56.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf832f522111225c02547e1e1c28137e840e4b082399d93a236e4b29193a4667" +checksum = "f4963ac9ff2d33a4231b3806c1c69f578f221a9cabb89ad2bde62ce2b442c8a7" dependencies = [ - "aws-credential-types 0.56.0", - "aws-http 0.56.0", - "aws-sigv4 0.56.0", - "aws-smithy-async 0.56.0", + "aws-credential-types 1.2.0", + "aws-sigv4 1.2.0", + "aws-smithy-async 1.2.1", "aws-smithy-eventstream", - "aws-smithy-http 0.56.0", + "aws-smithy-http 0.60.7", "aws-smithy-runtime-api", - "aws-smithy-types 0.56.0", - "aws-types 0.56.0", - "fastrand 2.0.0", - "http", + "aws-smithy-types 1.1.8", + "aws-types 1.2.0", + "bytes", + "fastrand 2.0.2", + "http 0.2.9", + "http-body 0.4.5", "percent-encoding", + "pin-project-lite", "tracing", "uuid", ] @@ -471,17 +452,17 @@ checksum = "545335abd7c6ef7285d2972a67b9f8279ff5fec8bbb3ffc637fa436ba1e6e434" dependencies = [ "aws-credential-types 0.55.3", "aws-endpoint", - "aws-http 0.55.3", + "aws-http", "aws-sig-auth", "aws-smithy-async 0.55.3", - "aws-smithy-client 0.55.3", + "aws-smithy-client", "aws-smithy-http 0.55.3", - "aws-smithy-http-tower 0.55.3", + "aws-smithy-http-tower", "aws-smithy-json 0.55.3", "aws-smithy-types 0.55.3", "aws-types 0.55.3", "bytes", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -490,32 +471,35 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "0.29.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e30370b61599168d38190ad272bb91842cd81870a6ca035c05dd5726d22832c" +checksum = "4576ae7eb91e4d0ca76a3b443c3be979322fc01836cad7908534ae507fa41d99" dependencies = [ - "aws-credential-types 0.56.0", - "aws-http 0.56.0", + "ahash", + "aws-credential-types 1.2.0", "aws-runtime", - "aws-sigv4 0.56.0", - "aws-smithy-async 0.56.0", + "aws-sigv4 1.2.0", + "aws-smithy-async 1.2.1", "aws-smithy-checksums", - "aws-smithy-client 0.56.0", "aws-smithy-eventstream", - "aws-smithy-http 0.56.0", - "aws-smithy-json 0.56.0", + "aws-smithy-http 0.60.7", + "aws-smithy-json 0.60.7", "aws-smithy-runtime", "aws-smithy-runtime-api", - "aws-smithy-types 0.56.0", - "aws-smithy-xml 0.56.0", - "aws-types 0.56.0", + "aws-smithy-types 1.1.8", + "aws-smithy-xml 0.60.7", + "aws-types 1.2.0", "bytes", - "http", - "http-body", + "fastrand 2.0.2", + "hex", + "hmac", + "http 0.2.9", + "http-body 0.4.5", + "lru", "once_cell", "percent-encoding", - "regex", - "tokio-stream", + "regex-lite", + "sha2", "tracing", "url", ] @@ -528,17 +512,17 @@ checksum = "c8b812340d86d4a766b2ca73f740dfd47a97c2dff0c06c8517a16d88241957e4" dependencies = [ "aws-credential-types 0.55.3", "aws-endpoint", - "aws-http 0.55.3", + "aws-http", "aws-sig-auth", "aws-smithy-async 0.55.3", - "aws-smithy-client 0.55.3", + "aws-smithy-client", "aws-smithy-http 0.55.3", - "aws-smithy-http-tower 0.55.3", + "aws-smithy-http-tower", "aws-smithy-json 0.55.3", "aws-smithy-types 0.55.3", "aws-types 0.55.3", "bytes", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -547,25 +531,45 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "0.29.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41bf2c28d32dbb9894a8fcfcb148265d034d3f4a170552a47553a09de890895" +checksum = "32fcc572fd5c58489ec205ec3e4e5f7d63018898a485cbf922a462af496bc300" dependencies = [ - "aws-credential-types 0.56.0", - "aws-http 0.56.0", + "aws-credential-types 1.2.0", "aws-runtime", - "aws-smithy-async 0.56.0", - "aws-smithy-client 0.56.0", - "aws-smithy-http 0.56.0", - "aws-smithy-json 0.56.0", + "aws-smithy-async 1.2.1", + "aws-smithy-http 0.60.7", + "aws-smithy-json 0.60.7", "aws-smithy-runtime", "aws-smithy-runtime-api", - "aws-smithy-types 0.56.0", - "aws-types 0.56.0", + "aws-smithy-types 1.1.8", + "aws-types 1.2.0", "bytes", - "http", - "regex", - "tokio-stream", + "http 0.2.9", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b6275fa8684a1192754221173b1f7a7c1260d6b0571cc2b8af09468eb0cffe5" +dependencies = [ + "aws-credential-types 1.2.0", + "aws-runtime", + "aws-smithy-async 1.2.1", + "aws-smithy-http 0.60.7", + "aws-smithy-json 0.60.7", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types 1.1.8", + "aws-types 1.2.0", + "bytes", + "http 0.2.9", + "once_cell", + "regex-lite", "tracing", ] @@ -577,19 +581,19 @@ checksum = "265fac131fbfc188e5c3d96652ea90ecc676a934e3174eaaee523c6cec040b3b" dependencies = [ "aws-credential-types 0.55.3", "aws-endpoint", - "aws-http 0.55.3", + "aws-http", "aws-sig-auth", "aws-smithy-async 0.55.3", - "aws-smithy-client 0.55.3", + "aws-smithy-client", "aws-smithy-http 0.55.3", - "aws-smithy-http-tower 0.55.3", + "aws-smithy-http-tower", "aws-smithy-json 0.55.3", "aws-smithy-query 0.55.3", "aws-smithy-types 0.55.3", "aws-smithy-xml 0.55.3", "aws-types 0.55.3", "bytes", - "http", + "http 0.2.9", "regex", "tower", "tracing", @@ -597,25 +601,24 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "0.29.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e21aa1a5b0853969a1ef96ccfaa8ff5d57c761549786a4d5f86c1902b2586a" +checksum = "30acd58272fd567e4853c5075d838be1626b59057e0249c9be5a1a7eb13bf70f" dependencies = [ - "aws-credential-types 0.56.0", - "aws-http 0.56.0", + "aws-credential-types 1.2.0", "aws-runtime", - "aws-smithy-async 0.56.0", - "aws-smithy-client 0.56.0", - "aws-smithy-http 0.56.0", - "aws-smithy-json 0.56.0", - "aws-smithy-query 0.56.0", + "aws-smithy-async 1.2.1", + "aws-smithy-http 0.60.7", + "aws-smithy-json 0.60.7", + "aws-smithy-query 0.60.7", "aws-smithy-runtime", "aws-smithy-runtime-api", - "aws-smithy-types 0.56.0", - "aws-smithy-xml 0.56.0", - "aws-types 0.56.0", - "http", - "regex", + "aws-smithy-types 1.1.8", + "aws-smithy-xml 0.60.7", + "aws-types 1.2.0", + "http 0.2.9", + "once_cell", + "regex-lite", "tracing", ] @@ -629,7 +632,7 @@ dependencies = [ "aws-sigv4 0.55.3", "aws-smithy-http 0.55.3", "aws-types 0.55.3", - "http", + "http 0.2.9", "tracing", ] @@ -643,7 +646,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "http", + "http 0.2.9", "once_cell", "percent-encoding", "regex", @@ -654,20 +657,23 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.56.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb40a93429794065f41f0581734fc56a345f6a38d8e2e3c25c7448d930cd132" +checksum = "11d6f29688a4be9895c0ba8bef861ad0c0dac5c15e9618b9b7a6c233990fc263" dependencies = [ + "aws-credential-types 1.2.0", "aws-smithy-eventstream", - "aws-smithy-http 0.56.0", + "aws-smithy-http 0.60.7", + "aws-smithy-runtime-api", + "aws-smithy-types 1.1.8", "bytes", "form_urlencoded", "hex", "hmac", - "http", + "http 0.2.9", + "http 1.1.0", "once_cell", "percent-encoding", - "regex", "sha2", "time", "tracing", @@ -687,30 +693,29 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.56.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee6d17d487c8b579423067718b3580c0908d0f01d7461813f94ec4323bad623" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" dependencies = [ "futures-util", "pin-project-lite", "tokio", - "tokio-stream", ] [[package]] name = "aws-smithy-checksums" -version = "0.56.0" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d1849fd5916904513fb0862543b36f8faab43c07984dbc476132b7da1aed056" +checksum = "83fa43bc04a6b2441968faeab56e68da3812f978a670a5db32accbdcafddd12f" dependencies = [ - "aws-smithy-http 0.56.0", - "aws-smithy-types 0.56.0", + "aws-smithy-http 0.60.7", + "aws-smithy-types 1.1.8", "bytes", "crc32c", "crc32fast", "hex", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "md-5", "pin-project-lite", "sha1", @@ -726,41 +731,17 @@ checksum = "0a86aa6e21e86c4252ad6a0e3e74da9617295d8d6e374d552be7d3059c41cedd" dependencies = [ "aws-smithy-async 0.55.3", "aws-smithy-http 0.55.3", - "aws-smithy-http-tower 0.55.3", + "aws-smithy-http-tower", "aws-smithy-types 0.55.3", "bytes", "fastrand 1.9.0", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-rustls 0.23.2", "lazy_static", "pin-project-lite", - "rustls 0.20.8", - "tokio", - "tower", - "tracing", -] - -[[package]] -name = "aws-smithy-client" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbe0a3ad15283cc5f863a68cb6adc8e256e7c109c43c01bdd09be407219a1e9" -dependencies = [ - "aws-smithy-async 0.56.0", - "aws-smithy-http 0.56.0", - "aws-smithy-http-tower 0.56.0", - "aws-smithy-types 0.56.0", - "bytes", - "fastrand 2.0.0", - "http", - "http-body", - "hyper", - "hyper-rustls 0.24.1", - "lazy_static", - "pin-project-lite", - "rustls 0.21.6", + "rustls 0.20.9", "tokio", "tower", "tracing", @@ -768,11 +749,11 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.56.0" +version = "0.60.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56afef1aa766f512b4970b4c3150b9bf2df8035939723830df4b30267e2d7cb" +checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" dependencies = [ - "aws-smithy-types 0.56.0", + "aws-smithy-types 1.1.8", "bytes", "crc32fast", ] @@ -787,8 +768,8 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "once_cell", "percent-encoding", @@ -801,24 +782,22 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.56.0" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34dc313472d727f5ef44fdda93e668ebfe17380c99dee512c403e3ca51863bb9" +checksum = "3f10fa66956f01540051b0aa7ad54574640f748f9839e843442d99b970d3aff9" dependencies = [ "aws-smithy-eventstream", - "aws-smithy-types 0.56.0", + "aws-smithy-runtime-api", + "aws-smithy-types 1.1.8", "bytes", "bytes-utils", "futures-core", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", "once_cell", "percent-encoding", "pin-project-lite", "pin-utils", - "tokio", - "tokio-util 0.7.8", "tracing", ] @@ -831,24 +810,8 @@ dependencies = [ "aws-smithy-http 0.55.3", "aws-smithy-types 0.55.3", "bytes", - "http", - "http-body", - "pin-project-lite", - "tower", - "tracing", -] - -[[package]] -name = "aws-smithy-http-tower" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd50fca5a4ea4ec3771689ee93bf06b32de02a80af01ed93a8f8a4ed90e8483" -dependencies = [ - "aws-smithy-http 0.56.0", - "aws-smithy-types 0.56.0", - "bytes", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "pin-project-lite", "tower", "tracing", @@ -865,11 +828,11 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.56.0" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3591dd7c2fe01ab8025e4847a0a0f6d0c2b2269714688ffb856f9cf6c6d465cf" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" dependencies = [ - "aws-smithy-types 0.56.0", + "aws-smithy-types 1.1.8", ] [[package]] @@ -884,49 +847,55 @@ dependencies = [ [[package]] name = "aws-smithy-query" -version = "0.56.0" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbabb1145e65dd57ae72d91a2619d3f5fba40b68a5f40ba009c30571dfd60aff" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" dependencies = [ - "aws-smithy-types 0.56.0", + "aws-smithy-types 1.1.8", "urlencoding", ] [[package]] name = "aws-smithy-runtime" -version = "0.56.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3687fb838d4ad1c883b62eb59115bc9fb02c4f308aac49a7df89627067f6eb0d" +checksum = "de34bcfa1fb3c82a80e252a753db34a6658e07f23d3a5b3fc96919518fa7a3f5" dependencies = [ - "aws-smithy-async 0.56.0", - "aws-smithy-client 0.56.0", - "aws-smithy-http 0.56.0", + "aws-smithy-async 1.2.1", + "aws-smithy-http 0.60.7", "aws-smithy-runtime-api", - "aws-smithy-types 0.56.0", + "aws-smithy-types 1.1.8", "bytes", - "fastrand 2.0.0", - "http", - "http-body", + "fastrand 2.0.2", + "h2", + "http 0.2.9", + "http-body 0.4.5", + "http-body 1.0.0", + "hyper", + "hyper-rustls 0.24.1", "once_cell", "pin-project-lite", "pin-utils", + "rustls 0.21.10", "tokio", "tracing", ] [[package]] name = "aws-smithy-runtime-api" -version = "0.56.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cfbf1e5c2108b41f5ca607cde40dd5109fecc448f5d30c8e614b61f36dce704" +checksum = "4cc56a5c96ec741de6c5e6bf1ce6948be969d6506dfa9c39cffc284e31e4979b" dependencies = [ - "aws-smithy-async 0.56.0", - "aws-smithy-http 0.56.0", - "aws-smithy-types 0.56.0", + "aws-smithy-async 1.2.1", + "aws-smithy-types 1.1.8", "bytes", - "http", + "http 0.2.9", + "http 1.1.0", + "pin-project-lite", "tokio", "tracing", + "zeroize", ] [[package]] @@ -944,16 +913,28 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "0.56.0" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed0a94eefd845a2a78677f1b72f02fa75802d38f7f59be675add140279aa8bf" +checksum = "abe14dceea1e70101d38fbf2a99e6a34159477c0fb95e68e05c66bd7ae4c3729" dependencies = [ "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.9", + "http 1.1.0", + "http-body 0.4.5", + "http-body 1.0.0", + "http-body-util", "itoa", "num-integer", + "pin-project-lite", + "pin-utils", "ryu", "serde", "time", + "tokio", + "tokio-util 0.7.8", ] [[package]] @@ -967,9 +948,9 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.56.0" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88052c812f696143ad7ba729c63535209ff0e0f49e31a6d2b1205208ea6ea79" +checksum = "872c68cf019c0e4afc5de7753c4f7288ce4b71663212771bf5e4542eb9346ca9" dependencies = [ "xmlparser", ] @@ -982,26 +963,25 @@ checksum = "6dd209616cc8d7bfb82f87811a5c655dc97537f592689b18743bddf5dc5c4829" dependencies = [ "aws-credential-types 0.55.3", "aws-smithy-async 0.55.3", - "aws-smithy-client 0.55.3", + "aws-smithy-client", "aws-smithy-http 0.55.3", "aws-smithy-types 0.55.3", - "http", + "http 0.2.9", "rustc_version", "tracing", ] [[package]] name = "aws-types" -version = "0.56.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bceb8cf724ad057ad7f327d0d256d7147b3eac777b39849a26189e003dc9782" +checksum = "5a43b56df2c529fe44cb4d92bd64d0479883fb9608ff62daede4df5405381814" dependencies = [ - "aws-credential-types 0.56.0", - "aws-smithy-async 0.56.0", - "aws-smithy-client 0.56.0", - "aws-smithy-http 0.56.0", - "aws-smithy-types 0.56.0", - "http", + "aws-credential-types 1.2.0", + "aws-smithy-async 1.2.1", + "aws-smithy-runtime-api", + "aws-smithy-types 1.1.8", + "http 0.2.9", "rustc_version", "tracing", ] @@ -1017,8 +997,8 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "itoa", "matchit", @@ -1047,8 +1027,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -1124,9 +1104,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -1198,11 +1178,11 @@ dependencies = [ [[package]] name = "cached" -version = "0.44.0" +version = "0.49.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b195e4fbc4b6862bbd065b991a34750399c119797efff72492f28a5864de8700" +checksum = "8e8e463fceca5674287f32d252fb1d94083758b8709c160efae66d263e5f4eba" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.3", "instant", "once_cell", "thiserror", @@ -1210,12 +1190,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" -dependencies = [ - "libc", -] +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" [[package]] name = "cfg-if" @@ -1225,57 +1202,56 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets 0.52.5", ] [[package]] name = "clap" -version = "4.3.21" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.21" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" @@ -1291,18 +1267,18 @@ checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -1330,9 +1306,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "cookie" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", "time", @@ -1341,12 +1317,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", @@ -1398,9 +1374,9 @@ checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" [[package]] name = "crc32c" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" +checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" dependencies = [ "rustc_version", ] @@ -1451,24 +1427,24 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.44" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2 0.4.9", - "winapi", + "socket2", + "windows-sys 0.52.0", ] [[package]] name = "curl-sys" -version = "0.4.65+curl-8.2.1" +version = "0.4.72+curl-8.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" +checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea" dependencies = [ "cc", "libc", @@ -1476,7 +1452,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -1499,8 +1475,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.32", + "strsim 0.10.0", + "syn 2.0.60", ] [[package]] @@ -1511,7 +1487,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] @@ -1664,10 +1640,10 @@ dependencies = [ "humantime-serde", "hyper", "indexmap 2.2.5", - "itertools 0.11.0", + "itertools 0.12.1", "lazy_static", "maplit", - "mockall", + "mockall 0.12.1", "model", "num", "number", @@ -1762,23 +1738,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1789,7 +1754,7 @@ checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ "cfg-if", "home", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1876,7 +1841,7 @@ dependencies = [ "ethcontract-generate", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] @@ -1891,7 +1856,7 @@ dependencies = [ "ethcontract-common", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", "url", ] @@ -1903,7 +1868,7 @@ checksum = "d4ef690f92015152e4bea45f140cf08a157031008d92e6c54ecfc9b7dac3e048" dependencies = [ "ethcontract", "hex", - "mockall", + "mockall 0.11.4", "predicates 3.0.3", "rlp", ] @@ -1936,7 +1901,7 @@ dependencies = [ "hex-literal", "lazy_static", "maplit", - "mockall", + "mockall 0.12.1", "observe", "primitive-types", "prometheus", @@ -1969,9 +1934,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fixed-hash" @@ -1987,9 +1952,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -2039,9 +2004,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2060,9 +2025,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -2075,9 +2040,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2085,15 +2050,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2113,32 +2078,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" @@ -2148,9 +2113,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2172,7 +2137,7 @@ dependencies = [ "anyhow", "async-trait", "futures", - "http", + "http 0.2.9", "primitive-types", "serde", "serde_json", @@ -2227,7 +2192,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 2.2.5", "slab", "tokio", @@ -2241,12 +2206,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - [[package]] name = "hashbrown" version = "0.14.3" @@ -2276,7 +2235,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "headers-core", - "http", + "http 0.2.9", "httpdate", "mime", "sha1", @@ -2288,7 +2247,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.9", ] [[package]] @@ -2300,6 +2259,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2351,7 +2316,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2365,6 +2330,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -2372,7 +2348,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -2412,22 +2411,22 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -2440,10 +2439,10 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ - "http", + "http 0.2.9", "hyper", "log", - "rustls 0.20.8", + "rustls 0.20.9", "rustls-native-certs", "tokio", "tokio-rustls 0.23.4", @@ -2456,10 +2455,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ "futures-util", - "http", + "http 0.2.9", "hyper", "log", - "rustls 0.21.6", + "rustls 0.21.10", "rustls-native-certs", "tokio", "tokio-rustls 0.24.1", @@ -2509,20 +2508,19 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2530,9 +2528,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2613,17 +2611,6 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.2", - "rustix", - "windows-sys", -] - [[package]] name = "itertools" version = "0.10.5" @@ -2635,9 +2622,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -2727,9 +2714,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -2747,6 +2734,15 @@ version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown 0.14.3", +] + [[package]] name = "maplit" version = "1.0.2" @@ -2762,12 +2758,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matchit" version = "0.7.2" @@ -2785,9 +2775,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mime" @@ -2828,7 +2818,7 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2841,11 +2831,26 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive", + "mockall_derive 0.11.4", "predicates 2.1.5", "predicates-tree", ] +[[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive 0.12.1", + "predicates 3.0.3", + "predicates-tree", +] + [[package]] name = "mockall_derive" version = "0.11.4" @@ -2858,6 +2863,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "model" version = "0.1.0" @@ -2941,9 +2958,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" dependencies = [ "num-bigint", "num-complex", @@ -2955,9 +2972,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -2983,28 +3000,27 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -3025,9 +3041,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3091,9 +3107,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" @@ -3101,7 +3117,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -3118,7 +3134,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] @@ -3158,6 +3174,7 @@ dependencies = [ "app-data", "app-data-hash", "async-trait", + "axum", "bigdecimal", "cached", "chrono", @@ -3172,7 +3189,7 @@ dependencies = [ "humantime", "hyper", "maplit", - "mockall", + "mockall 0.12.1", "model", "multibase", "num", @@ -3257,7 +3274,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -3277,9 +3294,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" @@ -3298,14 +3315,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] name = "pin-project-lite" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3393,9 +3410,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" +checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", "impl-codec", @@ -3411,14 +3428,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.14", ] [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -3484,9 +3501,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3593,14 +3610,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -3614,15 +3631,21 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.8.3", ] +[[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + [[package]] name = "regex-syntax" version = "0.6.29" @@ -3631,15 +3654,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "async-compression", "base64 0.21.2", @@ -3650,8 +3673,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-tls", "ipnet", @@ -3662,9 +3685,12 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", "tokio-util 0.7.8", @@ -3686,11 +3712,26 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + [[package]] name = "rlp" version = "0.5.2" @@ -3746,37 +3787,37 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.7" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -3804,12 +3845,12 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -3829,7 +3870,7 @@ name = "s3" version = "0.1.0" dependencies = [ "anyhow", - "aws-config 0.56.0", + "aws-config 1.2.0", "aws-sdk-s3", "chrono", "flate2", @@ -3844,7 +3885,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3865,8 +3906,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -3918,29 +3959,29 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -3959,9 +4000,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -3980,9 +4021,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.2.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ "base64 0.21.2", "chrono", @@ -3990,6 +4031,7 @@ dependencies = [ "indexmap 1.9.3", "indexmap 2.2.5", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -3997,14 +4039,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.2.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] @@ -4076,10 +4118,10 @@ dependencies = [ "hex-literal", "humantime", "indexmap 2.2.5", - "itertools 0.11.0", + "itertools 0.12.1", "lazy_static", "maplit", - "mockall", + "mockall 0.12.1", "model", "num", "number", @@ -4139,28 +4181,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -4182,11 +4214,11 @@ dependencies = [ "hex", "hex-literal", "humantime", - "itertools 0.11.0", + "itertools 0.12.1", "jsonrpc-core", "lazy_static", "maplit", - "mockall", + "mockall 0.12.1", "model", "num", "number", @@ -4230,7 +4262,7 @@ dependencies = [ "hex", "hex-literal", "hyper", - "itertools 0.11.0", + "itertools 0.12.1", "model", "num", "observe", @@ -4381,7 +4413,7 @@ checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" dependencies = [ "dotenvy", "either", - "heck", + "heck 0.4.1", "hex", "once_cell", "proc-macro2", @@ -4408,7 +4440,7 @@ dependencies = [ "atoi", "base64 0.21.2", "bigdecimal", - "bitflags 2.3.3", + "bitflags 2.5.0", "byteorder", "bytes", "chrono", @@ -4452,7 +4484,7 @@ dependencies = [ "atoi", "base64 0.21.2", "bigdecimal", - "bitflags 2.3.3", + "bitflags 2.5.0", "byteorder", "chrono", "crc", @@ -4530,26 +4562,32 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] @@ -4571,9 +4609,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -4586,6 +4624,27 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -4594,15 +4653,14 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", + "fastrand 2.0.2", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -4622,22 +4680,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] @@ -4706,9 +4764,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -4717,20 +4775,20 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] @@ -4749,7 +4807,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "webpki", ] @@ -4760,15 +4818,15 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.6", + "rustls 0.21.10", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -4807,21 +4865,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.11", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -4831,12 +4889,23 @@ name = "toml_edit" version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.2.5", + "toml_datetime", + "winnow 0.5.4", +] + +[[package]] +name = "toml_edit" +version = "0.22.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb686a972ccef8537b39eead3968b0e8616cb5040dbb9bba93007c8e07c9215f" dependencies = [ "indexmap 2.2.5", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.6", ] [[package]] @@ -4861,12 +4930,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.5.0", "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-range-header", "pin-project-lite", "tower-layer", @@ -4888,11 +4957,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -4901,20 +4969,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -4922,20 +4990,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -5028,14 +5096,20 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -5110,7 +5184,7 @@ dependencies = [ "bytes", "futures", "headers", - "http", + "http 0.2.9", "hyper", "log", "mime", @@ -5161,7 +5235,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -5195,7 +5269,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5249,12 +5323,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -5295,7 +5369,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -5304,7 +5378,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -5313,13 +5396,29 @@ version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -5328,42 +5427,90 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[package]] name = "windows_aarch64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[package]] name = "windows_i686_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[package]] name = "windows_i686_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[package]] name = "windows_x86_64_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[package]] name = "windows_x86_64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + [[package]] name = "winnow" version = "0.5.4" @@ -5373,6 +5520,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" @@ -5380,7 +5536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5415,11 +5571,11 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.60", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/Cargo.toml b/Cargo.toml index 08ce00b771..0fbe3bb80e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,46 +3,53 @@ resolver = "2" members = ["crates/*"] [workspace.dependencies] -anyhow = "1" -async-trait = "0.1" +anyhow = "1.0.82" +async-trait = "0.1.80" +axum = "0.6" bigdecimal = "0.3" -cached = { version = "0.44", default-features = false } -chrono = { version = "0.4", default-features = false } -clap = { version = "4", features = ["derive", "env"] } -derivative = "2" +cached = { version = "0.49.3", default-features = false } +chrono = { version = "0.4.38", default-features = false } +clap = { version = "4.5.4", features = ["derive", "env"] } +derivative = "2.2.0" ethcontract = { version = "0.25.6", default-features = false, features = ["aws-kms"] } ethcontract-generate = { version = "0.25.6", default-features = false } ethcontract-mock = { version = "0.25.6", default-features = false } -ethereum-types = "0.14" -futures = "0.3" +ethereum-types = "0.14.1" +flate2 = "1.0.28" +futures = "0.3.30" gas-estimation = { git = "https://github.com/cowprotocol/gas-estimation", tag = "v0.7.3", features = ["web3_", "tokio_"] } -hex = { version = "0.4", default-features = false } -hex-literal = "0.4" +hex = { version = "0.4.3", default-features = false } +hex-literal = "0.4.1" humantime = "2.1.0" humantime-serde = "1.1.1" +hyper = "0.14.28" indexmap = "2.2.5" -itertools = "0.11" -lazy_static = "1" -maplit = "1" -mockall = "0.11" -num = "0.4" -once_cell = "1" +itertools = "0.12.1" +lazy_static = "1.4.0" +maplit = "1.0.2" +mockall = "0.12.1" +num = "0.4.2" +once_cell = "1.19.0" primitive-types = "0.12" -prometheus = "0.13" +prometheus = "0.13.3" prometheus-metric-storage = "0.5.0" -rand = "0.8" -regex = "1" -reqwest = "0.11" -secp256k1 = "0.27" -serde = { version = "1", features = ["derive"] } -serde_json = "1" -serde_with = "3" +rand = "0.8.5" +regex = "1.10.4" +reqwest = "0.11.27" +secp256k1 = "0.27.0" +serde = { version = "1.0.198", features = ["derive"] } +serde_json = "1.0.116" +serde_with = "3.7.0" sqlx = { version = "0.7", default-features = false, features = ["runtime-tokio", "tls-native-tls", "bigdecimal", "chrono", "postgres", "macros"] } -strum = { version = "0.25", features = ["derive"] } -thiserror = "1" -tokio = "1" -tracing = "0.1" -tracing-subscriber = "0.3" -url = "2" +strum = { version = "0.26.2", features = ["derive"] } +tempfile = "3.10.1" +time = { version = "0.3.25", features = ["macros"] } +thiserror = "1.0.58" +toml = "0.8.12" +tokio = "1.37.0" +tokio-stream = { version = "0.1.15", features = ["sync"] } +tracing = "0.1.40" +tracing-subscriber = "0.3.18" +url = "2.5.0" warp = { git = 'https://github.com/cowprotocol/warp.git', rev = "87a91e2", default-features = false } -web3 = { version = "0.19", default-features = false } +web3 = { version = "0.19.0", default-features = false } diff --git a/crates/app-data-hash/Cargo.toml b/crates/app-data-hash/Cargo.toml index ca5a19c984..a995b5fb0d 100644 --- a/crates/app-data-hash/Cargo.toml +++ b/crates/app-data-hash/Cargo.toml @@ -7,4 +7,4 @@ license = "MIT OR Apache-2.0" [dependencies] hex-literal = { workspace = true } -tiny-keccak = { version = "2.0", features = ["keccak"] } +tiny-keccak = { version = "2.0.2", features = ["keccak"] } diff --git a/crates/database/Cargo.toml b/crates/database/Cargo.toml index 69e45824a7..6ad32d9125 100644 --- a/crates/database/Cargo.toml +++ b/crates/database/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" [dependencies] bigdecimal = { workspace = true } chrono = { workspace = true, features = ["clock"] } -const_format = "0.2" +const_format = "0.2.32" futures = { workspace = true } hex = { workspace = true } sqlx = { workspace = true } diff --git a/crates/database/src/orders.rs b/crates/database/src/orders.rs index b6ea8d4506..d20244a6cb 100644 --- a/crates/database/src/orders.rs +++ b/crates/database/src/orders.rs @@ -1248,7 +1248,7 @@ mod tests { assert_eq!(time, order.cancellation_timestamp.unwrap()); // Cancel again and verify that cancellation timestamp was not changed. - let irrelevant_time = Utc.timestamp_opt(1234567890, 1_000_000_000).unwrap(); + let irrelevant_time = Utc.timestamp_opt(1234564319, 1_000_000_000).unwrap(); assert_ne!(irrelevant_time, time); cancel_order(&mut db, &order.uid, time).await.unwrap(); let order = read_order(&mut db, &order.uid).await.unwrap().unwrap(); diff --git a/crates/driver/Cargo.toml b/crates/driver/Cargo.toml index 55c1b5bc18..828fce5532 100644 --- a/crates/driver/Cargo.toml +++ b/crates/driver/Cargo.toml @@ -16,39 +16,39 @@ path = "src/main.rs" [dependencies] app-data = { path = "../app-data" } -async-trait = "0.1" -axum = "0.6" -bigdecimal = "0.3" -chrono = { version = "0.4", features = ["clock"], default-features = false } +async-trait = { workspace = true } +axum = { workspace = true } +bigdecimal = { workspace = true } +chrono = { workspace = true, features = ["clock"], default-features = false } derivative = { workspace = true } ethabi = "18.0" -ethereum-types = "0.14" +ethereum-types = { workspace = true } ethrpc = { path = "../ethrpc" } -futures = "0.3" -hex = "0.4" -hex-literal = "0.4" +futures = { workspace = true } +hex = { workspace = true } +hex-literal = { workspace = true } humantime = { workspace = true } humantime-serde = { workspace = true } -hyper = "0.14" +hyper = { workspace = true } lazy_static = { workspace = true } -indexmap = { version = "2", features = ["serde"] } -itertools = "0.11" -num = "0.4" +indexmap = { workspace = true, features = ["serde"] } +itertools = { workspace = true } +num = { workspace = true } number = { path = "../number" } -prometheus = "0.13" +prometheus = { workspace = true } prometheus-metric-storage = { workspace = true } -rand = "0.8" -reqwest = "0.11" -serde = "1.0" -serde_json = "1.0" -serde_with = "3.0" +rand = { workspace = true } +reqwest = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +serde_with = { workspace = true } tap = "1.0.1" -thiserror = "1.0" -tokio = { version = "1.22", features = ["macros", "rt-multi-thread", "signal", "time"] } -toml = "0.7" +thiserror = { workspace = true } +tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal", "time"] } +toml = { workspace = true } tower = "0.4" tower-http = { version = "0.4", features = ["limit", "trace"] } -url = { version = "2.3", features = ["serde"] } +url = { workspace = true, features = ["serde"] } web3 = { workspace = true, features = ["http"] } # These still use { workspace = true } because they're used at @@ -75,4 +75,4 @@ maplit = { workspace = true } mockall = { workspace = true } solvers-dto = { path = "../solvers-dto" } tokio = { workspace = true, features = ["test-util", "process"] } -tempfile = "3.4" +tempfile = { workspace = true } diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index 13d4395f4b..99371fca66 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -30,7 +30,7 @@ shared = { path = "../shared" } solver = { path = "../solver" } solvers = { path = "../solvers" } sqlx = { workspace = true } -tempfile = "3.3.0" +tempfile = { workspace = true } tokio = { workspace = true, features = ["macros", "process"] } tracing = { workspace = true } warp = { workspace = true } diff --git a/crates/e2e/src/api/zeroex.rs b/crates/e2e/src/api/zeroex.rs index 3c900cb662..4c1698a7c1 100644 --- a/crates/e2e/src/api/zeroex.rs +++ b/crates/e2e/src/api/zeroex.rs @@ -92,7 +92,7 @@ impl Eip712TypedZeroExOrder { }, order: Order { chain_id, - expiry: NaiveDateTime::MAX.timestamp() as u64, + expiry: NaiveDateTime::MAX.and_utc().timestamp() as u64, fee_recipient: self.fee_recipient, maker: self.maker, maker_token: self.maker_token, diff --git a/crates/e2e/tests/e2e/liquidity.rs b/crates/e2e/tests/e2e/liquidity.rs index 465c161b77..fa15cc5ef6 100644 --- a/crates/e2e/tests/e2e/liquidity.rs +++ b/crates/e2e/tests/e2e/liquidity.rs @@ -223,7 +223,7 @@ async fn zero_ex_liquidity(web3: Web3) { sender: Default::default(), fee_recipient: zeroex.address(), pool: H256::default(), - expiry: NaiveDateTime::MAX.timestamp() as u64, + expiry: NaiveDateTime::MAX.and_utc().timestamp() as u64, salt: U256::from(Utc::now().timestamp()), } .to_order_record(chain_id, zeroex.address(), zeroex_maker); @@ -263,7 +263,7 @@ fn create_zeroex_liquidity_orders( sender: Default::default(), fee_recipient: zeroex_addr, pool: H256::default(), - expiry: NaiveDateTime::MAX.timestamp() as u64, + expiry: NaiveDateTime::MAX.and_utc().timestamp() as u64, salt: U256::from(Utc::now().timestamp()), }; let usdt_weth_order = Eip712TypedZeroExOrder { @@ -280,7 +280,7 @@ fn create_zeroex_liquidity_orders( sender: Default::default(), fee_recipient: zeroex_addr, pool: H256::default(), - expiry: NaiveDateTime::MAX.timestamp() as u64, + expiry: NaiveDateTime::MAX.and_utc().timestamp() as u64, salt: U256::from(Utc::now().timestamp()), }; let usdc_weth_order = Eip712TypedZeroExOrder { @@ -297,7 +297,7 @@ fn create_zeroex_liquidity_orders( sender: Default::default(), fee_recipient: zeroex_addr, pool: H256::default(), - expiry: NaiveDateTime::MAX.timestamp() as u64, + expiry: NaiveDateTime::MAX.and_utc().timestamp() as u64, salt: U256::from(Utc::now().timestamp()), }; [typed_order, usdt_weth_order, usdc_weth_order] diff --git a/crates/ethrpc/Cargo.toml b/crates/ethrpc/Cargo.toml index e2013dc9b4..bd86e5e583 100644 --- a/crates/ethrpc/Cargo.toml +++ b/crates/ethrpc/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] anyhow = { workspace = true } -async-trait = { workspace= true } +async-trait = { workspace = true } ethereum-types = { workspace = true } futures = { workspace = true } hex = { workspace = true } @@ -24,11 +24,11 @@ primitive-types = { workspace = true } prometheus = { workspace = true } prometheus-metric-storage = { workspace = true } reqwest = { workspace = true, features = ["cookies"] } -scopeguard = "1" +scopeguard = "1.2.0" serde = { workspace = true } serde_json = { workspace = true } tokio = { workspace = true, features = [] } -tokio-stream = { version = "0.1", features = ["sync"] } +tokio-stream = { workspace = true } web3 = { workspace = true } contracts = { path = "../contracts" } ethcontract = { workspace = true } diff --git a/crates/model/src/order.rs b/crates/model/src/order.rs index 1e141afa9a..85810aaca5 100644 --- a/crates/model/src/order.rs +++ b/crates/model/src/order.rs @@ -24,7 +24,7 @@ use { fmt::{self, Debug, Display}, str::FromStr, }, - strum::{AsRefStr, EnumString, EnumVariantNames}, + strum::{AsRefStr, EnumString, VariantNames}, web3::signing::{self, Key, SecretKeyRef}, }; @@ -875,7 +875,7 @@ pub enum OrderKind { Hash, EnumString, AsRefStr, - EnumVariantNames, + VariantNames, )] #[strum(ascii_case_insensitive)] #[serde(tag = "class", rename_all = "lowercase")] diff --git a/crates/observe/Cargo.toml b/crates/observe/Cargo.toml index 4ae1864f4d..47b7853fb9 100644 --- a/crates/observe/Cargo.toml +++ b/crates/observe/Cargo.toml @@ -9,10 +9,10 @@ license = "MIT OR Apache-2.0" atty = "0.2.14" futures = { workspace = true } once_cell = { workspace = true } -pin-project-lite = "0.2" +pin-project-lite = "0.2.14" prometheus = { workspace = true } prometheus-metric-storage = { workspace = true } -time = { version = "0.3", features = ["macros"] } +time = { workspace = true } tokio = { workspace = true, features = [] } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter", "fmt", "time"] } diff --git a/crates/orderbook/Cargo.toml b/crates/orderbook/Cargo.toml index 8ecd243303..a4a99319eb 100644 --- a/crates/orderbook/Cargo.toml +++ b/crates/orderbook/Cargo.toml @@ -16,6 +16,7 @@ name = "orderbook" path = "src/main.rs" [dependencies] +axum = { workspace = true } anyhow = { workspace = true } app-data = { path = "../app-data" } app-data-hash = { path = "../app-data-hash" } @@ -32,7 +33,7 @@ gas-estimation = { workspace = true } hex = { workspace = true } hex-literal = { workspace = true } humantime = { workspace = true } -hyper = "0.14" +hyper = { workspace = true } maplit = { workspace = true } model = { path = "../model" } multibase = "0.9" diff --git a/crates/s3/Cargo.toml b/crates/s3/Cargo.toml index cbaa32ecc5..bf96ec81de 100644 --- a/crates/s3/Cargo.toml +++ b/crates/s3/Cargo.toml @@ -7,9 +7,9 @@ license = "MIT OR Apache-2.0" [dependencies] anyhow = { workspace = true } -aws-config = { version ="0.56" } -aws-sdk-s3 = { version = "0.29", default-features = false, features = ["rustls", "rt-tokio"] } -flate2 = "1.0" +aws-config = { version = "1.2.0", features = ["behavior-version-latest"] } +aws-sdk-s3 = { version = "1.23.0", default-features = false, features = ["rustls", "rt-tokio"] } +flate2 = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/crates/s3/src/lib.rs b/crates/s3/src/lib.rs index 7680eaa05d..197a196e0d 100644 --- a/crates/s3/src/lib.rs +++ b/crates/s3/src/lib.rs @@ -27,7 +27,7 @@ impl Uploader { let uploader = Self { bucket: config.bucket, filename_prefix: config.filename_prefix, - client: Client::new(&aws_config::load_from_env().await), + client: Client::new(&aws_config::from_env().load().await), }; uploader.assert_credentials_are_usable().await; uploader diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml index 7b82f57cb1..de82138f11 100644 --- a/crates/shared/Cargo.toml +++ b/crates/shared/Cargo.toml @@ -23,8 +23,8 @@ database = { path = "../database" } delay_map = "0.3" derivative = { workspace = true } ethcontract = { workspace = true } -ethrpc = { path = "../ethrpc"} -flate2 = "1" +ethrpc = { path = "../ethrpc" } +flate2 = { workspace = true } futures = { workspace = true } gas-estimation = { workspace = true } observe = { path = "../observe" } @@ -51,9 +51,9 @@ serde_json = { workspace = true } serde_with = { workspace = true } strum = { workspace = true } thiserror = { workspace = true } -time = { version = "0.3", features = ["macros"] } +time = { workspace = true } tokio = { workspace = true, features = ["macros", "time"] } -tokio-stream = { version = "0.1", features = ["sync"] } +tokio-stream = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter", "fmt", "time"] } url = { workspace = true } @@ -61,8 +61,8 @@ warp = { workspace = true } web3 = { workspace = true } [dev-dependencies] -async-stream = "0.3" -tempfile = "3.4" +async-stream = "0.3.5" +tempfile = { workspace = true } ethcontract-mock = { workspace = true } regex = { workspace = true } testlib = { path = "../testlib" } diff --git a/crates/shared/src/zeroex_api.rs b/crates/shared/src/zeroex_api.rs index 0a49a5dd8e..1cb85d9701 100644 --- a/crates/shared/src/zeroex_api.rs +++ b/crates/shared/src/zeroex_api.rs @@ -213,7 +213,7 @@ pub struct Order { pub chain_id: u64, /// Timestamp in seconds of when the order expires. Expired orders cannot be /// filled. - #[derivative(Default(value = "NaiveDateTime::MAX.timestamp() as u64"))] + #[derivative(Default(value = "NaiveDateTime::MAX.and_utc().timestamp() as u64"))] #[serde_as(as = "DisplayFromStr")] pub expiry: u64, /// The address of the entity that will receive any fees stipulated by the @@ -764,7 +764,7 @@ mod tests { "003427369d4c2a6b0aceeb7b315bb9a6086bc6fc4c887aa51efc73b662c9d127" ).unwrap(), remaining_fillable_taker_amount: 262467000000000000u128, - created_at: DateTime::from_utc(NaiveDate::from_ymd_opt(2022, 2, 26).unwrap().and_hms_nano_opt(6, 59, 0, 440_000_000).unwrap(), Utc), + created_at: DateTime::from_naive_utc_and_offset(NaiveDate::from_ymd_opt(2022, 2, 26).unwrap().and_hms_nano_opt(6, 59, 0, 440_000_000).unwrap(), Utc), }, order: Order { chain_id: 1u64, diff --git a/crates/solver/Cargo.toml b/crates/solver/Cargo.toml index ab455c124a..f4c96dd946 100644 --- a/crates/solver/Cargo.toml +++ b/crates/solver/Cargo.toml @@ -19,7 +19,7 @@ contracts = { path = "../contracts" } derivative = { workspace = true } ethcontract = { workspace = true } ethrpc = { path = "../ethrpc" } -flate2 = "1.0" +flate2 = { workspace = true } futures = { workspace = true } gas-estimation = { workspace = true } observe = { path = "../observe" } diff --git a/crates/solver/src/liquidity.rs b/crates/solver/src/liquidity.rs index 3545672c02..f230f49762 100644 --- a/crates/solver/src/liquidity.rs +++ b/crates/solver/src/liquidity.rs @@ -33,11 +33,11 @@ use { }, }, std::{collections::BTreeMap, sync::Arc}, - strum::{EnumVariantNames, IntoStaticStr}, + strum::IntoStaticStr, }; /// Defines the different types of liquidity our solvers support -#[derive(Clone, IntoStaticStr, EnumVariantNames, Debug)] +#[derive(Clone, IntoStaticStr, Debug)] #[cfg_attr(test, derive(PartialEq))] pub enum Liquidity { ConstantProduct(ConstantProductOrder), diff --git a/crates/solvers/Cargo.toml b/crates/solvers/Cargo.toml index ea6b4ced31..13826b32e2 100644 --- a/crates/solvers/Cargo.toml +++ b/crates/solvers/Cargo.toml @@ -13,29 +13,29 @@ name = "solvers" path = "src/main.rs" [dependencies] -axum = "0.6" +axum = { workspace = true } bigdecimal = { version = "0.3", features = ["serde"] } -chrono = { version = "0.4", features = ["serde"], default-features = false } -clap = { version = "4", features = ["derive", "env"] } -ethereum-types = "0.14" +chrono = { workspace = true, features = ["serde"], default-features = false } +clap = { workspace = true, features = ["derive", "env"] } +ethereum-types = { workspace = true } ethrpc = { path = "../ethrpc" } -futures = "0.3" -hex = "0.4" -hyper = "0.14" -itertools = "0.11" -num = "0.4" +futures = { workspace = true } +hex = { workspace = true } +hyper = { workspace = true } +itertools = { workspace = true } +num = { workspace = true } prometheus = { workspace = true } prometheus-metric-storage = { workspace = true } rate-limit = { path = "../rate-limit" } -reqwest = "0.11" +reqwest = { workspace = true } s3 = { path = "../s3" } -serde = "1" -serde_json = "1" -serde_with = "3" +serde = { workspace = true } +serde_json = { workspace = true } +serde_with = { workspace = true } solvers-dto = { path = "../solvers-dto" } -thiserror = "1" -tokio = { version = "1", features = ["macros", "rt-multi-thread", "signal", "time"] } -toml = "0.7" +thiserror = { workspace = true } +tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal", "time"] } +toml = { workspace = true } tower = "0.4" tower-http = { version = "0.4", features = ["limit", "trace"] } web3 = { workspace = true } @@ -52,6 +52,6 @@ tracing = { workspace = true } [dev-dependencies] glob = "0.3" -tempfile = "3" +tempfile = { workspace = true } hex-literal = { workspace = true } ethcontract = { workspace = true }