From 0412efdcef961741c392e58fbbef33dfb4555c84 Mon Sep 17 00:00:00 2001 From: Jernej Kos Date: Tue, 5 Mar 2024 09:40:41 +0100 Subject: [PATCH] Bump Rust toolchain to 2024-03-04, update dependencies --- .cargo/{config => config.toml} | 0 .changelog/5513.internal.md | 2 +- .changelog/5583.internal.md | 1 + Cargo.lock | 1139 +++++++++-------- docker/oasis-core-dev/Dockerfile | 6 +- keymanager/src/churp/errors.rs | 1 - keymanager/src/churp/handler.rs | 1 - keymanager/src/policy/global.rs | 5 +- keymanager/src/runtime/secrets.rs | 2 +- runtime/Cargo.toml | 12 +- runtime/src/common/crypto/mrae/nonce.rs | 1 + runtime/src/common/crypto/signature.rs | 2 +- runtime/src/common/crypto/x25519.rs | 1 - runtime/src/common/logger.rs | 4 +- runtime/src/common/sgx/ias.rs | 7 +- runtime/src/common/sgx/pcs.rs | 32 +- runtime/src/consensus/address.rs | 14 +- runtime/src/consensus/roothash/block.rs | 2 - .../consensus/roothash/commitment/executor.rs | 2 - runtime/src/consensus/roothash/message.rs | 9 +- runtime/src/consensus/state/keymanager.rs | 4 +- .../src/consensus/state/keymanager/churp.rs | 11 +- runtime/src/consensus/state/registry.rs | 7 +- runtime/src/consensus/state/roothash.rs | 9 +- runtime/src/enclave_rpc/client.rs | 2 - runtime/src/enclave_rpc/session.rs | 1 - runtime/src/identity.rs | 2 - runtime/src/init.rs | 1 - runtime/src/storage/mkvs/cache/lru_cache.rs | 23 +- runtime/src/storage/mkvs/cache/mod.rs | 17 +- .../storage/mkvs/interop/protocol_server.rs | 2 +- runtime/src/storage/mkvs/sync/host.rs | 4 +- runtime/src/storage/mkvs/sync/mod.rs | 14 +- runtime/src/storage/mkvs/sync/noop.rs | 4 +- runtime/src/storage/mkvs/sync/proof.rs | 1 - runtime/src/storage/mkvs/sync/stats.rs | 2 +- runtime/src/storage/mkvs/sync/test.rs | 4 +- runtime/src/storage/mkvs/tests/mod.rs | 3 +- runtime/src/storage/mkvs/tree/commit.rs | 5 +- runtime/src/storage/mkvs/tree/insert.rs | 5 +- runtime/src/storage/mkvs/tree/iterator.rs | 13 +- runtime/src/storage/mkvs/tree/lookup.rs | 6 +- runtime/src/storage/mkvs/tree/marshal.rs | 8 +- runtime/src/storage/mkvs/tree/node.rs | 25 +- runtime/src/storage/mkvs/tree/node_test.rs | 7 +- runtime/src/storage/mkvs/tree/overlay.rs | 8 +- runtime/src/storage/mkvs/tree/prefetch.rs | 7 +- runtime/src/storage/mkvs/tree/remove.rs | 7 +- runtime/src/storage/mkvs/tree/tree_test.rs | 14 +- rust-toolchain.toml | 2 +- secret-sharing/src/vss/matrix.rs | 1 - secret-sharing/src/vss/polynomial.rs | 1 - tools/src/cargo.rs | 1 - tools/src/lib.rs | 3 - 54 files changed, 755 insertions(+), 712 deletions(-) rename .cargo/{config => config.toml} (100%) create mode 100644 .changelog/5583.internal.md diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/.changelog/5513.internal.md b/.changelog/5513.internal.md index 528c264e405..d869776d7c6 100644 --- a/.changelog/5513.internal.md +++ b/.changelog/5513.internal.md @@ -1 +1 @@ -Bump Rust toolchain to 2024-01-08 +Bump Rust toolchain to 2024-03-04 diff --git a/.changelog/5583.internal.md b/.changelog/5583.internal.md new file mode 100644 index 00000000000..d869776d7c6 --- /dev/null +++ b/.changelog/5583.internal.md @@ -0,0 +1 @@ +Bump Rust toolchain to 2024-03-04 diff --git a/Cargo.lock b/Cargo.lock index b50a8f425c1..ce6d58a84ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -29,9 +29,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if 1.0.0", "cipher", @@ -73,20 +73,21 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -117,51 +118,50 @@ 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", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -172,18 +172,18 @@ checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arbitrary" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" dependencies = [ "derive_arbitrary", ] [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" [[package]] name = "asn1-rs" @@ -198,7 +198,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.25", + "time 0.3.34", ] [[package]] @@ -207,8 +207,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", "synstructure", ] @@ -219,20 +219,20 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[package]] @@ -243,9 +243,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -286,9 +286,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bech32" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" +checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" [[package]] name = "bincode" @@ -313,12 +313,12 @@ dependencies = [ "log", "peeking_take_while", "prettyplease", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "regex", "rustc-hash", "shlex", - "syn 2.0.29", + "syn 2.0.52", "which", ] @@ -342,9 +342,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "blake2" @@ -375,15 +375,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -403,21 +403,18 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.0.82" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" -dependencies = [ - "libc", -] +checksum = "a0ba8f7aaa012f30d5b2861462f6708eccd49c3c39863fe083a308035f63d723" [[package]] name = "cexpr" @@ -466,17 +463,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi 0.3.9", + "windows-targets 0.52.4", ] [[package]] @@ -492,41 +488,41 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading 0.8.2", ] [[package]] name = "clap" -version = "4.3.21" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" +checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.21" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" +checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.0", ] [[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 = "cmake" @@ -545,9 +541,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "contracts" @@ -555,22 +551,22 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1d1429e3bd78171c65aa010eabcdf8f863ba3254728dbfb0ad4b1545beac15c" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -595,7 +591,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "crossbeam-channel 0.5.11", + "crossbeam-channel 0.5.12", "crossbeam-deque 0.8.5", "crossbeam-epoch 0.9.18", "crossbeam-queue 0.3.11", @@ -614,9 +610,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils 0.8.19", ] @@ -756,9 +752,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -766,20 +762,20 @@ dependencies = [ "digest 0.10.7", "fiat-crypto", "platforms", - "rustc_version 0.4.0", + "rustc_version", "subtle", "zeroize", ] [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[package]] @@ -813,9 +809,9 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.66", - "quote 1.0.33", - "strsim", + "proc-macro2 1.0.78", + "quote 1.0.35", + "strsim 0.10.0", "syn 1.0.109", ] @@ -826,15 +822,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", - "quote 1.0.33", + "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "dcap-ql" @@ -845,7 +841,7 @@ dependencies = [ "byteorder", "failure", "lazy_static", - "mbedtls 0.9.1", + "mbedtls 0.9.3", "num", "num-derive 0.2.5", "num-traits", @@ -884,26 +880,29 @@ dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", "rusticata-macros", ] [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derive_arbitrary" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[package]] @@ -912,8 +911,8 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] @@ -944,9 +943,9 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[package]] @@ -959,7 +958,7 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature 2.0.0", + "signature 2.2.0", "spki", ] @@ -974,12 +973,12 @@ dependencies = [ [[package]] name = "ed25519" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", - "signature 2.0.0", + "signature 2.2.0", ] [[package]] @@ -997,30 +996,31 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.0.0", - "ed25519 2.2.2", + "curve25519-dalek 4.1.2", + "ed25519 2.2.3", "rand_core 0.6.4", "serde", - "sha2 0.10.7", - "signature 2.0.0", + "sha2 0.10.8", + "signature 2.2.0", + "subtle", "zeroize", ] [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elliptic-curve" -version = "0.13.7" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9775b22bc152ad86a0cf23f0f348b884b26add12bf741e7ffc4d4ab2ab4d205" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", @@ -1048,7 +1048,7 @@ dependencies = [ "failure_derive", "fnv", "fortanix-sgx-abi", - "futures 0.3.28", + "futures 0.3.30", "ipc-queue", "lazy_static", "libc", @@ -1068,30 +1068,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "eyre" -version = "0.6.8" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -1113,17 +1102,17 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", "synstructure", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "ff" @@ -1137,9 +1126,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" [[package]] name = "flex-error" @@ -1174,9 +1163,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", ] @@ -1211,9 +1200,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[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", @@ -1226,9 +1215,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", @@ -1236,15 +1225,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", @@ -1253,38 +1242,38 @@ 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 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[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-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 0.1.31", "futures-channel", @@ -1294,7 +1283,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.12", + "pin-project-lite 0.2.13", "pin-utils", "slab", "tokio-io", @@ -1324,9 +1313,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1337,9 +1326,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", "polyval", @@ -1347,9 +1336,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -1383,16 +1372,16 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "729f9bd3449d77e7831a18abfb7ba2f99ee813dfd15b8c2167c9a54ba20aa99d" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "half" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" [[package]] name = "hashbrown" @@ -1405,15 +1394,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1439,6 +1428,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "honggfuzz" version = "0.5.55" @@ -1448,21 +1446,21 @@ dependencies = [ "arbitrary", "lazy_static", "memmap2", - "rustc_version 0.4.0", + "rustc_version", ] [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1482,9 +1480,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[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", @@ -1496,8 +1494,8 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] @@ -1509,12 +1507,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.0.0" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] @@ -1553,17 +1551,6 @@ dependencies = [ "fortanix-sgx-abi", ] -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - [[package]] name = "itertools" version = "0.10.5" @@ -1575,15 +1562,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1626,9 +1613,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -1642,31 +1629,31 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "2caa5afb8bf9f3a2652760ce7d4f62d21c4d5a423e68466fca30df82f2330164" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", + "windows-targets 0.52.4", ] [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[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" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1674,9 +1661,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru" @@ -1695,9 +1682,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "mbedtls" -version = "0.8.3" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4cdd74b4f7c633899ce071acfd307b053ccab39b7ca1ffac6900ed39a050e85" +checksum = "a3a846b1d4b990bc3d900554a12528dfe4b3ab920eac016ee5b314aef4f8e4a9" dependencies = [ "bitflags 1.3.2", "byteorder", @@ -1706,7 +1693,6 @@ dependencies = [ "mbedtls-platform-support", "mbedtls-sys-auto", "rs-libc", - "rustc_version 0.2.3", "serde", "serde_derive", "yasna 0.2.2", @@ -1714,9 +1700,9 @@ dependencies = [ [[package]] name = "mbedtls" -version = "0.9.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f2c88dbe2fcc6fddc0dc33eb2694471fef46f48b2081996335adb2f8085c53" +checksum = "8730cf71e8d79ba70b3b7986af7af7629c0c4ee58b59e4a2e30d855cc31552e8" dependencies = [ "bitflags 1.3.2", "byteorder", @@ -1732,9 +1718,9 @@ dependencies = [ [[package]] name = "mbedtls-platform-support" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85be113c8c2dc54cc6a5fba20130c7128f78dcb3ed0bb6797427333fa8cdb54d" +checksum = "be354d52c70402fbfb37bad9ae2aa99ab52af79f37423cb9d6c41c8fb863abc7" dependencies = [ "cc", "cfg-if 1.0.0", @@ -1744,9 +1730,9 @@ dependencies = [ [[package]] name = "mbedtls-sys-auto" -version = "2.28.3" +version = "2.28.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe62c26febfff31e5ece6c342e20b1b356fbbf5a5c112f781bee30ae6381499" +checksum = "11bb8ccdfd2a163117d977677665a2008fbd9ab38c884b0b8a57828219868dc0" dependencies = [ "bindgen", "cc", @@ -1754,15 +1740,15 @@ dependencies = [ "cmake", "lazy_static", "libc", - "quote 1.0.33", + "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -1799,9 +1785,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -1827,13 +1813,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1954,9 +1940,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", @@ -1990,6 +1976,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.2.5" @@ -2007,26 +1999,25 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] [[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", @@ -2047,9 +2038,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", @@ -2087,8 +2078,8 @@ dependencies = [ "darling", "oasis-cbor-value", "proc-macro-crate", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] @@ -2105,7 +2096,7 @@ dependencies = [ "anyhow", "async-trait", "base64", - "futures 0.3.28", + "futures 0.3.30", "lazy_static", "lru", "oasis-cbor", @@ -2119,8 +2110,8 @@ dependencies = [ "sp800-185", "thiserror", "tiny-keccak 2.0.2", - "tokio 1.32.0", - "x25519-dalek 2.0.0", + "tokio 1.36.0", + "x25519-dalek 2.0.1", "zeroize", ] @@ -2138,11 +2129,11 @@ dependencies = [ "byteorder", "chrono", "crossbeam 0.8.4", - "curve25519-dalek 4.0.0", + "curve25519-dalek 4.1.2", "dcap-ql", "deoxysii", "ed25519-dalek", - "futures 0.3.28", + "futures 0.3.30", "hmac", "honggfuzz", "impl-trait-for-tuples", @@ -2151,8 +2142,8 @@ dependencies = [ "lazy_static", "log", "lru", - "mbedtls 0.8.3", - "num-bigint 0.4.3", + "mbedtls 0.12.3", + "num-bigint 0.4.4", "num-traits", "oasis-cbor", "oid-registry", @@ -2163,7 +2154,7 @@ dependencies = [ "serde", "serde_json", "sgx-isa", - "sha2 0.10.7", + "sha2 0.10.8", "slog", "slog-json", "slog-scope", @@ -2178,8 +2169,8 @@ dependencies = [ "tendermint-testgen", "thiserror", "tiny-keccak 2.0.2", - "tokio 1.32.0", - "x25519-dalek 2.0.0", + "tokio 1.36.0", + "x25519-dalek 2.0.1", "x509-parser", "yasna 0.5.2", "zeroize", @@ -2193,7 +2184,7 @@ dependencies = [ "anyhow", "clap", "enclave-runner", - "futures 0.3.28", + "futures 0.3.30", "sgxs-loaders", "tokio 0.2.25", ] @@ -2207,14 +2198,14 @@ dependencies = [ "clap", "serde", "thiserror", - "toml 0.8.2", + "toml 0.8.10", ] [[package]] name = "object" -version = "0.31.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -2230,23 +2221,23 @@ 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 = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -2261,16 +2252,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -2287,7 +2278,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -2299,7 +2290,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -2314,15 +2305,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2354,8 +2345,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c" dependencies = [ "peg-runtime", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", ] [[package]] @@ -2375,28 +2366,28 @@ 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" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[package]] @@ -2407,9 +2398,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2440,15 +2431,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.0.2" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "poly1305" @@ -2463,9 +2454,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -2473,6 +2464,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2481,12 +2478,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.2.12" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ - "proc-macro2 1.0.66", - "syn 2.0.29", + "proc-macro2 1.0.78", + "syn 2.0.52", ] [[package]] @@ -2505,7 +2502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit 0.19.14", + "toml_edit 0.19.15", ] [[package]] @@ -2519,9 +2516,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -2532,7 +2529,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "prost-derive", ] @@ -2544,8 +2541,8 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] @@ -2606,11 +2603,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.78", ] [[package]] @@ -2649,23 +2646,23 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.12", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -2675,9 +2672,9 @@ 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", @@ -2686,9 +2683,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rfc6979" @@ -2712,9 +2709,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ "const-oid", "digest 0.10.7", @@ -2724,7 +2721,7 @@ dependencies = [ "pkcs1", "pkcs8", "rand_core 0.6.4", - "signature 2.0.0", + "signature 2.2.0", "spki", "subtle", "zeroize", @@ -2748,22 +2745,13 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver", ] [[package]] @@ -2777,22 +2765,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -2837,39 +2825,24 @@ dependencies = [ [[package]] name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.183" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] @@ -2886,20 +2859,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -2908,13 +2881,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[package]] @@ -2982,9 +2955,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -3014,9 +2987,9 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "signature" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core 0.6.4", @@ -3049,15 +3022,15 @@ dependencies = [ "oasis-core-tools", "simple-keymanager", "thiserror", - "tokio 1.32.0", + "tokio 1.36.0", "x25519-dalek 1.1.1", ] [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -3077,7 +3050,7 @@ dependencies = [ "serde", "serde_json", "slog", - "time 0.3.25", + "time 0.3.34", ] [[package]] @@ -3104,9 +3077,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "snow" @@ -3117,21 +3090,21 @@ dependencies = [ "aes-gcm", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0", + "curve25519-dalek 4.1.2", "rand_core 0.6.4", - "rustc_version 0.4.0", - "sha2 0.10.7", + "rustc_version", + "sha2 0.10.8", "subtle", ] [[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]] @@ -3152,9 +3125,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -3172,6 +3145,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + [[package]] name = "subtle" version = "2.5.0" @@ -3210,19 +3189,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.29" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "unicode-ident", ] @@ -3232,23 +3211,22 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", "unicode-xid 0.2.4", ] [[package]] name = "tempfile" -version = "3.7.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", "fastrand", - "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -3257,12 +3235,12 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b90c3c1e32352551f0f1639ce765e4c66ce250c733d4b9ba1aff81130437465c" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "digest 0.10.7", "ed25519 1.5.3", "ed25519-consensus", "flex-error", - "futures 0.3.28", + "futures 0.3.30", "num-traits", "once_cell", "prost", @@ -3271,12 +3249,12 @@ dependencies = [ "serde_bytes", "serde_json", "serde_repr", - "sha2 0.10.7", + "sha2 0.10.8", "signature 1.6.4", "subtle", "subtle-encoding", "tendermint-proto", - "time 0.3.25", + "time 0.3.34", "zeroize", ] @@ -3304,7 +3282,7 @@ dependencies = [ "crossbeam-channel 0.4.4", "derive_more", "flex-error", - "futures 0.3.28", + "futures 0.3.30", "serde", "serde_cbor", "serde_derive", @@ -3312,7 +3290,7 @@ dependencies = [ "tendermint", "tendermint-light-client-verifier", "tendermint-rpc", - "time 0.3.25", + "time 0.3.34", ] [[package]] @@ -3325,7 +3303,7 @@ dependencies = [ "flex-error", "serde", "tendermint", - "time 0.3.25", + "time 0.3.34", ] [[package]] @@ -3334,7 +3312,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e553ed65874c3f35a71eb60d255edfea956274b5af37a0297d54bba039fe45e3" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "flex-error", "num-derive 0.3.3", "num-traits", @@ -3343,7 +3321,7 @@ dependencies = [ "serde", "serde_bytes", "subtle-encoding", - "time 0.3.25", + "time 0.3.34", ] [[package]] @@ -3352,9 +3330,9 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d79bd426571d6a805be5c0b6749707ede6c6ee5e55dd45baef46857a1baa9f54" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "flex-error", - "getrandom 0.2.10", + "getrandom 0.2.12", "peg", "pin-project", "serde", @@ -3365,7 +3343,7 @@ dependencies = [ "tendermint", "tendermint-config", "thiserror", - "time 0.3.25", + "time 0.3.34", "url", "uuid", "walkdir", @@ -3384,27 +3362,27 @@ dependencies = [ "simple-error", "tempfile", "tendermint", - "time 0.3.25", + "time 0.3.34", ] [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[package]] @@ -3420,12 +3398,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.25" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -3433,16 +3413,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -3505,21 +3486,21 @@ dependencies = [ [[package]] name = "tokio" -version = "1.32.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", - "bytes 1.4.0", + "bytes 1.5.0", "libc", - "mio 0.8.8", + "mio 0.8.11", "num_cpus", "parking_lot", - "pin-project-lite 0.2.12", + "pin-project-lite 0.2.13", "signal-hook-registry", "socket2", - "tokio-macros 2.1.0", - "windows-sys", + "tokio-macros 2.2.0", + "windows-sys 0.48.0", ] [[package]] @@ -3539,20 +3520,20 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] [[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 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[package]] @@ -3566,72 +3547,72 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.6", ] [[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", ] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -3669,9 +3650,9 @@ dependencies = [ [[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", @@ -3710,9 +3691,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3738,9 +3719,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -3748,57 +3729,58 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.33", + "quote 1.0.35", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix", ] [[package]] @@ -3831,9 +3813,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi 0.3.9", ] @@ -3845,12 +3827,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.4", ] [[package]] @@ -3859,71 +3841,146 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[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.4", ] [[package]] name = "windows-targets" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1eeca1c172a285ee6c2c84c341ccea837e7c01b12fbb2d0fe3c9e550ce49ec8" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10d0c968ba7f6166195e13d593af609ec2e3d24f916f081690695cf5eaffb2f" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571d8d4e62f26d4932099a9efe89660e8bd5087775a2ab5cdd8b747b811f1058" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2229ad223e178db5fbbc8bd8d3835e51e566b8474bfca58d2e6150c48bb723cd" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.48.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600956e2d840c194eedfc5d18f8242bc2e17c7775b6684488af3a9fff6fe3287" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.48.2" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea99ff3f8b49fb7a8e0d305e5aec485bd068c2ba691b6e277d29eaeac945868a" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1a05a1ece9a7a0d5a7ccf30ba2c33e3a61a30e042ffd247567d1de1d94120d" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d419259aba16b663966e29e6d7c6ecfa0bb8425818bb96f6f1f3c3eb71a6e7b9" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.12" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83817bbecf72c73bad717ee86820ebf286203d2e04c3951f3cd538869c897364" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -3951,11 +4008,11 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.0.0", + "curve25519-dalek 4.1.2", "rand_core 0.6.4", "serde", "zeroize", @@ -3975,7 +4032,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.25", + "time 0.3.34", ] [[package]] @@ -4004,14 +4061,34 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "num-bigint 0.4.3", + "num-bigint 0.4.4", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] [[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" dependencies = [ "zeroize_derive", ] @@ -4022,7 +4099,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.52", ] diff --git a/docker/oasis-core-dev/Dockerfile b/docker/oasis-core-dev/Dockerfile index 64c0c570fcd..0645808237e 100644 --- a/docker/oasis-core-dev/Dockerfile +++ b/docker/oasis-core-dev/Dockerfile @@ -10,7 +10,7 @@ ARG GOLANGCILINT_VERSION=1.56.1 ARG GOCOVMERGE_VERSION=b5bfa59ec0adc420475f97f89b58045c721d761c ARG GOFUMPT_VERSION=v0.6.0 ARG GOIMPORTS_VERSION=v0.18.0 -ARG RUST_NIGHTLY_VERSION=2024-01-08 +ARG RUST_NIGHTLY_VERSION=2024-03-04 ARG JEMALLOC_VERSION=5.2.1 ARG JEMALLOC_CHECKSUM=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6 @@ -52,8 +52,8 @@ RUN curl "https://sh.rustup.rs" -sfo rustup.sh && \ sh rustup.sh -y --default-toolchain nightly-${RUST_NIGHTLY_VERSION} && \ rustup target add x86_64-fortanix-unknown-sgx && \ rustup component add rustfmt && \ - cargo install --git https://github.com/fortanix/rust-sgx --rev c9028cffb8d80fe325f10eefb26f1f912c235c21 fortanix-sgx-tools && \ - cargo install --git https://github.com/fortanix/rust-sgx --rev c9028cffb8d80fe325f10eefb26f1f912c235c21 sgxs-tools && \ + cargo install --git https://github.com/fortanix/rust-sgx --rev e2f677b28e2a934bc3b3d20cc201962f0bf556b3 fortanix-sgx-tools && \ + cargo install --git https://github.com/fortanix/rust-sgx --rev e2f677b28e2a934bc3b3d20cc201962f0bf556b3 sgxs-tools && \ cargo install cargo-audit # Install Go and utilities. diff --git a/keymanager/src/churp/errors.rs b/keymanager/src/churp/errors.rs index fed47b3dd8a..7fc63b2a7d4 100644 --- a/keymanager/src/churp/errors.rs +++ b/keymanager/src/churp/errors.rs @@ -1,5 +1,4 @@ //! CHURP errors. -use thiserror; /// CHURP error. #[derive(thiserror::Error, Debug)] diff --git a/keymanager/src/churp/handler.rs b/keymanager/src/churp/handler.rs index 8e3208c42f1..6a25f024ce2 100644 --- a/keymanager/src/churp/handler.rs +++ b/keymanager/src/churp/handler.rs @@ -12,7 +12,6 @@ use rand::rngs::OsRng; use sp800_185::KMac; use oasis_core_runtime::{ - self, common::{ crypto::signature::{PublicKey, Signer}, namespace::Namespace, diff --git a/keymanager/src/policy/global.rs b/keymanager/src/policy/global.rs index 22c67d7af54..7a338ea926e 100644 --- a/keymanager/src/policy/global.rs +++ b/keymanager/src/policy/global.rs @@ -3,10 +3,7 @@ use std::sync::{Mutex, Once}; use anyhow::Result; use lazy_static::lazy_static; -use oasis_core_runtime::{ - self, - consensus::keymanager::{PolicySGX, SignedPolicySGX}, -}; +use oasis_core_runtime::consensus::keymanager::{PolicySGX, SignedPolicySGX}; use crate::{api::KeyManagerError, policy::TrustedPolicySigners}; diff --git a/keymanager/src/runtime/secrets.rs b/keymanager/src/runtime/secrets.rs index 0177bfcb12d..ba5116752ec 100644 --- a/keymanager/src/runtime/secrets.rs +++ b/keymanager/src/runtime/secrets.rs @@ -308,7 +308,7 @@ impl Secrets { let rek_keys = self.key_manager_rek_keys(runtime_id)?; let rek_keys: HashSet<_> = rek_keys.values().collect(); // Abort if our REK hasn't been published. - if rek_keys.get(&self.identity.public_rek()).is_none() { + if !rek_keys.contains(&self.identity.public_rek()) { return Err(KeyManagerError::REKNotPublished.into()); } // Encrypt the secret. diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 292c3fdb9d7..b0ee1934b77 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -22,7 +22,7 @@ anyhow = "1.0" thiserror = "1.0" sgx-isa = { version = "0.4.0", features = ["sgxstd"] } dcap-ql = { version = "0.3.4", default-features = false, features = ["verify"] } -mbedtls = "0.8.1" +mbedtls = { version = "0.12.3", features = ["x509"] } yasna = { version = "0.5.0", features = ["num-bigint"] } bincode = "1.3.3" snow = "0.9.6" @@ -32,7 +32,7 @@ base64 = "0.13.0" rustc-hex = "2.0.1" rand = "0.8.5" futures = "0.3.25" -tokio = { version = "1.29.1", features = ["rt", "rt-multi-thread", "sync"] } +tokio = { version = "1.36.0", features = ["rt", "rt-multi-thread", "sync"] } tendermint = "0.30.0" tendermint-proto = "0.30.0" tendermint-light-client = { version = "0.30.0", features = ["rust-crypto"], default-features = false } @@ -51,17 +51,17 @@ honggfuzz = "0.5.55" arbitrary = { version = "1.2.0", features = ["derive"] } num-bigint = "0.4" num-traits = "0.2.15" -bech32 = "0.9.1" +bech32 = "0.11.0" impl-trait-for-tuples = "0.2.1" x509-parser = "0.15.1" oid-registry = "0.6.1" -rsa = "0.9.3" +rsa = "0.9.6" base64-serde = "0.6.1" lru = "0.9.0" -async-trait = "0.1.66" +async-trait = "0.1.77" [target.'cfg(not(target_env = "sgx"))'.dependencies.tokio] -version = "1.29.1" +version = "1.36.0" features = ["full"] [dev-dependencies] diff --git a/runtime/src/common/crypto/mrae/nonce.rs b/runtime/src/common/crypto/mrae/nonce.rs index d675f17401a..197396c4e9c 100644 --- a/runtime/src/common/crypto/mrae/nonce.rs +++ b/runtime/src/common/crypto/mrae/nonce.rs @@ -53,6 +53,7 @@ impl Nonce { let new_counter: u32 = { let mut counter = counter_array.read_u32::().unwrap(); // If about to overflow wrap around to 0. + #[allow(clippy::nonminimal_bool)] if counter == !0u32 { counter = 0; } else { diff --git a/runtime/src/common/crypto/signature.rs b/runtime/src/common/crypto/signature.rs index d6f8ac36146..2344c99d4ae 100644 --- a/runtime/src/common/crypto/signature.rs +++ b/runtime/src/common/crypto/signature.rs @@ -7,7 +7,7 @@ use curve25519_dalek::{ edwards::{CompressedEdwardsY, EdwardsPoint}, scalar::Scalar, }; -use ed25519_dalek::{self, Digest as _, Sha512, Signer as _}; +use ed25519_dalek::{Digest as _, Sha512, Signer as _}; use rand::rngs::OsRng; use thiserror::Error; use zeroize::Zeroize; diff --git a/runtime/src/common/crypto/x25519.rs b/runtime/src/common/crypto/x25519.rs index f17a6c026a1..478c43be6ef 100644 --- a/runtime/src/common/crypto/x25519.rs +++ b/runtime/src/common/crypto/x25519.rs @@ -1,7 +1,6 @@ //! CBOR serializable X25519 types. use anyhow::Result; use rand::rngs::OsRng; -use x25519_dalek; use zeroize::Zeroize; use super::hash::Hash; diff --git a/runtime/src/common/logger.rs b/runtime/src/common/logger.rs index 8afa60cc6cf..582476c02ab 100644 --- a/runtime/src/common/logger.rs +++ b/runtime/src/common/logger.rs @@ -3,9 +3,7 @@ use std::sync::{Mutex, Once}; use lazy_static::lazy_static; use log::Level; -use slog::{self, o, Drain}; -use slog_scope; -use slog_stdlog; +use slog::{o, Drain}; lazy_static! { static ref LOGGER: slog::Logger = slog::Logger::root( diff --git a/runtime/src/common/sgx/ias.rs b/runtime/src/common/sgx/ias.rs index 174afb183e1..aaba2cbb83a 100644 --- a/runtime/src/common/sgx/ias.rs +++ b/runtime/src/common/sgx/ias.rs @@ -2,14 +2,11 @@ use std::io::{Cursor, Read, Seek, SeekFrom}; use anyhow::{anyhow, Result}; -use base64; use byteorder::{LittleEndian, ReadBytesExt}; use chrono::prelude::*; use lazy_static::lazy_static; use oid_registry::{OID_PKCS1_RSAENCRYPTION, OID_PKCS1_SHA256WITHRSA}; -use percent_encoding; use rsa::{pkcs1::DecodeRsaPublicKey, pkcs1v15::Pkcs1v15Sign, RsaPublicKey}; -use serde_json; use sgx_isa::{AttributesFlags, Report}; use sha2::{digest::Update as _, Digest, Sha256}; use thiserror::Error; @@ -345,8 +342,8 @@ pub fn verify(avr: &AVR, policy: &QuotePolicy) -> Result { } fn parse_avr_timestamp(timestamp: &str) -> Result { - let timestamp_unix = match Utc.datetime_from_str(timestamp, IAS_TS_FMT) { - Ok(timestamp) => timestamp.timestamp(), + let timestamp_unix = match NaiveDateTime::parse_from_str(timestamp, IAS_TS_FMT) { + Ok(timestamp) => timestamp.and_utc().timestamp(), _ => return Err(AVRError::MalformedTimestamp.into()), }; Ok(timestamp_unix) diff --git a/runtime/src/common/sgx/pcs.rs b/runtime/src/common/sgx/pcs.rs index 13fa8727f10..dc7a334d64f 100644 --- a/runtime/src/common/sgx/pcs.rs +++ b/runtime/src/common/sgx/pcs.rs @@ -189,9 +189,9 @@ impl QuoteBundle { .open(ts, policy, tcb_cert.public_key_mut())?; // We use the TCB info issue date as the timestamp. - let timestamp = Utc - .datetime_from_str(&tcb_info.issue_date, PCS_TS_FMT) + let timestamp = NaiveDateTime::parse_from_str(&tcb_info.issue_date, PCS_TS_FMT) .map_err(|err| Error::TCBParseError(err.into()))? + .and_utc() .timestamp(); // Perform quote verification. @@ -285,7 +285,7 @@ impl quote::Quote3SignatureEcdsaP256Verifier for QeEcdsaP256Verifier { cert_chain.push(cert); } // TODO: Specify current timestamp. - Certificate::verify(&cert_chain, &PCS_TRUST_ROOT, None)?; + Certificate::verify(&cert_chain, &PCS_TRUST_ROOT, None, None)?; // Extract TCB parameters from the PCK certificate. let mut pck_cert = cert_chain.pop_front().unwrap(); @@ -393,7 +393,7 @@ impl TCBBundle { } // TODO: Specify current timestamp. - Certificate::verify(&cert_chain, &PCS_TRUST_ROOT, None) + Certificate::verify(&cert_chain, &PCS_TRUST_ROOT, None, None) .map_err(|_| Error::TCBVerificationFailed)?; Ok(cert_chain.pop_front().unwrap()) @@ -533,12 +533,12 @@ impl TCBInfo { } // Validate TCB info is not expired/not yet valid based on current time. - let issue_date = Utc - .datetime_from_str(&self.issue_date, PCS_TS_FMT) - .map_err(|err| Error::TCBParseError(err.into()))?; - let _next_update = Utc - .datetime_from_str(&self.next_update, PCS_TS_FMT) - .map_err(|err| Error::TCBParseError(err.into()))?; + let issue_date = NaiveDateTime::parse_from_str(&self.issue_date, PCS_TS_FMT) + .map_err(|err| Error::TCBParseError(err.into()))? + .and_utc(); + let _next_update = NaiveDateTime::parse_from_str(&self.next_update, PCS_TS_FMT) + .map_err(|err| Error::TCBParseError(err.into()))? + .and_utc(); if issue_date > ts { return Err(Error::TCBExpired); } @@ -786,12 +786,12 @@ impl QEIdentity { } // Validate QE identity is not expired/not yet valid based on current time. - let issue_date = Utc - .datetime_from_str(&self.issue_date, PCS_TS_FMT) - .map_err(|err| Error::TCBParseError(err.into()))?; - let _next_update = Utc - .datetime_from_str(&self.next_update, PCS_TS_FMT) - .map_err(|err| Error::TCBParseError(err.into()))?; + let issue_date = NaiveDateTime::parse_from_str(&self.issue_date, PCS_TS_FMT) + .map_err(|err| Error::TCBParseError(err.into()))? + .and_utc(); + let _next_update = NaiveDateTime::parse_from_str(&self.next_update, PCS_TS_FMT) + .map_err(|err| Error::TCBParseError(err.into()))? + .and_utc(); if issue_date > ts { return Err(Error::TCBExpired); } diff --git a/runtime/src/consensus/address.rs b/runtime/src/consensus/address.rs index c3df7772734..0aaf90f73cb 100644 --- a/runtime/src/consensus/address.rs +++ b/runtime/src/consensus/address.rs @@ -2,7 +2,7 @@ use std::{convert::TryInto, fmt}; use anyhow::{anyhow, Result}; -use bech32::{self, FromBase32, ToBase32, Variant}; +use bech32::{Bech32, Hrp}; use lazy_static::lazy_static; use crate::common::{ @@ -34,7 +34,7 @@ const ADDRESS_V0_VERSION: u8 = 0; const ADDRESS_RUNTIME_V0_CONTEXT: &[u8] = b"oasis-core/address: runtime"; const ADDRESS_RUNTIME_V0_VERSION: u8 = 0; -const ADDRESS_BECH32_HRP: &str = "oasis"; +const ADDRESS_BECH32_HRP: Hrp = Hrp::parse_unchecked("oasis"); /// A staking account address. #[derive(Clone, Default, PartialEq, Eq, Hash, PartialOrd, Ord)] @@ -68,23 +68,19 @@ impl Address { /// Tries to create a new address from Bech32-encoded string. pub fn from_bech32(data: &str) -> Result { - let (hrp, data, variant) = - bech32::decode(data).map_err(|_| anyhow!("malformed address"))?; + let (hrp, data) = bech32::decode(data).map_err(|_| anyhow!("malformed address"))?; - if variant != Variant::Bech32 || hrp != ADDRESS_BECH32_HRP { + if hrp != ADDRESS_BECH32_HRP { return Err(anyhow!("malformed address")); } - let data: Vec = - FromBase32::from_base32(&data).map_err(|_| anyhow!("malformed address"))?; let sized: &[u8; ADDRESS_SIZE] = &data.as_slice().try_into()?; - Ok(sized.into()) } /// Converts an address to Bech32 representation. pub fn to_bech32(&self) -> String { - bech32::encode(ADDRESS_BECH32_HRP, self.0.to_base32(), Variant::Bech32).unwrap() + bech32::encode::(ADDRESS_BECH32_HRP, &self.0).unwrap() } } diff --git a/runtime/src/consensus/roothash/block.rs b/runtime/src/consensus/roothash/block.rs index 5de6502ad7d..5900afe0822 100644 --- a/runtime/src/consensus/roothash/block.rs +++ b/runtime/src/consensus/roothash/block.rs @@ -110,8 +110,6 @@ impl Header { #[cfg(test)] mod tests { - use crate::common::{crypto::hash::Hash, namespace::Namespace}; - use super::*; #[test] diff --git a/runtime/src/consensus/roothash/commitment/executor.rs b/runtime/src/consensus/roothash/commitment/executor.rs index 2d6971de052..8d9814088ac 100644 --- a/runtime/src/consensus/roothash/commitment/executor.rs +++ b/runtime/src/consensus/roothash/commitment/executor.rs @@ -270,8 +270,6 @@ impl OpenCommitment for ExecutorCommitment { #[cfg(test)] mod tests { - use crate::common::crypto::hash::Hash; - use super::*; #[test] diff --git a/runtime/src/consensus/roothash/message.rs b/runtime/src/consensus/roothash/message.rs index 82fbe3f367f..391fdee0457 100644 --- a/runtime/src/consensus/roothash/message.rs +++ b/runtime/src/consensus/roothash/message.rs @@ -170,13 +170,8 @@ mod tests { use std::collections::BTreeMap; use crate::{ - common::{ - crypto::{hash::Hash, signature::PublicKey}, - namespace::Namespace, - quantity, - versioned::Versioned, - }, - consensus::{governance, registry, scheduler, staking}, + common::{crypto::signature::PublicKey, namespace::Namespace, quantity}, + consensus::scheduler, }; use super::*; diff --git a/runtime/src/consensus/state/keymanager.rs b/runtime/src/consensus/state/keymanager.rs index db53705590c..bd7ea70d617 100644 --- a/runtime/src/consensus/state/keymanager.rs +++ b/runtime/src/consensus/state/keymanager.rs @@ -131,7 +131,7 @@ impl<'a, T: ImmutableMKVS> ImmutableState<'a, T> { #[cfg(test)] mod test { - use std::{collections::HashMap, default::Default, vec}; + use std::collections::HashMap; use rustc_hex::FromHex; @@ -139,11 +139,9 @@ mod test { use crate::{ common::{ crypto::{ - hash::Hash, signature::{Signature, SignatureBundle}, x25519, }, - namespace::Namespace, sgx::{EnclaveIdentity, MrEnclave, MrSigner}, }, consensus::keymanager::{ diff --git a/runtime/src/consensus/state/keymanager/churp.rs b/runtime/src/consensus/state/keymanager/churp.rs index eb47a12892a..8e3da86c97b 100644 --- a/runtime/src/consensus/state/keymanager/churp.rs +++ b/runtime/src/consensus/state/keymanager/churp.rs @@ -174,19 +174,12 @@ pub struct SignedPolicySGX { #[cfg(test)] mod test { - use std::{collections::HashMap, default::Default, vec}; - use super::*; use crate::{ common::{ - crypto::{ - hash::Hash, - signature::{Signature, SignatureBundle}, - }, - namespace::Namespace, - sgx::{EnclaveIdentity, MrEnclave, MrSigner}, + crypto::signature::Signature, + sgx::{MrEnclave, MrSigner}, }, - consensus::state::keymanager::churp::PolicySGX, storage::mkvs::{ interop::{Fixture, ProtocolServer}, Root, RootType, Tree, diff --git a/runtime/src/consensus/state/registry.rs b/runtime/src/consensus/state/registry.rs index a6ae27d3da0..23c16ea4175 100644 --- a/runtime/src/consensus/state/registry.rs +++ b/runtime/src/consensus/state/registry.rs @@ -101,12 +101,9 @@ impl<'a, T: ImmutableMKVS> ImmutableState<'a, T> { #[cfg(test)] mod test { use crate::{ - common::{ - crypto::{hash::Hash, signature}, - namespace::Namespace, - }, + common::crypto::signature, consensus::registry::{ - Capabilities, CapabilityTEE, ConsensusInfo, Node, NodeRuntime, P2PInfo, RuntimeKind, + Capabilities, CapabilityTEE, ConsensusInfo, NodeRuntime, P2PInfo, RuntimeKind, TEEHardware, TLSInfo, VRFInfo, VersionInfo, }, storage::mkvs::{ diff --git a/runtime/src/consensus/state/roothash.rs b/runtime/src/consensus/state/roothash.rs index a857e8fd6a6..aae1d491eae 100644 --- a/runtime/src/consensus/state/roothash.rs +++ b/runtime/src/consensus/state/roothash.rs @@ -101,12 +101,9 @@ impl<'a, T: ImmutableMKVS> ImmutableState<'a, T> { #[cfg(test)] mod test { - use crate::{ - common::crypto::hash::Hash, - storage::mkvs::{ - interop::{Fixture, ProtocolServer}, - Root, RootType, Tree, - }, + use crate::storage::mkvs::{ + interop::{Fixture, ProtocolServer}, + Root, RootType, Tree, }; use super::*; diff --git a/runtime/src/enclave_rpc/client.rs b/runtime/src/enclave_rpc/client.rs index 2be61e97a1c..64a80308f7e 100644 --- a/runtime/src/enclave_rpc/client.rs +++ b/runtime/src/enclave_rpc/client.rs @@ -1,12 +1,10 @@ //! Enclave RPC client. use std::{collections::HashSet, mem, sync::Arc}; -use anyhow; use thiserror::Error; use tokio::sync::{mpsc, oneshot}; use crate::{ - cbor, common::{ crypto::signature, namespace::Namespace, diff --git a/runtime/src/enclave_rpc/session.rs b/runtime/src/enclave_rpc/session.rs index 6741146b8e7..1e86c246765 100644 --- a/runtime/src/enclave_rpc/session.rs +++ b/runtime/src/enclave_rpc/session.rs @@ -2,7 +2,6 @@ use std::{collections::HashSet, io::Write, mem, sync::Arc}; use anyhow::Result; -use snow; use thiserror::Error; use super::types::Message; diff --git a/runtime/src/identity.rs b/runtime/src/identity.rs index ca2d5661306..d4f3b6b1d90 100644 --- a/runtime/src/identity.rs +++ b/runtime/src/identity.rs @@ -6,8 +6,6 @@ use std::{ use anyhow::Result; #[cfg(target_env = "sgx")] -use base64; -#[cfg(target_env = "sgx")] use rand::{rngs::OsRng, Rng}; #[cfg(target_env = "sgx")] use sgx_isa::Report; diff --git a/runtime/src/init.rs b/runtime/src/init.rs index 24834cbbfc5..0ea58beb0a9 100644 --- a/runtime/src/init.rs +++ b/runtime/src/init.rs @@ -1,7 +1,6 @@ //! Runtime initialization. use std::sync::Arc; -use log; use slog::{error, info}; use crate::{ diff --git a/runtime/src/storage/mkvs/cache/lru_cache.rs b/runtime/src/storage/mkvs/cache/lru_cache.rs index 0263a0bf469..84988bd0f85 100644 --- a/runtime/src/storage/mkvs/cache/lru_cache.rs +++ b/runtime/src/storage/mkvs/cache/lru_cache.rs @@ -1,10 +1,19 @@ -use std::{any::Any, cell::RefCell, pin::Pin, ptr::NonNull, rc::Rc}; +use std::{cell::RefCell, pin::Pin, ptr::NonNull, rc::Rc}; use anyhow::{anyhow, Result}; use intrusive_collections::{intrusive_adapter, LinkedList, LinkedListLink}; use thiserror::Error; -use crate::storage::mkvs::{cache::*, sync::*, tree::*}; +#[cfg(test)] +use crate::storage::mkvs::cache::CacheStats; +use crate::storage::mkvs::{ + cache::{Cache, CacheExtra, CacheItem, ReadSyncFetcher}, + sync::{merge_verified_subtree, ProofVerifier, ReadSync}, + tree::{ + Depth, InternalNode, Key, LeafNode, NodeBox, NodeKind, NodePointer, NodePtrRef, NodeRef, + Root, RootType, Value, + }, +}; #[derive(Error, Debug)] #[error("mkvs: tried to remove locked node")] @@ -328,10 +337,7 @@ impl LRUCache { } impl Cache for LRUCache { - fn as_any(&self) -> &dyn Any { - self - } - + #[cfg(test)] fn stats(&self) -> CacheStats { CacheStats { internal_node_count: self.lru_internal.size, @@ -347,14 +353,11 @@ impl Cache for LRUCache { self.pending_root = new_root; } - fn get_sync_root(&self) -> Root { - self.sync_root - } - fn set_sync_root(&mut self, root: Root) { self.sync_root = root; } + #[cfg(test)] fn get_read_syncer(&self) -> &Box { &self.read_syncer } diff --git a/runtime/src/storage/mkvs/cache/mod.rs b/runtime/src/storage/mkvs/cache/mod.rs index b8546600d02..a7ec358964f 100644 --- a/runtime/src/storage/mkvs/cache/mod.rs +++ b/runtime/src/storage/mkvs/cache/mod.rs @@ -1,12 +1,16 @@ mod lru_cache; -pub use lru_cache::*; +pub use lru_cache::LRUCache; -use std::{any::Any, ptr::NonNull}; +use std::ptr::NonNull; use anyhow::Result; -use crate::storage::mkvs::{cache::lru_cache::CacheItemBox, sync::*, tree::*}; +use crate::storage::mkvs::{ + cache::lru_cache::CacheItemBox, + sync::{Proof, ReadSync}, + tree::{Depth, Key, NodeKind, NodePtrRef, NodeRef, Root, Value}, +}; /// Statistics about the contents of the cache. #[derive(Debug, Default)] @@ -34,22 +38,19 @@ where /// Cache interface for the in-mmory tree cache. pub trait Cache { - /// Return `self` as an `Any` object, useful for downcasting. - fn as_any(&self) -> &dyn Any; - /// Return statistics about the contents of the cache. + #[cfg(test)] fn stats(&self) -> CacheStats; /// Get a pointer to the current uncommitted root node. fn get_pending_root(&self) -> NodePtrRef; /// Set the root node for the tree to the given pointer. fn set_pending_root(&mut self, new_root: NodePtrRef); - /// Get the root of the tree used for syncing. - fn get_sync_root(&self) -> Root; /// Set the root of the tree after committing. fn set_sync_root(&mut self, root: Root); /// Get the read syncer backing this cache. + #[cfg(test)] fn get_read_syncer(&self) -> &Box; /// Create a new internal node and returns a pointer to it. diff --git a/runtime/src/storage/mkvs/interop/protocol_server.rs b/runtime/src/storage/mkvs/interop/protocol_server.rs index 9b22f8e3b19..61a6ce6d712 100644 --- a/runtime/src/storage/mkvs/interop/protocol_server.rs +++ b/runtime/src/storage/mkvs/interop/protocol_server.rs @@ -10,7 +10,7 @@ use std::{ }; use anyhow::Result; -use tempfile::{self, TempDir}; +use tempfile::TempDir; use super::{rpc, Driver}; use crate::{ diff --git a/runtime/src/storage/mkvs/sync/host.rs b/runtime/src/storage/mkvs/sync/host.rs index e8f67a5c732..7fc9f77cdb1 100644 --- a/runtime/src/storage/mkvs/sync/host.rs +++ b/runtime/src/storage/mkvs/sync/host.rs @@ -4,7 +4,9 @@ use anyhow::Result; use crate::{ protocol::{Protocol, ProtocolError}, - storage::mkvs::sync::*, + storage::mkvs::sync::{ + GetPrefixesRequest, GetRequest, IterateRequest, ProofResponse, ReadSync, + }, types::{ Body, HostStorageEndpoint, StorageSyncRequest, StorageSyncRequestWithEndpoint, StorageSyncResponse, diff --git a/runtime/src/storage/mkvs/sync/mod.rs b/runtime/src/storage/mkvs/sync/mod.rs index 7afb541a431..e1e11021b28 100644 --- a/runtime/src/storage/mkvs/sync/mod.rs +++ b/runtime/src/storage/mkvs/sync/mod.rs @@ -6,12 +6,12 @@ mod noop; mod proof; mod stats; -pub use errors::*; -pub use host::*; -pub use merge::*; -pub use noop::*; -pub use proof::*; -pub use stats::*; +pub use errors::SyncerError; +pub use host::HostReadSyncer; +pub use merge::merge_verified_subtree; +pub use noop::NoopReadSyncer; +pub use proof::{Proof, ProofBuilder, ProofVerifier, RawProofEntry}; +pub use stats::StatsCollector; use std::any::Any; @@ -19,7 +19,7 @@ use anyhow::Result; use crate::{ common::crypto::hash::Hash, - storage::mkvs::{tree::*, Prefix}, + storage::mkvs::{tree::Root, Prefix}, }; /// Identifies a specific tree and a position within that tree. diff --git a/runtime/src/storage/mkvs/sync/noop.rs b/runtime/src/storage/mkvs/sync/noop.rs index d9036931b48..41a0b0b2c5a 100644 --- a/runtime/src/storage/mkvs/sync/noop.rs +++ b/runtime/src/storage/mkvs/sync/noop.rs @@ -2,7 +2,9 @@ use std::any::Any; use anyhow::Result; -use crate::storage::mkvs::sync::*; +use crate::storage::mkvs::sync::{ + GetPrefixesRequest, GetRequest, IterateRequest, ProofResponse, ReadSync, SyncerError, +}; /// A no-op read syncer which doesn't support any of the required operations. pub struct NoopReadSyncer; diff --git a/runtime/src/storage/mkvs/sync/proof.rs b/runtime/src/storage/mkvs/sync/proof.rs index c2f73e6b6d2..0619c0902b7 100644 --- a/runtime/src/storage/mkvs/sync/proof.rs +++ b/runtime/src/storage/mkvs/sync/proof.rs @@ -315,7 +315,6 @@ impl ProofVerifier { #[cfg(test)] mod test { - use base64; use rustc_hex::ToHex; use crate::storage::mkvs::{cache::Cache, sync::NoopReadSyncer}; diff --git a/runtime/src/storage/mkvs/sync/stats.rs b/runtime/src/storage/mkvs/sync/stats.rs index 23ad2404033..85a118d69ab 100644 --- a/runtime/src/storage/mkvs/sync/stats.rs +++ b/runtime/src/storage/mkvs/sync/stats.rs @@ -2,7 +2,7 @@ use std::any::Any; use anyhow::Result; -use crate::storage::mkvs::sync::*; +use super::{GetPrefixesRequest, GetRequest, IterateRequest, ProofResponse, ReadSync}; /// A proxy read syncer which keeps track of call statistics. pub struct StatsCollector { diff --git a/runtime/src/storage/mkvs/sync/test.rs b/runtime/src/storage/mkvs/sync/test.rs index c2bb817d257..bc21159ff40 100644 --- a/runtime/src/storage/mkvs/sync/test.rs +++ b/runtime/src/storage/mkvs/sync/test.rs @@ -1,7 +1,7 @@ use crate::storage::mkvs::{ interop::{Driver, ProtocolServer}, - sync::*, - LogEntry, + sync::NoopReadSyncer, + LogEntry, Root, RootType, Tree, }; #[test] diff --git a/runtime/src/storage/mkvs/tests/mod.rs b/runtime/src/storage/mkvs/tests/mod.rs index 33963d95e0e..c2225e6f014 100644 --- a/runtime/src/storage/mkvs/tests/mod.rs +++ b/runtime/src/storage/mkvs/tests/mod.rs @@ -1,8 +1,7 @@ //! Helpers for testing MKVS trees. use std::fmt; -use base64; -use serde::{self, Deserialize}; +use serde::Deserialize; /// Tree operation kind. #[derive(Clone, Debug, Deserialize)] diff --git a/runtime/src/storage/mkvs/tree/commit.rs b/runtime/src/storage/mkvs/tree/commit.rs index e8a9aad6542..8a2ef79ea3f 100644 --- a/runtime/src/storage/mkvs/tree/commit.rs +++ b/runtime/src/storage/mkvs/tree/commit.rs @@ -2,7 +2,10 @@ use anyhow::Result; use crate::{ common::{crypto::hash::Hash, namespace::Namespace}, - storage::mkvs::{cache::*, tree::*}, + storage::mkvs::{ + cache::{Cache, LRUCache, UpdateList}, + tree::{Node, NodeBox, NodeKind, NodePtrRef, Root, Tree}, + }, }; impl Tree { diff --git a/runtime/src/storage/mkvs/tree/insert.rs b/runtime/src/storage/mkvs/tree/insert.rs index a2e5f79cd8f..9832cc6c591 100644 --- a/runtime/src/storage/mkvs/tree/insert.rs +++ b/runtime/src/storage/mkvs/tree/insert.rs @@ -2,7 +2,10 @@ use std::mem; use anyhow::{anyhow, Result}; -use crate::storage::mkvs::{cache::*, tree::*}; +use crate::storage::mkvs::{ + cache::Cache, + tree::{Depth, Key, KeyTrait, NodeBox, NodeKind, NodePointer, NodePtrRef, Tree, Value}, +}; use super::lookup::FetcherSyncGet; diff --git a/runtime/src/storage/mkvs/tree/iterator.rs b/runtime/src/storage/mkvs/tree/iterator.rs index d8c8fa1693c..6804ecb871c 100644 --- a/runtime/src/storage/mkvs/tree/iterator.rs +++ b/runtime/src/storage/mkvs/tree/iterator.rs @@ -3,7 +3,12 @@ use std::{collections::VecDeque, fmt}; use anyhow::{Error, Result}; -use crate::storage::mkvs::{self, cache::*, sync::*, tree::*}; +use crate::storage::mkvs::{ + self, + cache::{Cache, ReadSyncFetcher}, + sync::{IterateRequest, Proof, ReadSync, TreeID}, + tree::{Depth, Key, KeyTrait, NodeBox, NodeKind, NodePtrRef, Root, Tree}, +}; pub(super) struct FetcherSyncIterate<'a> { key: &'a Key, @@ -346,11 +351,11 @@ pub(super) mod test { use rustc_hex::FromHex; - use super::{tree_test::generate_key_value_pairs_ex, *}; + use super::{super::tree_test::generate_key_value_pairs_ex, *}; use crate::storage::mkvs::{ - self, interop::{Driver, ProtocolServer}, - Iterator, + sync::{NoopReadSyncer, StatsCollector}, + Iterator, OverlayTree, RootType, }; #[test] diff --git a/runtime/src/storage/mkvs/tree/lookup.rs b/runtime/src/storage/mkvs/tree/lookup.rs index 1b699c5fd53..de8ef93c191 100644 --- a/runtime/src/storage/mkvs/tree/lookup.rs +++ b/runtime/src/storage/mkvs/tree/lookup.rs @@ -1,6 +1,10 @@ use anyhow::Result; -use crate::storage::mkvs::{cache::*, sync::*, tree::*}; +use crate::storage::mkvs::{ + cache::{Cache, ReadSyncFetcher}, + sync::{GetRequest, Proof, ProofBuilder, ReadSync, TreeID}, + tree::{Depth, Key, KeyTrait, NodeBox, NodeKind, NodePtrRef, Root, Tree, Value}, +}; pub(super) struct FetcherSyncGet<'a> { key: &'a Key, diff --git a/runtime/src/storage/mkvs/tree/marshal.rs b/runtime/src/storage/mkvs/tree/marshal.rs index 9752ae62841..33f64f0468e 100644 --- a/runtime/src/storage/mkvs/tree/marshal.rs +++ b/runtime/src/storage/mkvs/tree/marshal.rs @@ -4,7 +4,13 @@ use anyhow::Result; use crate::{ common::crypto::hash::Hash, - storage::mkvs::{marshal::*, tree::*}, + storage::mkvs::{ + marshal::Marshal, + tree::{ + Depth, DepthTrait, InternalNode, Key, LeafNode, Node, NodeBox, NodeKind, NodePointer, + TreeError, Value, + }, + }, }; /// Size of the encoded value length. diff --git a/runtime/src/storage/mkvs/tree/node.rs b/runtime/src/storage/mkvs/tree/node.rs index 40d52fe2403..f962d6782cf 100644 --- a/runtime/src/storage/mkvs/tree/node.rs +++ b/runtime/src/storage/mkvs/tree/node.rs @@ -2,7 +2,10 @@ use std::{cell::RefCell, rc::Rc}; use crate::{ common::{crypto::hash::Hash, namespace::Namespace}, - storage::mkvs::{cache::*, marshal::*}, + storage::mkvs::{ + cache::{CacheExtra, CacheItem}, + marshal::Marshal, + }, }; /// Common interface for node-like objects in the tree. @@ -379,8 +382,6 @@ pub type Key = Vec; pub trait KeyTrait { /// Get a single bit from the given hash. fn get_bit(&self, bit: Depth) -> bool; - /// Set a single bit in the given hash and return the result. If bit>self, it resizes new Key. - fn set_bit(&self, bit: Depth, val: bool) -> Key; /// Returns the length of the key in bits. fn bit_length(&self) -> Depth; /// Bit-wise splits of the key. @@ -398,24 +399,6 @@ impl KeyTrait for Key { (self[(bit / 8) as usize] & (1 << (7 - (bit % 8)))) != 0 } - fn set_bit(&self, bit: Depth, val: bool) -> Key { - let mut k: Key; - if bit as usize >= self.len() * 8 { - k = vec![0; bit as usize / 8 + 1]; - k[0..self.len()].clone_from_slice(self); - } else { - k = self.clone(); - } - - let mask = (1 << (7 - (bit % 8))) as u8; - if val { - k[(bit / 8) as usize] |= mask; - } else { - k[(bit / 8) as usize] &= !mask; - } - k - } - fn bit_length(&self) -> Depth { (self.len() * 8) as Depth } diff --git a/runtime/src/storage/mkvs/tree/node_test.rs b/runtime/src/storage/mkvs/tree/node_test.rs index 6309e196d86..74db48e74ab 100644 --- a/runtime/src/storage/mkvs/tree/node_test.rs +++ b/runtime/src/storage/mkvs/tree/node_test.rs @@ -1,9 +1,6 @@ -use std::{cell::RefCell, rc::Rc, str::FromStr}; +use std::str::FromStr; -use crate::{ - common::crypto::hash::Hash, - storage::mkvs::{marshal::*, tree::*}, -}; +use crate::storage::mkvs::{marshal::*, tree::*}; #[test] fn test_serialization_leaf() { diff --git a/runtime/src/storage/mkvs/tree/overlay.rs b/runtime/src/storage/mkvs/tree/overlay.rs index 404b311a91c..81213ec5ddf 100644 --- a/runtime/src/storage/mkvs/tree/overlay.rs +++ b/runtime/src/storage/mkvs/tree/overlay.rs @@ -1,13 +1,13 @@ use std::{ collections::{btree_map, BTreeMap, HashSet}, - iter::{Iterator, Peekable}, + iter::Peekable, }; use anyhow::{Error, Result}; use crate::{ common::{crypto::hash::Hash, namespace::Namespace}, - storage::mkvs::{self, tree::*}, + storage::mkvs::{self, tree::Key, Proof}, }; /// A key-value tree overlay that holds all updates in memory and only commits them if requested. @@ -305,7 +305,9 @@ impl mkvs::MKVS for OverlayTree { #[cfg(test)] mod test { use super::*; - use crate::storage::mkvs::{sync::NoopReadSyncer, tree::iterator::test::test_iterator_with}; + use crate::storage::mkvs::{ + sync::NoopReadSyncer, tree::iterator::test::test_iterator_with, RootType, Tree, + }; #[test] fn test_overlay() { diff --git a/runtime/src/storage/mkvs/tree/prefetch.rs b/runtime/src/storage/mkvs/tree/prefetch.rs index c00fa85234a..f182e854434 100644 --- a/runtime/src/storage/mkvs/tree/prefetch.rs +++ b/runtime/src/storage/mkvs/tree/prefetch.rs @@ -1,6 +1,11 @@ use anyhow::Result; -use crate::storage::mkvs::{cache::*, sync::*, tree::*, Prefix}; +use crate::storage::mkvs::{ + cache::{Cache, ReadSyncFetcher}, + sync::{GetPrefixesRequest, Proof, ReadSync, TreeID}, + tree::{NodePtrRef, Root, Tree}, + Prefix, +}; pub(super) struct FetcherSyncGetPrefixes<'a> { prefixes: &'a [Prefix], diff --git a/runtime/src/storage/mkvs/tree/remove.rs b/runtime/src/storage/mkvs/tree/remove.rs index 008d027a0be..747c7fa0f10 100644 --- a/runtime/src/storage/mkvs/tree/remove.rs +++ b/runtime/src/storage/mkvs/tree/remove.rs @@ -1,6 +1,11 @@ use anyhow::Result; -use crate::storage::mkvs::{cache::*, tree::*}; +use crate::storage::mkvs::{ + cache::Cache, + tree::{ + Depth, Key, KeyTrait, NodeBox, NodeKind, NodePointer, NodePtrRef, NodeRef, Tree, Value, + }, +}; use super::lookup::FetcherSyncGet; diff --git a/runtime/src/storage/mkvs/tree/tree_test.rs b/runtime/src/storage/mkvs/tree/tree_test.rs index 182771cc8ec..56504b74747 100644 --- a/runtime/src/storage/mkvs/tree/tree_test.rs +++ b/runtime/src/storage/mkvs/tree/tree_test.rs @@ -1,14 +1,10 @@ -use serde_json; use std::{collections::HashSet, fs::File, io::BufReader, iter, iter::FromIterator, path::Path}; -use crate::{ - common::crypto::hash::Hash, - storage::mkvs::{ - interop::{Driver, ProtocolServer}, - tests, - tree::*, - Iterator, LogEntry, LogEntryKind, WriteLog, MKVS, - }, +use crate::storage::mkvs::{ + interop::{Driver, ProtocolServer}, + tests, + tree::*, + Iterator, LogEntry, LogEntryKind, WriteLog, MKVS, }; const INSERT_ITEMS: usize = 1000; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f20c3b3da39..923b7ca4a9a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2024-01-08" +channel = "nightly-2024-03-04" targets = ["x86_64-fortanix-unknown-sgx"] components = ["clippy", "rustfmt"] diff --git a/secret-sharing/src/vss/matrix.rs b/secret-sharing/src/vss/matrix.rs index ef6870bd69c..9030121d5aa 100644 --- a/secret-sharing/src/vss/matrix.rs +++ b/secret-sharing/src/vss/matrix.rs @@ -129,7 +129,6 @@ where #[cfg(test)] mod tests { use group::Group; - use p384; use rand_core::OsRng; use crate::vss::matrix::VerificationMatrix; diff --git a/secret-sharing/src/vss/polynomial.rs b/secret-sharing/src/vss/polynomial.rs index d71a26ab669..cee65e39f5d 100644 --- a/secret-sharing/src/vss/polynomial.rs +++ b/secret-sharing/src/vss/polynomial.rs @@ -240,7 +240,6 @@ where mod tests { use std::panic; - use p384; use rand_core::OsRng; use super::{powers, BivariatePolynomial, Polynomial}; diff --git a/tools/src/cargo.rs b/tools/src/cargo.rs index db7135ddfd8..aedee7bd495 100644 --- a/tools/src/cargo.rs +++ b/tools/src/cargo.rs @@ -11,7 +11,6 @@ use std::{ use anyhow::{anyhow, Result}; use serde::Deserialize; -use toml; /// Fortanix SGX metadata (based on ftxsgx-runner-cargo). #[derive(Deserialize, Debug, Default)] diff --git a/tools/src/lib.rs b/tools/src/lib.rs index d081f4f5080..7b4d2b89126 100644 --- a/tools/src/lib.rs +++ b/tools/src/lib.rs @@ -1,5 +1,2 @@ //! Oasis core build tools. -extern crate anyhow; -extern crate toml; - pub mod cargo;