diff --git a/.github/workflows/iroha2-dev-pr-static.yml b/.github/workflows/iroha2-dev-pr-static.yml index 27c97ed924a..f9fda5da098 100644 --- a/.github/workflows/iroha2-dev-pr-static.yml +++ b/.github/workflows/iroha2-dev-pr-static.yml @@ -26,12 +26,12 @@ jobs: - uses: Swatinem/rust-cache@v1 - name: Format check - run: cargo +nightly-2022-04-20 fmt --all -- --check + run: cargo +nightly-2022-08-09 fmt --all -- --check - name: Static analysis without features - run: cargo +nightly-2022-04-20 lints clippy --workspace --benches --tests --examples --quiet --no-default-features + run: cargo +nightly-2022-08-09 lints clippy --workspace --benches --tests --examples --quiet --no-default-features if: always() - name: Static analysis with all features enabled - run: cargo +nightly-2022-04-20 lints clippy --workspace --benches --tests --examples --quiet --all-features + run: cargo +nightly-2022-08-09 lints clippy --workspace --benches --tests --examples --quiet --all-features if: always() - name: Verify iroha_data_model still supports no_std run: cargo nono check --package iroha_data_model --no-default-features diff --git a/.github/workflows/iroha2-dev-pr-unstable.yml b/.github/workflows/iroha2-dev-pr-unstable.yml index 189a24fb944..74a54eef9b3 100644 --- a/.github/workflows/iroha2-dev-pr-unstable.yml +++ b/.github/workflows/iroha2-dev-pr-unstable.yml @@ -29,4 +29,4 @@ jobs: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v1 - name: Run tests - run: mold --run cargo +nightly-2022-04-20 test -p iroha_client --tests unstable_network --quiet + run: mold --run cargo +nightly-2022-08-09 test -p iroha_client --tests unstable_network --quiet diff --git a/.github/workflows/iroha2-dev-pr-wasm.yaml b/.github/workflows/iroha2-dev-pr-wasm.yaml index 3c9cfcd6ceb..6b15796880e 100644 --- a/.github/workflows/iroha2-dev-pr-wasm.yaml +++ b/.github/workflows/iroha2-dev-pr-wasm.yaml @@ -33,7 +33,7 @@ jobs: # Static analysis - name: Format check - run: cargo +nightly-2022-04-20 fmt --all -- --check + run: cargo +nightly-2022-08-09 fmt --all -- --check - name: Static analysis without features run: cargo lints clippy --benches --tests --examples --quiet --no-default-features if: always() @@ -47,4 +47,4 @@ jobs: # Tests - name: Run tests - run: mold --run cargo +nightly-2022-04-20 test --tests --quiet --no-fail-fast + run: mold --run cargo +nightly-2022-08-09 test --tests --quiet --no-fail-fast diff --git a/Cargo.lock b/Cargo.lock index ba7322655e0..63367030431 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,17 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.5", + "generic-array 0.14.6", +] + +[[package]] +name = "aead" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae06cea71059b6b79d879afcdd237a33ac61afc052fdd605815e6f3916254abf" +dependencies = [ + "crypto-common", + "generic-array 0.14.6", ] [[package]] @@ -43,7 +53,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" dependencies = [ - "aead", + "aead 0.3.2", "aes", "cipher", "ctr", @@ -71,6 +81,17 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom 0.2.7", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.18" @@ -116,9 +137,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.57" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" +checksum = "c794e162a5eff65c72ef524dfe393eb923c354e350bb78b9c7383df13f3bc142" [[package]] name = "arrayref" @@ -155,9 +176,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" dependencies = [ "proc-macro2", "quote", @@ -207,16 +228,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.28.4", + "object 0.29.0", "rustc-demangle", ] @@ -243,9 +264,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.20.4" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", @@ -283,7 +304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ "block-padding 0.2.1", - "generic-array 0.14.5", + "generic-array 0.14.6", ] [[package]] @@ -292,7 +313,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" dependencies = [ - "generic-array 0.14.5", + "generic-array 0.14.6", ] [[package]] @@ -344,9 +365,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.9.1" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] name = "byte-slice-cast" @@ -377,9 +398,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "c2-chacha" @@ -392,12 +413,9 @@ dependencies = [ [[package]] name = "cast" -version = "0.2.7" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" -dependencies = [ - "rustc_version", -] +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" @@ -430,7 +448,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1fc18e6d90c40164bf6c317476f2a98f04661e310e79830366b7e914c58a8e" dependencies = [ - "aead", + "aead 0.3.2", "chacha20", "cipher", "poly1305", @@ -439,14 +457,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "6127248204b9aba09a362f6c930ef6a78f2c1b2215f8a7b398c06e1083f17af0" dependencies = [ - "libc", + "js-sys", "num-integer", "num-traits", - "time 0.1.43", + "time 0.1.44", + "wasm-bindgen", "winapi", ] @@ -456,7 +475,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.5", + "generic-array 0.14.6", ] [[package]] @@ -472,16 +491,16 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.18" +version = "3.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9" dependencies = [ "atty", "bitflags", "clap_derive", "clap_lex", "indexmap", - "lazy_static", + "once_cell", "strsim", "termcolor", "textwrap 0.15.0", @@ -489,9 +508,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.18" +version = "3.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" +checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4" dependencies = [ "heck", "proc-macro-error", @@ -502,18 +521,18 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" dependencies = [ "os_str_bytes", ] [[package]] name = "color-eyre" -version = "0.5.11" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f1885697ee8a177096d42f158922251a41973117f6d8a234cee94b9509157b7" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" dependencies = [ "backtrace", "color-spantrace", @@ -526,9 +545,9 @@ dependencies = [ [[package]] name = "color-spantrace" -version = "0.1.6" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6eee477a4a8a72f4addd4de416eb56d54bc307b284d6601bafdee1f4ea462d1" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" dependencies = [ "once_cell", "owo-colors", @@ -549,14 +568,13 @@ dependencies = [ [[package]] name = "console" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" +checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" dependencies = [ "encode_unicode", "libc", "once_cell", - "regex", "terminal_size", "unicode-width", "winapi", @@ -616,59 +634,60 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "cranelift-bforest" -version = "0.83.0" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed44413e7e2fe3260d0ed73e6956ab188b69c10ee92b892e401e0f4f6808c68b" +checksum = "529ffacce2249ac60edba2941672dfedf3d96558b415d0d8083cd007456e0f55" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.83.0" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5d83f0f26bf213f971f45589d17e5b65e4861f9ed22392b0cbb6eaa5bd329c" +checksum = "427d105f617efc8cb55f8d036a7fded2e227892d8780b4985e5551f8d27c4a92" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", + "cranelift-isle", "gimli", "log", - "regalloc", + "regalloc2", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.83.0" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6800dc386177df6ecc5a32680607ed8ba1fa0d31a2a59c8c61fbf44826b8191d" +checksum = "551674bed85b838d45358e3eab4f0ffaa6790c70dc08184204b9a54b41cdb7d1" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.83.0" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c961f85070985ebc8fcdb81b838a5cf842294d1e6ed4852446161c7e246fd455" +checksum = "2b3a63ae57498c3eb495360944a33571754241e15e47e3bcae6082f40fec5866" [[package]] name = "cranelift-entity" -version = "0.83.0" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2347b2b8d1d5429213668f2a8e36c85ee3c73984a2f6a79007e365d3e575e7ed" +checksum = "11aa8aa624c72cc1c94ea3d0739fa61248260b5b14d3646f51593a88d67f3e6e" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.83.0" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbcdbf7bed29e363568b778649b69dabc3d727256d5d25236096ef693757654" +checksum = "544ee8f4d1c9559c9aa6d46e7aaeac4a13856d620561094f35527356c7d21bd0" dependencies = [ "cranelift-codegen", "log", @@ -676,11 +695,17 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cranelift-isle" +version = "0.86.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed16b14363d929b8c37e3c557d0a7396791b383ecc302141643c054343170aad" + [[package]] name = "cranelift-native" -version = "0.83.0" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4cdf93552e5ceb2e3c042829ebb4de4378492705f769eadc6a7c6c5251624c" +checksum = "51617cf8744634f2ed3c989c3c40cd6444f63377c6d994adab0d85807f3eb682" dependencies = [ "cranelift-codegen", "libc", @@ -689,9 +714,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.83.0" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b859d8cb1806f9ad0f59fdc25cbff576345abfad84c1aba483dd2f8e580e5c" +checksum = "e5a8073a41efc173fd19bad3f725c170c705df6da999fc47a738ff310225dd63" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -714,9 +739,9 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" dependencies = [ "atty", "cast", @@ -740,9 +765,9 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" dependencies = [ "cast", "itertools", @@ -750,9 +775,9 @@ dependencies = [ [[package]] name = "crossbeam" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ "cfg-if", "crossbeam-channel", @@ -764,9 +789,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ "cfg-if", "crossbeam-utils", @@ -774,9 +799,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -785,23 +810,23 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" dependencies = [ "autocfg 1.1.0", "cfg-if", "crossbeam-utils", - "lazy_static", "memoffset", + "once_cell", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" dependencies = [ "cfg-if", "crossbeam-utils", @@ -809,12 +834,12 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" dependencies = [ "cfg-if", - "lazy_static", + "once_cell", ] [[package]] @@ -823,7 +848,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f83bd3bb4314701c568e340cd8cf78c975aa0ca79e03d3f6d1677d5b0c9c0c03" dependencies = [ - "generic-array 0.14.5", + "generic-array 0.14.6", "rand_core 0.6.3", "subtle", "zeroize", @@ -831,11 +856,12 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.5", + "generic-array 0.14.6", + "rand_core 0.6.3", "typenum", ] @@ -845,7 +871,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.5", + "generic-array 0.14.6", "subtle", ] @@ -855,7 +881,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.5", + "generic-array 0.14.6", "subtle", ] @@ -905,12 +931,14 @@ dependencies = [ [[package]] name = "dashmap" -version = "4.0.2" +version = "5.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f" dependencies = [ "cfg-if", - "num_cpus", + "hashbrown 0.12.3", + "lock_api", + "parking_lot_core", ] [[package]] @@ -937,12 +965,11 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61579ada4ec0c6031cfac3f86fdba0d195a7ebeb5e36693bd53cb5999a25beeb" +checksum = "a92e7e37ecef6857fdc0c0c5d42fd5b0938e46590c2183cc92dd310a6d078eb1" dependencies = [ "console", - "lazy_static", ] [[package]] @@ -960,7 +987,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.5", + "generic-array 0.14.6", ] [[package]] @@ -1031,9 +1058,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" [[package]] name = "elliptic-curve" @@ -1043,7 +1070,7 @@ checksum = "beca177dcb8eb540133e7680baff45e7cc4d93bf22002676cec549f82343721b" dependencies = [ "crypto-bigint", "ff", - "generic-array 0.14.5", + "generic-array 0.14.6", "group", "pkcs8", "rand_core 0.6.3", @@ -1059,18 +1086,18 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "enum-iterator" -version = "0.8.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2953d1df47ac0eb70086ccabf0275aa8da8591a28bd358ee2b52bd9f9e3ff9e9" +checksum = "45a0ac4aeb3a18f92eaf09c6bb9b3ac30ff61ca95514fc58cbead1c9a6bf5401" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "0.8.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" +checksum = "b13f1e69590421890f90448c3cd5f554746a31adc6dc0dac406ec6901db8dc25" dependencies = [ "proc-macro2", "quote", @@ -1151,9 +1178,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" dependencies = [ "instant", ] @@ -1180,17 +1207,18 @@ dependencies = [ [[package]] name = "fixedbitset" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fixnum" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83b4df6079ff2f20dfd4c4a13a5c326d985ae35e289df51ff95e71e76b7ada5" +checksum = "d7bb4d4380b82ea92dfa6df95e4dae07879d404e0e25aa44040744fe601221df" dependencies = [ "derive_more", + "itoa 1.0.3", "parity-scale-codec", "serde", "static_assertions", @@ -1199,13 +1227,11 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ - "cfg-if", "crc32fast", - "libc", "miniz_oxide", ] @@ -1242,9 +1268,9 @@ dependencies = [ [[package]] name = "funty" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" @@ -1335,6 +1361,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generic-array" version = "0.12.4" @@ -1346,9 +1381,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", @@ -1379,13 +1414,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -1412,9 +1447,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ "fallible-iterator", "indexmap", @@ -1466,7 +1501,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.2", + "tokio-util 0.7.3", "tracing", ] @@ -1481,6 +1516,15 @@ name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "headers" @@ -1559,13 +1603,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", - "itoa 1.0.2", + "itoa 1.0.3", ] [[package]] @@ -1599,9 +1643,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.19" +version = "0.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" +checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" dependencies = [ "bytes", "futures-channel", @@ -1612,7 +1656,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.2", + "itoa 1.0.3", "pin-project-lite", "socket2", "tokio", @@ -1645,9 +1689,9 @@ dependencies = [ [[package]] name = "impls" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc2ceeb474920e0d451e95df08409ac01a207851b564ba9dafcdb07a34fa6de" +checksum = "7a46645bbd70538861a90d0f26c31537cdf1e44aae99a794fb75a664b70951bc" [[package]] name = "indenter" @@ -1657,12 +1701,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.7.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg 1.1.0", - "hashbrown", + "hashbrown 0.12.3", "serde", ] @@ -1683,9 +1727,9 @@ checksum = "b33c9a5c599d67d051c4dc25eb1b6b4ef715d1763c20c85c688717a1734f204e" [[package]] name = "io-lifetimes" -version = "0.5.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" +checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb" [[package]] name = "iroha" @@ -1789,7 +1833,7 @@ dependencies = [ "thiserror", "tokio", "tracing-flame", - "tracing-subscriber 0.3.11", + "tracing-subscriber", "tungstenite 0.16.0", ] @@ -1797,7 +1841,7 @@ dependencies = [ name = "iroha_client_cli" version = "2.0.0-pre-rc.7" dependencies = [ - "clap 3.1.18", + "clap 3.2.16", "color-eyre", "dialoguer", "iroha_client", @@ -1822,13 +1866,13 @@ dependencies = [ "serde_json", "thiserror", "tracing", - "tracing-subscriber 0.3.11", + "tracing-subscriber", "url", ] [[package]] name = "iroha_config_base" -version = "2.0.0-pre-rc.5" +version = "2.0.0-pre-rc.7" dependencies = [ "crossbeam", "derive_more", @@ -2018,7 +2062,7 @@ dependencies = [ "tracing-bunyan-formatter", "tracing-core", "tracing-futures", - "tracing-subscriber 0.3.11", + "tracing-subscriber", ] [[package]] @@ -2032,7 +2076,7 @@ dependencies = [ name = "iroha_p2p" version = "2.0.0-pre-rc.7" dependencies = [ - "aead", + "aead 0.5.0", "async-stream", "async-trait", "futures", @@ -2136,7 +2180,7 @@ dependencies = [ "streaming-stats", "tokio", "tokio-stream", - "tokio-tungstenite 0.16.1", + "tokio-tungstenite 0.17.2", "url", "vergen", ] @@ -2200,9 +2244,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "ittapi-rs" @@ -2224,9 +2268,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" dependencies = [ "wasm-bindgen", ] @@ -2247,7 +2291,7 @@ dependencies = [ name = "kagami" version = "2.0.0-pre-rc.7" dependencies = [ - "clap 3.1.18", + "clap 3.2.16", "color-eyre", "iroha_config", "iroha_core", @@ -2269,7 +2313,7 @@ checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" name = "kura_inspector" version = "2.0.0-pre-rc.7" dependencies = [ - "clap 3.1.18", + "clap 3.2.16", "iroha_core", "iroha_version", ] @@ -2288,9 +2332,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b" [[package]] name = "libgit2-sys" @@ -2318,9 +2362,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.42" +version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "lock_api" @@ -2364,11 +2408,11 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80" dependencies = [ - "libc", + "rustix", ] [[package]] @@ -2398,18 +2442,18 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", @@ -2505,29 +2549,30 @@ dependencies = [ [[package]] name = "object" -version = "0.27.1" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ "crc32fast", + "hashbrown 0.11.2", "indexmap", "memchr", ] [[package]] name = "object" -version = "0.28.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "oorandom" @@ -2549,9 +2594,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.40" +version = "0.10.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e" +checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" dependencies = [ "bitflags", "cfg-if", @@ -2581,18 +2626,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.20.0+1.1.1o" +version = "111.22.0+1.1.1q" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92892c4f87d56e376e469ace79f1128fdaded07646ddf73aa0be4706ff712dec" +checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.73" +version = "0.9.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0" +checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" dependencies = [ "autocfg 1.1.0", "cc", @@ -2604,21 +2649,21 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" [[package]] name = "owo-colors" -version = "1.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2386b4ebe91c2f7f51082d4cefa145d030e33a1842a96b12e4885cc3c01f7a55" +checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b" [[package]] name = "parity-scale-codec" -version = "2.3.1" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +checksum = "9182e4a71cae089267ab03e67c99368db7cd877baf50f931e5d6d4b71e195ac0" dependencies = [ "arrayvec", "bitvec", @@ -2630,9 +2675,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "2.3.1" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2644,7 +2689,7 @@ dependencies = [ name = "parity_scale_decoder" version = "2.0.0-pre-rc.7" dependencies = [ - "clap 3.1.18", + "clap 3.2.16", "colored", "eyre", "iroha_core", @@ -2661,9 +2706,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", "parking_lot_core", @@ -2684,9 +2729,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22" [[package]] name = "percent-encoding" @@ -2696,9 +2741,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "petgraph" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b305cc4569dd4e8765bab46261f67ef5d4d11a4b6e745100ee5dad8948b46c" +checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ "fixedbitset", "indexmap", @@ -2706,18 +2751,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" dependencies = [ "proc-macro2", "quote", @@ -2754,9 +2799,9 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "plotters" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" +checksum = "9428003b84df1496fb9d6eeee9c5f8145cb41ca375eb0dad204328888832811f" dependencies = [ "num-traits", "plotters-backend", @@ -2767,15 +2812,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" [[package]] name = "plotters-svg" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" +checksum = "e0918736323d1baff32ee0eade54984f6f201ad7e97d5cfb5d6ab4a358529615" dependencies = [ "plotters-backend", ] @@ -2809,10 +2854,11 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "proc-macro-crate" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +checksum = "26d50bfb8c23f23915855a00d98b5a35ef2e0b871bb52937bacadb798fbb66c8" dependencies = [ + "once_cell", "thiserror", "toml", ] @@ -2866,9 +2912,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.18" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871372391786ccec00d3c5d3d6608905b3d4db263639cfe075d3b60a736d115a" +checksum = "f446d0a6efba22928558c4fb4ce0b3fd6c89b0061343e390bf01a703742b8125" dependencies = [ "cc", ] @@ -2890,9 +2936,9 @@ dependencies = [ [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -2996,7 +3042,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.7", ] [[package]] @@ -3082,9 +3128,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags", ] @@ -3095,27 +3141,28 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.7", "redox_syscall", "thiserror", ] [[package]] -name = "regalloc" -version = "0.0.34" +name = "regalloc2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" +checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" dependencies = [ + "fxhash", "log", - "rustc-hash", + "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.5.6" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -3130,9 +3177,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.26" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "region" @@ -3161,12 +3208,6 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc_version" version = "0.4.0" @@ -3178,29 +3219,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.33.7" +version = "0.35.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" +checksum = "d51cc38aa10f6bbb377ed28197aa052aa4e2b762c22be9d3153d01822587e787" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "winapi", + "windows-sys", ] [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" [[package]] name = "ryu" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "safemem" @@ -3284,24 +3325,24 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.9" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" +checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" [[package]] name = "serde" -version = "1.0.137" +version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212e73464ebcde48d723aa02eb270ba62eff38a9b732df31f33f1b4e145f3a54" +checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" dependencies = [ "serde", ] @@ -3318,9 +3359,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e" dependencies = [ "proc-macro2", "quote", @@ -3329,11 +3370,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" dependencies = [ - "itoa 1.0.2", + "itoa 1.0.3", "ryu", "serde", ] @@ -3345,7 +3386,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.2", + "itoa 1.0.3", "ryu", "serde", ] @@ -3468,9 +3509,18 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "slice-group-by" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "smallstr" @@ -3484,9 +3534,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" dependencies = [ "serde", ] @@ -3539,18 +3589,18 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" +checksum = "4faebde00e8ff94316c01800f9054fd2ba77d30d9e922541913051d1d978918b" dependencies = [ "heck", "proc-macro2", @@ -3682,18 +3732,18 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" dependencies = [ "proc-macro2", "quote", @@ -3711,21 +3761,23 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] [[package]] name = "time" -version = "0.3.9" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f" dependencies = [ - "itoa 1.0.2", + "itoa 1.0.3", + "js-sys", "libc", "num_threads", ] @@ -3757,10 +3809,11 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.18.2" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" +checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" dependencies = [ + "autocfg 1.1.0", "bytes", "libc", "memchr", @@ -3776,9 +3829,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", @@ -3787,9 +3840,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" dependencies = [ "futures-core", "pin-project-lite", @@ -3811,14 +3864,14 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.16.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e80b39df6afcc12cdf752398ade96a6b9e99c903dfdc36e53ad10b9c366bca72" +checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.16.0", + "tungstenite 0.17.3", ] [[package]] @@ -3837,9 +3890,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ "bytes", "futures-core", @@ -3860,15 +3913,15 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.34" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" dependencies = [ "cfg-if", "log", @@ -3879,9 +3932,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ "proc-macro2", "quote", @@ -3890,39 +3943,39 @@ dependencies = [ [[package]] name = "tracing-bunyan-formatter" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99ff040622c69c0fc4bd3ea5fe16630ce46400a79bd41339391b2d416ea24c" +checksum = "a788f2119fde477cd33823330c14004fa8cdac6892fd6f12181bbda9dbf14fc9" dependencies = [ "gethostname", "log", "serde", "serde_json", - "time 0.3.9", + "time 0.3.12", "tracing", "tracing-core", "tracing-log", - "tracing-subscriber 0.3.11", + "tracing-subscriber", ] [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" dependencies = [ - "lazy_static", + "once_cell", "valuable", ] [[package]] name = "tracing-error" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d7c0b83d4a500748fa5879461652b361edf5c9d51ede2a2ac03875ca185e24" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" dependencies = [ "tracing", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] @@ -3933,7 +3986,7 @@ checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" dependencies = [ "lazy_static", "tracing", - "tracing-subscriber 0.3.11", + "tracing-subscriber", ] [[package]] @@ -3959,20 +4012,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.25" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" +checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" dependencies = [ "ansi_term", "sharded-slab", @@ -3989,9 +4031,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trybuild" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "764b9e244b482a9b81bde596aa37aa6f1347bf8007adab25e59f901b32b4e0a0" +checksum = "e7f408301c7480f9e6294eb779cfc907f54bd901a9660ef24d7f233ed5376485" dependencies = [ "glob", "once_cell", @@ -4040,6 +4082,25 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +dependencies = [ + "base64", + "byteorder", + "bytes", + "http", + "httparse", + "log", + "rand 0.8.5", + "sha-1 0.10.0", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "twoway" version = "0.1.8" @@ -4072,15 +4133,15 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" dependencies = [ "tinyvec", ] @@ -4112,7 +4173,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.5", + "generic-array 0.14.6", "subtle", ] @@ -4135,7 +4196,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8760a62e18e4d3e3f599e15c09a9f9567fd9d4a90594d45166162be8d232e63b" dependencies = [ - "aead", + "aead 0.3.2", "aes", "aes-gcm", "amcl", @@ -4163,7 +4224,7 @@ dependencies = [ "sha2", "sha3 0.9.1", "subtle", - "time 0.1.43", + "time 0.1.44", "x25519-dalek", "zeroize", ] @@ -4194,18 +4255,18 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "5.1.17" +version = "7.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cf88d94e969e7956d924ba70741316796177fa0c79a2c9f4ab04998d96e966e" +checksum = "3bbc4fafd30514504c7593cfa52eaf4d6c4ef660386e2ec54edc17f14aa08e8d" dependencies = [ "anyhow", "cfg-if", - "chrono", "enum-iterator", "getset", "git2", "rustversion", "thiserror", + "time 0.3.12", ] [[package]] @@ -4273,9 +4334,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasi" @@ -4285,9 +4346,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4295,13 +4356,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", "syn", @@ -4310,9 +4371,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4320,9 +4381,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ "proc-macro2", "quote", @@ -4333,21 +4394,33 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" + +[[package]] +name = "wasm-encoder" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "8905fd25fdadeb0e7e8bf43a9f46f9f972d6291ad0c7a32573b88dd13a6cfa6b" +dependencies = [ + "leb128", +] [[package]] name = "wasmparser" -version = "0.83.0" +version = "0.86.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" +checksum = "4bcbfe95447da2aa7ff171857fc8427513eb57c75a729bb190e974dc695e8f5c" +dependencies = [ + "indexmap", +] [[package]] name = "wasmtime" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beb256f8514dd3eb85b03bceb422abfff5f07bf564519cbe0abf80462120bc0" +checksum = "0d10a6853d64e99fffdae80f93a45080475c9267f87743060814dc1186d74618" dependencies = [ "anyhow", "async-trait", @@ -4358,7 +4431,7 @@ dependencies = [ "lazy_static", "libc", "log", - "object 0.27.1", + "object 0.28.4", "once_cell", "paste", "psm", @@ -4374,14 +4447,14 @@ dependencies = [ "wasmtime-jit", "wasmtime-runtime", "wat", - "winapi", + "windows-sys", ] [[package]] name = "wasmtime-cache" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a0a7bd250adf9d4ee6eed952058aa5ee102ab25e0f6ed1f9ab1212db5cb4ac9" +checksum = "0617b2f4c897b6a89b9d143466f3c724b9a36c6eabc443bf463f4e1ad48a2ccd" dependencies = [ "anyhow", "base64", @@ -4393,15 +4466,15 @@ dependencies = [ "serde", "sha2", "toml", - "winapi", + "windows-sys", "zstd", ] [[package]] name = "wasmtime-cranelift" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e8f126b9c55e9550391617049f468878cb9f4af75f33009be72f0c692e1d2ed" +checksum = "3302b33d919e8e33f1717d592c10c3cddccb318d0e1e0bef75178f579686ba94" dependencies = [ "anyhow", "cranelift-codegen", @@ -4412,7 +4485,7 @@ dependencies = [ "gimli", "log", "more-asserts", - "object 0.27.1", + "object 0.28.4", "target-lexicon", "thiserror", "wasmparser", @@ -4421,9 +4494,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343cfc7e7604b063ef0429e043a06e077a39bcb1ce3e731abe0414431f2610de" +checksum = "7c50fb925e8eaa9f8431f9b784ea89a13c703cb445ddfe51cb437596fc34e734" dependencies = [ "anyhow", "cranelift-entity", @@ -4431,7 +4504,7 @@ dependencies = [ "indexmap", "log", "more-asserts", - "object 0.27.1", + "object 0.28.4", "serde", "target-lexicon", "thiserror", @@ -4441,20 +4514,21 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c5449d5dc7908e284c957754e355465c3588aee31f0c547a5f3cef35c16b62" +checksum = "2f6aba0b317746e8213d1f36a4c51974e66e69c1f05bfc09ed29b4d4bda290eb" dependencies = [ "cc", + "cfg-if", "rustix", - "winapi", + "windows-sys", ] [[package]] name = "wasmtime-jit" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f3a31bf04f02ec7497ddeda20e14b640b1e4d9e1c55c1ebdb268bf30800e2d" +checksum = "cad81635f33ab69aa04b386c9d954aef9f6230059f66caf67e55fb65bfd2f3e0" dependencies = [ "addr2line", "anyhow", @@ -4464,7 +4538,7 @@ dependencies = [ "gimli", "ittapi-rs", "log", - "object 0.27.1", + "object 0.28.4", "region", "rustc-demangle", "rustix", @@ -4474,25 +4548,25 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit-debug", "wasmtime-runtime", - "winapi", + "windows-sys", ] [[package]] name = "wasmtime-jit-debug" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e725c3a37e49bd95d2d350c9f1b6641ac6e75bc357204e857ac058d0c64b720" +checksum = "55e23273fddce8cab149a0743c46932bf4910268641397ed86b46854b089f38f" dependencies = [ "lazy_static", - "object 0.27.1", + "object 0.28.4", "rustix", ] [[package]] name = "wasmtime-runtime" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ed30d50ffd763873f49df0c94efa20c17749f375518117d6677cc29b631a1fc" +checksum = "36b8aafb292502d28dc2d25f44d4a81e229bb2e0cc14ca847dde4448a1a62ae4" dependencies = [ "anyhow", "backtrace", @@ -4512,14 +4586,14 @@ dependencies = [ "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", - "winapi", + "windows-sys", ] [[package]] name = "wasmtime-types" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72080d5bdd54af03de7f5ca8b67dcd8ea36f4dfec75fc89a976ebc847ee1516e" +checksum = "dd7edc34f358fc290d12e326de81884422cb94cf74cc305b27979569875332d6" dependencies = [ "cranelift-entity", "serde", @@ -4529,29 +4603,30 @@ dependencies = [ [[package]] name = "wast" -version = "41.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f882898b8b817cc4edc16aa3692fdc087b356edc8cc0c2164f5b5181e31c3870" +checksum = "186c474c4f9bb92756b566d592a16591b4526b1a4841171caa3f31d7fe330d96" dependencies = [ "leb128", "memchr", "unicode-width", + "wasm-encoder", ] [[package]] name = "wat" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b3b9b3e39e66c7fd3f8be785e74444d216260f491e93369e317ed6482ff80f" +checksum = "c2d4bc4724b4f02a482c8cab053dac5ef26410f264c06ce914958f9a42813556" dependencies = [ "wast", ] [[package]] name = "web-sys" -version = "0.3.57" +version = "0.3.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" dependencies = [ "js-sys", "wasm-bindgen", @@ -4559,9 +4634,9 @@ dependencies = [ [[package]] name = "wildmatch" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c48bd20df7e4ced539c12f570f937c6b4884928a87fee70a479d72f031d4e0" +checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" [[package]] name = "winapi" @@ -4639,9 +4714,12 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "wyz" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +dependencies = [ + "tap", +] [[package]] name = "x25519-dalek" diff --git a/Dockerfile.base b/Dockerfile.base index 3c9324b2546..d2772ce146b 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -5,14 +5,14 @@ RUN set -eux && \ rustup set profile minimal && \ rustup toolchain add stable && \ rustup component add llvm-tools-preview clippy && \ - rustup install --profile default nightly-2022-04-20 && \ - rustup toolchain add nightly-2022-04-20-x86_64-unknown-linux-musl && \ + rustup install --profile default nightly-2022-08-09 && \ + rustup toolchain add nightly-2022-08-09-x86_64-unknown-linux-musl && \ rustup component add rust-src && \ - rustup component add rust-src --toolchain nightly-2022-04-20-x86_64-unknown-linux-musl && \ - rustup component add rustfmt --toolchain nightly-2022-04-20-x86_64-unknown-linux-musl && \ + rustup component add rust-src --toolchain nightly-2022-08-09-x86_64-unknown-linux-musl && \ + rustup component add rustfmt --toolchain nightly-2022-08-09-x86_64-unknown-linux-musl && \ rustup component add rust-std && \ # rustup target add wasm32-unknown-unknown && \ - rustup target add wasm32-unknown-unknown --toolchain nightly-2022-04-20 && \ + rustup target add wasm32-unknown-unknown --toolchain nightly-2022-08-09 && \ cargo install cargo-lints cargo-nono webassembly-test-runner && \ rustup target add x86_64-unknown-linux-musl && \ pacman -S musl rust-musl --noconfirm diff --git a/actor/Cargo.toml b/actor/Cargo.toml index 2137376fd8d..31672414c2b 100644 --- a/actor/Cargo.toml +++ b/actor/Cargo.toml @@ -16,12 +16,12 @@ iroha_actor_derive = { version = "=2.0.0-pre-rc.7", path = "derive" } iroha_logger = { version = "=2.0.0-pre-rc.7", path = "../logger" } iroha_primitives = { version = "=2.0.0-pre-rc.7", path = "../primitives" } -async-trait = "0.1" -once_cell = "1.8.0" -dashmap = "4" -futures = { version = "0.3.17", default-features = false, features = ["std", "async-await"] } -tokio = { version = "1.6.0", features = ["sync", "time", "rt", "rt-multi-thread", "macros"]} -thiserror = "1.0.28" +async-trait = "0.1.57" +once_cell = "1.13.0" +dashmap = "5.3.4" +futures = { version = "0.3.21", default-features = false, features = ["std", "async-await"] } +tokio = { version = "1.20.1", features = ["sync", "time", "rt", "rt-multi-thread", "macros"] } +thiserror = "1.0.32" petgraph = { version = "0.6", default-features = false, optional = true } derive_more = "0.99.17" diff --git a/actor/derive/Cargo.toml b/actor/derive/Cargo.toml index 4b0a23a2b20..53a855c86fb 100644 --- a/actor/derive/Cargo.toml +++ b/actor/derive/Cargo.toml @@ -8,12 +8,12 @@ edition = "2021" proc-macro = true [dependencies] -syn = { version = "1.0" } -quote = "1.0" -proc-macro2 = "1.0" -proc-macro-error = "1.0" +syn = "1.0.99" +quote = "1.0.21" +proc-macro2 = "1.0.43" +proc-macro-error = "1.0.4" [dev-dependencies] iroha_actor = { version = "=2.0.0-pre-rc.7", path = "../" } -trybuild = "1.0.53" +trybuild = "1.0.64" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 113486ea339..81379afeb8f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -51,16 +51,16 @@ iroha_p2p = { version = "=2.0.0-pre-rc.7", path = "../p2p" } iroha_schema_gen = { version = "=2.0.0-pre-rc.7", path = "../schema/gen", optional = true } iroha_cli_derive = { version = "=2.0.0-pre-rc.7", path = "derive" } -async-trait = "0.1" -color-eyre = "0.5.11" -eyre = "0.6.5" -futures = { version = "0.3.17", default-features = false, features = ["std", "async-await"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -thiserror = "1.0.28" -tokio = { version = "1.6.0", features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs", "signal"] } -warp = "0.3" +async-trait = "0.1.57" +color-eyre = "0.6.2" +eyre = "0.6.8" +futures = { version = "0.3.21", default-features = false, features = ["std", "async-await"] } +parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] } +serde = { version = "1.0.142", features = ["derive"] } +serde_json = "1.0.83" +thiserror = "1.0.32" +tokio = { version = "1.20.1", features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs", "signal"] } +warp = "0.3.2" serial_test = "0.8.0" [dev-dependencies] diff --git a/cli/derive/Cargo.toml b/cli/derive/Cargo.toml index 405f8bd15a5..7c07894dc8d 100644 --- a/cli/derive/Cargo.toml +++ b/cli/derive/Cargo.toml @@ -9,9 +9,9 @@ edition = "2021" proc-macro = true [dependencies] -syn = {version = "1", features = ["parsing", "printing", "extra-traits"] } -quote = "1.0" -proc-macro2 = "1.0" +syn = { version = "1.0.99", features = ["parsing", "printing", "extra-traits"] } +quote = "1.0.21" +proc-macro2 = "1.0.43" [dev-dependencies] -warp = "0.3" +warp = "0.3.2" diff --git a/client/Cargo.toml b/client/Cargo.toml index 1a514a2c84a..b7eb1617243 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -26,17 +26,17 @@ iroha_telemetry = { version ="=2.0.0-pre-rc.7", path = "../telemetry" } iroha_version = { version = "=2.0.0-pre-rc.7", path = "../version" } iroha_core = { version = "=2.0.0-pre-rc.7", path = "../core", features = ["dev-telemetry", "telemetry"]} -attohttpc = "0.18" -eyre = "0.6.5" -http = "0.2.1" -rand = "0.8" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -tungstenite = { version = "0.16" } +attohttpc = "0.18.0" +eyre = "0.6.8" +http = "0.2.8" +rand = "0.8.5" +serde = { version = "1.0.142", features = ["derive"] } +serde_json = "1.0.83" +tungstenite = "0.16" base64 = "0.13.0" -thiserror = "1.0.30" +thiserror = "1.0.32" derive_more = "0.99.17" -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] } [dev-dependencies] @@ -44,14 +44,14 @@ iroha_permissions_validators = { version = "=2.0.0-pre-rc.7", path = "../permiss iroha = { path = "../cli", features = ["dev-telemetry", "telemetry"] } test_network = { version = "=2.0.0-pre-rc.7", path = "../core/test_network" } -tokio = { version = "1.6.0", features = ["rt", "rt-multi-thread"]} -criterion = { version = "0.3.5", features = ["html_reports"] } -color-eyre = "0.5.11" -tempfile = "3" -hex = "0.4.0" +tokio = { version = "1.20.1", features = ["rt", "rt-multi-thread"] } +criterion = { version = "0.3.6", features = ["html_reports"] } +color-eyre = "0.6.2" +tempfile = "3.3.0" +hex = "0.4.3" -tracing-subscriber = { version = "0.3.0", default-features = false, features = ["fmt", "ansi"] } -tracing-flame = { version = "0.2.0" } +tracing-subscriber = { version = "0.3.15", default-features = false, features = ["fmt", "ansi"] } +tracing-flame = "0.2.0" [[bench]] name = "torii" diff --git a/client/build.rs b/client/build.rs index 6906589ed49..55a386a59c2 100644 --- a/client/build.rs +++ b/client/build.rs @@ -58,7 +58,7 @@ fn main() { .env("CARGO_TARGET_DIR", out_dir) .current_dir(smartcontract_path) .args(&[ - "+nightly-2022-04-20", + "+nightly-2022-08-09", "build", "--release", "-Z", diff --git a/client/examples/million_accounts_genesis.rs b/client/examples/million_accounts_genesis.rs index 4bfb415fb1b..17e19decae2 100644 --- a/client/examples/million_accounts_genesis.rs +++ b/client/examples/million_accounts_genesis.rs @@ -1,6 +1,6 @@ #![allow(missing_docs, clippy::pedantic, clippy::restriction)] -use std::{thread, time::Duration}; +use std::{collections::HashSet, thread, time::Duration}; use iroha::samples::get_config; use iroha_core::genesis::{ diff --git a/client/src/client.rs b/client/src/client.rs index 123e0769bc6..897faa5c1fe 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -74,7 +74,7 @@ where | StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN | StatusCode::NOT_FOUND => { - let mut res = QueryError::decode_all(resp.body().as_ref()); + let mut res = QueryError::decode_all(&mut resp.body().as_ref()); if res.is_err() { warn!("Can't decode query error, not all bytes were consumed"); res = QueryError::decode(&mut resp.body().as_ref()); @@ -569,25 +569,39 @@ impl Client { /// /// # Examples /// - /// ```rust,ignore + /// ```rust /// use eyre::Result; /// use iroha_client::{ /// client::{Client, ResponseHandler}, - /// http::{RequestBuilder, Response}, + /// http::{RequestBuilder, Response, Method}, /// }; - /// use iroha_data_model::prelude::{Account, FindAllAccounts, Pagination}; + /// use iroha_data_model::{predicate::PredicateBox, prelude::{Account, FindAllAccounts, Pagination}}; /// /// struct YourAsyncRequest; /// /// impl YourAsyncRequest { /// async fn send(self) -> Response> { - /// // do the stuff + /// todo!() /// } /// } /// /// // Implement builder for this request /// impl RequestBuilder for YourAsyncRequest { - /// // ... + /// fn new(_: Method, url: impl AsRef) -> Self { + /// todo!() + /// } + /// + /// fn param, V: ToString>(self, _: K, _: V) -> Self { + /// todo!() + /// } + /// + /// fn header, V: ToString>(self, _: N, _: V) -> Self { + /// todo!() + /// } + /// + /// fn body(self, data: Vec) -> Self { + /// todo!() + /// } /// } /// /// async fn fetch_accounts(client: &Client) -> Result> { @@ -596,6 +610,7 @@ impl Client { /// let (req, resp_handler) = client.prepare_query_request::<_, YourAsyncRequest>( /// FindAllAccounts::new(), /// Pagination::default(), + /// PredicateBox::default(), /// )?; /// /// // Do what you need to send the request and to get the response diff --git a/client/src/http.rs b/client/src/http.rs index bc1787499c5..ea1d22df6cc 100644 --- a/client/src/http.rs +++ b/client/src/http.rs @@ -161,14 +161,14 @@ pub mod ws { /// initial WS flow stage - [`crate::client::events_api::flow::Init`]. /// Here is an example (oversimplified) of how you can use it: /// - /// ```rust,ignore + /// ```rust /// use eyre::Result; /// use iroha_data_model::prelude::Event; /// use iroha_client::{ /// client::events_api::flow as events_api_flow, /// http::{ /// ws::conn_flow::{EventData, Events, Handshake, Init, InitData}, - /// RequestBuilder, + /// RequestBuilder, Method /// }, /// }; /// @@ -176,12 +176,28 @@ pub mod ws { /// struct MyBuilder; /// /// impl RequestBuilder for MyBuilder { - /// /* ... */ + /// fn new(_: Method, url: impl AsRef) -> Self { + /// todo!() + /// } + /// + /// fn param, V: ToString>(self, _: K, _: V) -> Self { + /// todo!() + /// } + /// + /// fn header, V: ToString>(self, _: N, _: V) -> Self { + /// todo!() + /// } + /// + /// fn body(self, data: Vec) -> Self { + /// todo!() + /// } /// } /// /// impl MyBuilder { + /// /// fn connect(self) -> MyStream { /// /* ... */ + /// MyStream {} /// } /// } /// @@ -192,8 +208,9 @@ pub mod ws { /// // Receive message /// fn get_next(&self) -> Vec { /// /* ... */ + /// Vec::new() /// } - /// + /// /// // Send message /// fn send(&self, msg: Vec) { /// /* ... */ diff --git a/client_cli/Cargo.toml b/client_cli/Cargo.toml index 49a879d7807..06adff721a7 100644 --- a/client_cli/Cargo.toml +++ b/client_cli/Cargo.toml @@ -22,7 +22,7 @@ iroha_data_model = { version = "=2.0.0-pre-rc.7", path = "../data_model" } iroha_crypto = { version = "=2.0.0-pre-rc.7", path = "../crypto" } iroha_config = { version = "=2.0.0-pre-rc.7", path = "../config" } -color-eyre = "0.5.11" -clap = { version = "3.1.10", features = ["derive"] } -dialoguer = { version = "0.9", default-features = false } -serde_json = "1.0" +color-eyre = "0.6.2" +clap = { version = "3.2.16", features = ["derive"] } +dialoguer = { version = "0.10.2", default-features = false } +serde_json = "1.0.83" diff --git a/config/Cargo.toml b/config/Cargo.toml index 444bbde827f..979441c044b 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -9,13 +9,13 @@ iroha_config_base = { path = "base" } iroha_data_model = { version = "=2.0.0-pre-rc.7", path = "../data_model" } iroha_primitives = { version = "=2.0.0-pre-rc.7", path = "../primitives" } iroha_crypto = { version = "=2.0.0-pre-rc.7", path = "../crypto" } -eyre = "0.6.5" -tracing = "0.1.13" -tracing-subscriber = { version = "0.3.0", default-features = false, features = ["fmt", "ansi"] } +eyre = "0.6.8" +tracing = "0.1.36" +tracing-subscriber = { version = "0.3.15", default-features = false, features = ["fmt", "ansi"] } url = { version = "2.2.2", features = ["serde"] } -serde = { version = "1.0", default-features = false, features = ["derive"] } -serde_json = "1.0" -thiserror = "1.0.30" -crossbeam = "0.8.1" +serde = { version = "1.0.142", default-features = false, features = ["derive"] } +serde_json = "1.0.83" +thiserror = "1.0.32" +crossbeam = "0.8.2" derive_more = "0.99.17" diff --git a/config/base/Cargo.toml b/config/base/Cargo.toml index bdeee1bcc23..b6156f74966 100644 --- a/config/base/Cargo.toml +++ b/config/base/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "iroha_config_base" -version = "2.0.0-pre-rc.5" +version = "2.0.0-pre-rc.7" authors = ["Iroha 2 team "] edition = "2021" [dependencies] iroha_config_derive = { path = "derive" } -serde = { version = "1.0", default-features = false, features = ["derive"] } -serde_json = "1.0" -thiserror = "1.0.30" -crossbeam = "0.8.1" +serde = { version = "1.0.142", default-features = false, features = ["derive"] } +serde_json = "1.0.83" +thiserror = "1.0.32" +crossbeam = "0.8.2" derive_more = "0.99.17" diff --git a/config/base/derive/Cargo.toml b/config/base/derive/Cargo.toml index ea1fcf157e8..eb48be8a235 100644 --- a/config/base/derive/Cargo.toml +++ b/config/base/derive/Cargo.toml @@ -8,8 +8,8 @@ edition = "2021" proc-macro = true [dependencies] -syn = { version = "1.0", default-features = false, features = ["derive", "parsing", "proc-macro", "clone-impls", "printing"] } +syn = { version = "1.0.99", default-features = false, features = ["derive", "parsing", "proc-macro", "clone-impls", "printing"] } # This is the maximally compressed set of features. Yes we also need "printing". -quote = "1.0" -proc-macro2 = "1.0" -proc-macro-error = "1.0" +quote = "1.0.21" +proc-macro2 = "1.0.43" +proc-macro-error = "1.0.4" diff --git a/core/Cargo.toml b/core/Cargo.toml index dd177ca2679..3f80e1a9dd5 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -47,34 +47,34 @@ iroha_telemetry = { version = "=2.0.0-pre-rc.7", path = "../telemetry" } iroha_schema = { version = "=2.0.0-pre-rc.7", path = "../schema" } iroha_primitives = { version = "=2.0.0-pre-rc.7", path = "../primitives" } -async-trait = "0.1" -async-stream = "0.3.2" -dashmap = { version = "4.0" } -eyre = "0.6.5" -futures = { version = "0.3.17", default-features = false, features = ["std", "async-await"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } -rand = "0.8" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -tokio = { version = "1.6.0", features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs"]} -tokio-stream = { version = "0.1.6", features = ["fs"]} -crossbeam-queue = "0.3" -thiserror = "1.0.28" -pin-project = "1" -wasmtime = "0.36.0" +async-trait = "0.1.57" +async-stream = "0.3.3" +dashmap = "5.3.4" +eyre = "0.6.8" +futures = { version = "0.3.21", default-features = false, features = ["std", "async-await"] } +parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] } +rand = "0.8.5" +serde = { version = "1.0.142", features = ["derive"] } +serde_json = "1.0.83" +tokio = { version = "1.20.1", features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs"] } +tokio-stream = { version = "0.1.9", features = ["fs"] } +crossbeam-queue = "0.3.6" +thiserror = "1.0.32" +pin-project = "1.0.11" +wasmtime = "0.39.1" byteorder = "1.4.3" # transitive dependencies -anyhow = ">= 1.0" +anyhow = "1.0.60" derive_more = "0.99.17" getset = "0.1.2" [dev-dependencies] -tempfile = "3" -criterion = "0.3" -hex = "0.4.0" -byte-unit = "4.0.12" -once_cell = "1.8.0" +tempfile = "3.3.0" +criterion = "0.3.6" +hex = "0.4.3" +byte-unit = "4.0.14" +once_cell = "1.13.0" [[bench]] name = "sumeragi" diff --git a/core/test_network/Cargo.toml b/core/test_network/Cargo.toml index 21f5b88c02b..6b0e0d58718 100644 --- a/core/test_network/Cargo.toml +++ b/core/test_network/Cargo.toml @@ -21,13 +21,13 @@ iroha_logger = { version = "=2.0.0-pre-rc.7", path = "../../logger" } iroha_permissions_validators = { version = "=2.0.0-pre-rc.7", path = "../../permissions_validators" } -eyre = "0.6.5" -futures = { version = "0.3.17", default-features = false, features = ["std", "async-await"] } -once_cell = "1.8.0" -rand = "0.8" -tempfile = "3" -tokio = { version = "1.6.0", features = ["rt", "rt-multi-thread", "macros"]} +eyre = "0.6.8" +futures = { version = "0.3.21", default-features = false, features = ["std", "async-await"] } +once_cell = "1.13.0" +rand = "0.8.5" +tempfile = "3.3.0" +tokio = { version = "1.20.1", features = ["rt", "rt-multi-thread", "macros"] } unique_port = "0.2.1" [dev-dependencies] -async-trait = "0.1" +async-trait = "0.1.57" diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml index 2266ccc1846..f8d7da893c2 100644 --- a/crypto/Cargo.toml +++ b/crypto/Cargo.toml @@ -24,14 +24,14 @@ iroha_primitives = { path = "../primitives", version = "=2.0.0-pre-rc.7", defaul iroha_ffi = { path = "../ffi", version = "=2.0.0-pre-rc.7" } iroha_schema = { path = "../schema" } -derive_more = { version = "0.99.16", default-features = false, features = ["deref", "deref_mut", "display"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive", "full"] } -serde = { version = "1.0.130", default-features = false, features = ["derive"] } -hex = { version = "0.4.0", default-features = false, features = ["alloc", "serde"] } -openssl-sys = { version = "0.9.72", features = ["vendored"], optional = true } -ursa = { version = "=0.3.7", optional = true } +derive_more = { version = "0.99.17", default-features = false, features = ["deref", "deref_mut", "display"] } +parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive", "full"] } +serde = { version = "1.0.142", default-features = false, features = ["derive"] } +hex = { version = "0.4.3", default-features = false, features = ["alloc", "serde"] } +openssl-sys = { version = "0.9.75", features = ["vendored"], optional = true } +ursa = { version = "0.3.7", optional = true } getset = "0.1.2" [dev-dependencies] hex-literal = "0.3.4" -serde_json = "1.0.59" +serde_json = "1.0.83" diff --git a/data_model/Cargo.toml b/data_model/Cargo.toml index 7f978f11106..bf6295c8891 100644 --- a/data_model/Cargo.toml +++ b/data_model/Cargo.toml @@ -39,28 +39,28 @@ iroha_version = { path = "../version", version = "=2.0.0-pre-rc.7", default-feat iroha_schema = { path = "../schema", version = "=2.0.0-pre-rc.7" } iroha_ffi = { path = "../ffi", version = "=2.0.0-pre-rc.7" } -dashmap = { version = "4.0", optional = true} -tokio = { version = "1.6.0", features = ["sync", "rt-multi-thread"], optional = true} -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } -derive_more = { version = "0.99.16", default-features = false, features = ["as_ref", "display", "constructor", "from_str", "from", "into"] } -serde = { version = "1.0", default-features = false, features = ["derive"] } -serde_json = { version = "1.0.59", default-features = false } -warp = { version = "0.3", default-features = false, optional = true } -thiserror = { version = "1.0.28", optional = true } +dashmap = { version = "5.3.4", optional = true } +tokio = { version = "1.20.1", features = ["sync", "rt-multi-thread"], optional = true } +parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] } +derive_more = { version = "0.99.17", default-features = false, features = ["as_ref", "display", "constructor", "from_str", "from", "into"] } +serde = { version = "1.0.142", default-features = false, features = ["derive"] } +serde_json = { version = "1.0.83", default-features = false } +warp = { version = "0.3.2", default-features = false, optional = true } +thiserror = { version = "1.0.32", optional = true } getset = "0.1.2" -strum = { version = "0.24.0", default-features = false, features = ["derive"] } +strum = { version = "0.24.1", default-features = false, features = ["derive"] } [dev-dependencies] iroha_core = { path = "../core", version = "=2.0.0-pre-rc.7" } iroha_client = { path = "../client", version = "=2.0.0-pre-rc.7" } iroha = { path = "../cli" } -hex = { version = "0.4.0", default-features = false, features = ["alloc", "serde"] } +hex = { version = "0.4.3", default-features = false, features = ["alloc", "serde"] } test_network = { path = "../core/test_network", version = "=2.0.0-pre-rc.7" } -tokio = { version = "1.6.0", features = ["rt", "rt-multi-thread"]} -trybuild = "1.0.53" -criterion = "0.3" +tokio = { version = "1.20.1", features = ["rt", "rt-multi-thread"] } +trybuild = "1.0.64" +criterion = "0.3.6" [[bench]] name = "time_event_filter" diff --git a/data_model/derive/Cargo.toml b/data_model/derive/Cargo.toml index 058f087d3b2..52340aadf43 100644 --- a/data_model/derive/Cargo.toml +++ b/data_model/derive/Cargo.toml @@ -9,6 +9,6 @@ edition = "2021" proc-macro = true [dependencies] -syn = { version = "1" } -quote = "1.0" -proc-macro2 = "1.0" +syn = "1.0.99" +quote = "1.0.21" +proc-macro2 = "1.0.43" diff --git a/data_model/src/query.rs b/data_model/src/query.rs index abe2d8e5ecb..19de545cd46 100644 --- a/data_model/src/query.rs +++ b/data_model/src/query.rs @@ -3,7 +3,7 @@ #![allow(clippy::missing_inline_in_public_items)] #[cfg(not(feature = "std"))] -use alloc::{boxed::Box, format, string::String, vec::Vec}; +use alloc::{format, string::String, vec::Vec}; use derive_more::Display; use iroha_crypto::SignatureOf; diff --git a/ffi/derive/Cargo.toml b/ffi/derive/Cargo.toml index 088333627de..ac622e278c4 100644 --- a/ffi/derive/Cargo.toml +++ b/ffi/derive/Cargo.toml @@ -8,14 +8,14 @@ edition = "2021" proc-macro = true [dependencies] -syn = { version = "1.0", features = ["full", "visit", "visit-mut", "extra-traits"] } -quote = "1.0" -proc-macro2 = "1.0" -proc-macro-error = "1.0" +syn = { version = "1.0.99", features = ["full", "visit", "visit-mut", "extra-traits"] } +quote = "1.0.21" +proc-macro2 = "1.0.43" +proc-macro-error = "1.0.4" derive_more = "0.99.17" [dev-dependencies] iroha_ffi = { version = "=2.0.0-pre-rc.7", path = "../" } getset = "0.1.2" -trybuild = "1.0.53" +trybuild = "1.0.64" diff --git a/futures/Cargo.toml b/futures/Cargo.toml index 700550ca0c3..1cdd9daba45 100644 --- a/futures/Cargo.toml +++ b/futures/Cargo.toml @@ -15,10 +15,10 @@ telemetry = ["iroha_futures_derive/telemetry"] iroha_futures_derive = { version = "=2.0.0-pre-rc.7", path = "derive" } iroha_logger = { version = "=2.0.0-pre-rc.7", path = "../logger" } -rand = "0.8" -serde_json = "1" -serde = { version = "1", features = ["derive"] } -tokio = { version = "1.6.0", features = ["rt", "rt-multi-thread", "macros"]} +rand = "0.8.5" +serde_json = "1.0.83" +serde = { version = "1.0.142", features = ["derive"] } +tokio = { version = "1.20.1", features = ["rt", "rt-multi-thread", "macros"] } [dev-dependencies] -tokio-stream = { version = "0.1.6" } +tokio-stream = "0.1.9" diff --git a/futures/derive/Cargo.toml b/futures/derive/Cargo.toml index 246a5f47fa9..262a24a22f3 100644 --- a/futures/derive/Cargo.toml +++ b/futures/derive/Cargo.toml @@ -13,7 +13,7 @@ telemetry = [] proc-macro = true [dependencies] -syn = { version = "1.0", features = ["full"] } -quote = "1.0" -proc-macro2 = "1.0" -proc-macro-error = "1.0" +syn = { version = "1.0.99", features = ["full"] } +quote = "1.0.21" +proc-macro2 = "1.0.43" +proc-macro-error = "1.0.4" diff --git a/logger/Cargo.toml b/logger/Cargo.toml index 6f581537fc2..52c6b11495a 100644 --- a/logger/Cargo.toml +++ b/logger/Cargo.toml @@ -7,17 +7,17 @@ edition = "2021" [dependencies] iroha_config = { version = "=2.0.0-pre-rc.7", path = "../config" } -color-eyre = "0.5.11" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -tracing = "0.1.13" -tracing-core = "0.1.13" +color-eyre = "0.6.2" +serde = { version = "1.0.142", features = ["derive"] } +serde_json = "1.0.83" +tracing = "0.1.36" +tracing-core = "0.1.29" tracing-futures = { version = "0.2.5", default-features = false, features = ["std-future", "std"] } -tracing-subscriber = { version = "0.3.0", default-features = false, features = ["fmt", "ansi"] } -tracing-bunyan-formatter = { version = "0.3.0", default-features = false } -tokio = { version = "1.6.0", features = ["sync"] } -once_cell = "1.8.0" +tracing-subscriber = { version = "0.3.15", default-features = false, features = ["fmt", "ansi"] } +tracing-bunyan-formatter = { version = "0.3.3", default-features = false } +tokio = { version = "1.20.1", features = ["sync"] } +once_cell = "1.13.0" derive_more = "0.99.17" [dev-dependencies] -tokio = { version = "1.6.0", features = ["macros", "time", "rt"] } +tokio = { version = "1.20.1", features = ["macros", "time", "rt"] } diff --git a/macro/derive/Cargo.toml b/macro/derive/Cargo.toml index 7c2e87d7e81..c0dd33251a2 100644 --- a/macro/derive/Cargo.toml +++ b/macro/derive/Cargo.toml @@ -8,11 +8,11 @@ edition = "2021" proc-macro = true [dependencies] -syn = "1.0" -quote = "1.0" -proc-macro2 = "1.0" +syn = "1.0.99" +quote = "1.0.21" +proc-macro2 = "1.0.43" [dev-dependencies] iroha_macro = { version = "2.0.0-pre-rc.7", path = ".." } -trybuild = "1.0.53" +trybuild = "1.0.64" diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index a49ce9b7ce8..fc39c28c930 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -18,14 +18,14 @@ iroha_actor = { version = "=2.0.0-pre-rc.7", path = "../actor" } iroha_macro = { version = "=2.0.0-pre-rc.7", path = "../macro" } iroha_data_model = { version = "=2.0.0-pre-rc.7", path = "../data_model" } -rand = "0.8" -tokio = { version = "1.6.0", features = ["rt-multi-thread", "macros"]} -async-stream = "0.3" -futures = { version = "0.3.17", default-features = false } -async-trait = "0.1" -parity-scale-codec = { version = "2", features = ["derive"] } -aead = "0.3.2" -thiserror = "1.0.28" +rand = "0.8.5" +tokio = { version = "1.20.1", features = ["rt-multi-thread", "macros"] } +async-stream = "0.3.3" +futures = { version = "0.3.21", default-features = false } +async-trait = "0.1.57" +parity-scale-codec = { version = "3.1.5", features = ["derive"] } +aead = "0.5.0" +thiserror = "1.0.32" [dev-dependencies] iroha_config = { version = "=2.0.0-pre-rc.7", path = "../config" } diff --git a/p2p/src/lib.rs b/p2p/src/lib.rs index ef35af417ac..e6f4ef7d63c 100644 --- a/p2p/src/lib.rs +++ b/p2p/src/lib.rs @@ -39,6 +39,12 @@ pub enum Error { Addr(#[source] AddrParseError), } +impl From for Error { + fn from(_: aead::Error) -> Self { + Self::Keys + } +} + impl From for Error { fn from(e: io::Error) -> Self { Self::Io(std::sync::Arc::new(e)) @@ -57,12 +63,6 @@ impl From for Error { } } -impl From for Error { - fn from(_: aead::Error) -> Self { - Self::Keys - } -} - /// Result shorthand. pub type Result = std::result::Result; diff --git a/p2p/src/peer.rs b/p2p/src/peer.rs index 8063ad0f9ca..7dfcc1ee055 100644 --- a/p2p/src/peer.rs +++ b/p2p/src/peer.rs @@ -133,7 +133,9 @@ where fn decrypt(&self, data: Vec) -> Result, Error> { match &self.cipher { None => Ok(data), - Some(cipher) => Ok(cipher.decrypt_easy(DEFAULT_AAD.as_ref(), data.as_slice())?), + Some(cipher) => Ok(cipher + .decrypt_easy(DEFAULT_AAD.as_ref(), data.as_slice()) + .unwrap()), } } @@ -141,7 +143,9 @@ where fn encrypt(&self, data: Vec) -> Result, Error> { match &self.cipher { None => Ok(data), - Some(cipher) => Ok(cipher.encrypt_easy(DEFAULT_AAD.as_ref(), data.as_slice())?), + Some(cipher) => Ok(cipher + .encrypt_easy(DEFAULT_AAD.as_ref(), data.as_slice()) + .expect("Valid")), } } @@ -154,7 +158,8 @@ where let encryptor = { let key: &[u8] = shared.0.as_slice(); SymmetricEncryptor::::new_with_key(key) - }?; + } + .expect("Valid"); self.cipher = Some(encryptor); Ok(self) } @@ -539,14 +544,14 @@ where Ok(data) => data, Err(error) => { warn!(%error, "Error decrypting message!"); - let mut new_self = Self::Error(id.clone(), Error::from(error)); + let mut new_self = Self::Error(id.clone(), Error::Keys); std::mem::swap(&mut new_self, self); return; } } } }; - let mut decoded: Result = DecodeAll::decode_all(data.as_slice()); + let mut decoded: Result = DecodeAll::decode_all(&mut data.as_slice()); if decoded.is_err() { warn!("Error parsing message using all bytes"); decoded = Decode::decode(&mut data.as_slice()); @@ -588,7 +593,7 @@ where Ok(data) => data, Err(error) => { warn!(%error, "Error encrypting message!"); - let mut new_self = Self::Error(id.clone(), Error::from(error)); + let mut new_self = Self::Error(id.clone(), Error::Keys); std::mem::swap(&mut new_self, self); return; } diff --git a/permissions_validators/Cargo.toml b/permissions_validators/Cargo.toml index 5b04afd477d..cdc0099006b 100644 --- a/permissions_validators/Cargo.toml +++ b/permissions_validators/Cargo.toml @@ -12,11 +12,11 @@ iroha_data_model = { version = "=2.0.0-pre-rc.7", path = "../data_model", defaul iroha_macro = { version = "=2.0.0-pre-rc.7", path = "../macro" } iroha_schema = { version = "=2.0.0-pre-rc.7", path = "../schema" } -serde = { version = "1.0", features = ["derive"] } -derive_more = { version = "0.99.16", default-features = false, features = ["display"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } -once_cell = "1.8.0" -thiserror = "1.0.28" +serde = { version = "1.0.142", features = ["derive"] } +derive_more = { version = "0.99.17", default-features = false, features = ["display"] } +parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] } +once_cell = "1.13.0" +thiserror = "1.0.32" [dev-dependencies] iroha_data_model = { version = "=2.0.0-pre-rc.7", path = "../data_model", default-features = false } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 516e7b14a23..77ee138deac 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -26,15 +26,15 @@ std = ["iroha_macro/std", "fixnum/std", "thiserror"] iroha_macro = { path = "../macro", version = "=2.0.0-pre-rc.7", default-features = false } iroha_schema = { path = "../schema", version = "=2.0.0-pre-rc.7", default-features = false } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } -fixnum = { version = "0.6.1", default-features = false, features = ["serde", "parity", "i64"]} -derive_more = { version = "0.99.16", default-features = false, features = ["display", "as_ref", "as_mut", "deref", "constructor"] } -serde = { version = "1.0", default-features = false, features = ["derive"] } -smallvec = { version = "1.8.0", default-features = false, features = ["serde", "union"] } +parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] } +fixnum = { version = "0.8.0", default-features = false, features = ["serde", "parity", "i64"] } +derive_more = { version = "0.99.17", default-features = false, features = ["display", "as_ref", "as_mut", "deref", "constructor"] } +serde = { version = "1.0.142", default-features = false, features = ["derive"] } +smallvec = { version = "1.9.0", default-features = false, features = ["serde", "union"] } smallstr = { version = "0.3.0", default-features = false, features = ["serde", "union"] } -thiserror = { version = "1.0.28", optional = true } +thiserror = { version = "1.0.32", optional = true } [dev-dependencies] -serde_json = { version = "1.0.59", default-features = false, features = ["alloc"] } -trybuild = "1.0.63" +serde_json = { version = "1.0.83", default-features = false, features = ["alloc"] } +trybuild = "1.0.64" diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs index 8581c0e2e1f..7b29faa21f1 100644 --- a/primitives/src/lib.rs +++ b/primitives/src/lib.rs @@ -26,6 +26,7 @@ pub trait IntoMetric { fn into_metric(self) -> f64; } +// TODO: this should be a blanket impl. impl IntoMetric for u128 { #[inline] #[allow(clippy::cast_precision_loss)] diff --git a/schema/Cargo.toml b/schema/Cargo.toml index 644a22877e6..73cadc4c6e8 100644 --- a/schema/Cargo.toml +++ b/schema/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] iroha_schema_derive = { version = "=2.0.0-pre-rc.7", path = "derive" } -serde = { version = "1.0.132", default-features = false, features = ["derive", "alloc"] } -fixnum = { version = "0.6.1", default-features = false, features = ["i64"] } +serde = { version = "1.0.142", default-features = false, features = ["derive", "alloc"] } +fixnum = { version = "0.8.0", default-features = false, features = ["i64"] } [dev-dependencies] -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive", "full"] } -impls = { version = "=1.0.0" } +parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive", "full"] } +impls = "1.0.3" diff --git a/schema/derive/Cargo.toml b/schema/derive/Cargo.toml index 222a5fd900d..f4c5e9cd9bd 100644 --- a/schema/derive/Cargo.toml +++ b/schema/derive/Cargo.toml @@ -10,10 +10,10 @@ proc-macro = true [dependencies] syn = { version = "1.0.99", features = ["full"] } -proc-macro2 = "1.0.39" +proc-macro2 = "1.0.43" quote = "1.0.21" [dev-dependencies] iroha_schema = { path = "../"} -trybuild = "1.0.63" +trybuild = "1.0.64" diff --git a/telemetry/Cargo.toml b/telemetry/Cargo.toml index fc9e616739b..7b6f5b9dfe3 100644 --- a/telemetry/Cargo.toml +++ b/telemetry/Cargo.toml @@ -19,20 +19,20 @@ iroha_futures = { version = "=2.0.0-pre-rc.7", path = "../futures", features = [ iroha_telemetry_derive = { version = "=2.0.0-pre-rc.7", path = "derive" } -async-trait = "0.1" -chrono = "0.4" -eyre = "0.6.5" -futures = { version = "0.3.17", default-features = false, features = ["std", "async-await"] } -serde_json = "1" -streaming-stats = "0.2" -serde = { version = "1", features = ["derive"] } -tokio = { version = "1.6.0", features = ["rt", "rt-multi-thread", "macros"]} -tokio-stream = { version = "0.1.6", features = ["fs"]} -tokio-tungstenite = { version = "0.16" } +async-trait = "0.1.57" +chrono = "0.4.20" +eyre = "0.6.8" +futures = { version = "0.3.21", default-features = false, features = ["std", "async-await"] } +serde_json = "1.0.83" +streaming-stats = "0.2.3" +serde = { version = "1.0.142", features = ["derive"] } +tokio = { version = "1.20.1", features = ["rt", "rt-multi-thread", "macros"] } +tokio-stream = { version = "0.1.9", features = ["fs"] } +tokio-tungstenite = "0.17.2" url = { version = "2.2.2", features = ["serde"] } -prometheus = { version = "0.13.0", default-features = false } +prometheus = { version = "0.13.1", default-features = false } [build-dependencies] -anyhow = "1.0" -vergen = { version = "5", default-features = false, features = ["cargo", "git"] } +anyhow = "1.0.60" +vergen = { version = "7.3.2", default-features = false, features = ["cargo", "git"] } diff --git a/telemetry/derive/Cargo.toml b/telemetry/derive/Cargo.toml index a4471542068..227fd5a4444 100644 --- a/telemetry/derive/Cargo.toml +++ b/telemetry/derive/Cargo.toml @@ -20,12 +20,12 @@ maintenance = { status = "actively-developed" } [dependencies] -syn = { version = "1.0", features = ["full"] } -quote = { version = "1.0" } -proc-macro2 = "1.0" -proc-macro-error = "1.0" +syn = { version = "1.0.99", features = ["full"] } +quote = "1.0.21" +proc-macro2 = "1.0.43" +proc-macro-error = "1.0.4" [dev-dependencies] iroha_core = { version = "=2.0.0-pre-rc.7", path = "../../core" } -trybuild = "1.0.53" +trybuild = "1.0.64" diff --git a/tools/kagami/Cargo.toml b/tools/kagami/Cargo.toml index 0157aaca8d4..e4611e31522 100644 --- a/tools/kagami/Cargo.toml +++ b/tools/kagami/Cargo.toml @@ -33,6 +33,6 @@ iroha_schema_gen = { version = "=2.0.0-pre-rc.7", path = "../../schema/gen" } iroha_schema = { version = "=2.0.0-pre-rc.7", path = "../../schema" } iroha_permissions_validators = { version = "=2.0.0-pre-rc.7", path = "../../permissions_validators" } -color-eyre = "0.5.11" -clap = { version = "3.1.10", features = ["derive"] } -serde_json = "1" +color-eyre = "0.6.2" +clap = { version = "3.2.16", features = ["derive"] } +serde_json = "1.0.83" diff --git a/tools/kura_inspector/Cargo.toml b/tools/kura_inspector/Cargo.toml index 787cb661df6..059811748c8 100644 --- a/tools/kura_inspector/Cargo.toml +++ b/tools/kura_inspector/Cargo.toml @@ -10,4 +10,4 @@ edition = "2021" iroha_core = { path = "../../core" } iroha_version = { path = "../../version" } -clap = { version = "3.1.10", features = ["derive", "cargo"] } +clap = { version = "3.2.16", features = ["derive", "cargo"] } diff --git a/tools/parity_scale_decoder/Cargo.toml b/tools/parity_scale_decoder/Cargo.toml index 234a1272bbc..f9f7b68458e 100644 --- a/tools/parity_scale_decoder/Cargo.toml +++ b/tools/parity_scale_decoder/Cargo.toml @@ -18,9 +18,9 @@ iroha_schema = { version = "=2.0.0-pre-rc.7", path = "../../schema"} iroha_core = { version = "=2.0.0-pre-rc.7", path = "../../core"} iroha_crypto = { version = "=2.0.0-pre-rc.7", path = "../../crypto", default-features = false } iroha_version = { version = "=2.0.0-pre-rc.7", path = "../../version", default-features = false } -clap = { version = "3.1.10", features = ["derive", "cargo"] } +clap = { version = "3.2.16", features = ["derive", "cargo"] } eyre = "0.6.8" -parity-scale-codec = { version = "2.3.1", default-features = false } +parity-scale-codec = { version = "3.1.5", default-features = false } colored = "2.0.0" [dev-dependencies] @@ -28,6 +28,6 @@ iroha_schema_gen = { version = "=2.0.0-pre-rc.7", path = "../../schema/gen"} [build-dependencies] iroha_data_model = { version = "=2.0.0-pre-rc.7", path = "../../data_model", features = ["warp", "mutable_api"]} -parity-scale-codec = { version = "2.3.1", default-features = false } -serde_json = "1.0" -serde = "1.0" +parity-scale-codec = { version = "3.1.5", default-features = false } +serde_json = "1.0.83" +serde = "1.0.142" diff --git a/version/Cargo.toml b/version/Cargo.toml index c8a61e83d97..06753a6ed93 100644 --- a/version/Cargo.toml +++ b/version/Cargo.toml @@ -23,8 +23,8 @@ iroha_version_derive = { version = "=2.0.0-pre-rc.7", path = "derive", default-f iroha_macro = { version = "=2.0.0-pre-rc.7", path = "../macro", default-features = false } iroha_schema = { version = "=2.0.0-pre-rc.7", path = "../schema", default-features = false } -parity-scale-codec = { version = "2.3.1", default-features = false, optional = true, features = ["derive"] } -serde_json = { version = "1.0", default-features = false, optional = true, features = ["alloc"] } -serde = { version = "1.0", default-features = false, optional = true, features = ["derive"] } -thiserror = { version = "1.0.28", default-features = false, optional = true } +parity-scale-codec = { version = "3.1.5", default-features = false, optional = true, features = ["derive"] } +serde_json = { version = "1.0.83", default-features = false, optional = true, features = ["alloc"] } +serde = { version = "1.0.142", default-features = false, optional = true, features = ["derive"] } +thiserror = { version = "1.0.32", default-features = false, optional = true } warp = { version = "0.3.2", default-features = false, optional = true } diff --git a/version/derive/Cargo.toml b/version/derive/Cargo.toml index 9c1077a311e..4ad780e8b9e 100644 --- a/version/derive/Cargo.toml +++ b/version/derive/Cargo.toml @@ -10,17 +10,17 @@ edition = "2021" proc-macro = true [dependencies] -syn = {version = "1", features = ["full"] } -quote = "1.0" -proc-macro2 = "1.0" -proc-macro-error = "1.0" +syn = { version = "1.0.99", features = ["full"] } +quote = "1.0.21" +proc-macro2 = "1.0.43" +proc-macro-error = "1.0.4" [dev-dependencies] iroha_version = { version = "=2.0.0-pre-rc.7", path = "..", features = ["scale", "json"]} iroha_macro = { version = "=2.0.0-pre-rc.7", path = "../../macro" } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } -serde_json = { version = "1.0.59", default-features = false, features = ["alloc"] } -serde = { version = "1.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] } +serde_json = { version = "1.0.83", default-features = false, features = ["alloc"] } +serde = { version = "1.0.142", default-features = false, features = ["derive"] } -trybuild = "1.0.53" +trybuild = "1.0.64" diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index b457ddca972..0fa81424e0f 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -25,7 +25,7 @@ debug = [] iroha_data_model = { version = "=2.0.0-pre-rc.7", path = "../data_model", default-features = false } iroha_wasm_derive = { path = "derive" } -parity-scale-codec = { version = "2.3.1", default-features = false } +parity-scale-codec = { version = "3.1.5", default-features = false } wee_alloc = "0.4.5" [dev-dependencies] diff --git a/wasm/src/lib.rs b/wasm/src/lib.rs index 030abaa627f..56c32d7405b 100644 --- a/wasm/src/lib.rs +++ b/wasm/src/lib.rs @@ -276,7 +276,10 @@ mod tests { } #[no_mangle] - pub unsafe extern "C" fn _iroha_wasm_execute_instruction_mock(ptr: *const u8, len: usize) { + pub unsafe extern "C" fn _iroha_wasm_execute_instruction_mock( + ptr: *const u8, + len: usize, + ) { let bytes = slice::from_raw_parts(ptr, len); let instruction = Instruction::decode(&mut &*bytes); assert_eq!(get_test_instruction(), instruction.unwrap());