From 4204dde35f45e62508de05f4e1cb146058c485a0 Mon Sep 17 00:00:00 2001 From: Stanislav Bezkorovainyi Date: Tue, 20 Jul 2021 18:27:25 +0300 Subject: [PATCH 1/3] Reverse rust changes --- Cargo.lock | 1748 ++++++++--------- core/bin/prover/src/client.rs | 16 +- core/bin/zksync_api/src/eth_checker.rs | 2 +- .../src/fee_ticker/validator/mod.rs | 6 +- .../src/committer/aggregated_committer.rs | 2 +- .../bin/zksync_core/src/state_keeper/tests.rs | 6 +- core/bin/zksync_eth_sender/src/tests/mock.rs | 2 +- .../src/tests/mock.rs | 5 +- .../src/witness/change_pubkey_offchain.rs | 2 +- core/lib/storage/src/event/mod.rs | 3 +- core/lib/storage/src/tests/chain/mempool.rs | 10 +- .../lib/storage/src/tests/chain/operations.rs | 6 +- core/lib/types/src/account/mod.rs | 2 +- core/lib/types/src/account/pubkey_hash.rs | 10 +- core/lib/types/src/operations/full_exit_op.rs | 22 +- core/lib/types/src/tx/change_pubkey.rs | 4 +- core/lib/types/src/tx/close.rs | 2 +- core/lib/types/src/tx/forced_exit.rs | 4 +- .../lib/types/src/tx/primitives/time_range.rs | 2 +- core/lib/types/src/tx/swap.rs | 2 +- core/lib/types/src/tx/tests.rs | 8 +- core/lib/types/src/tx/transfer.rs | 4 +- core/lib/types/src/tx/withdraw.rs | 4 +- core/lib/types/src/tx/withdraw_nft.rs | 2 +- core/tests/loadnext/src/corrupted_tx.rs | 14 +- core/tests/testkit/src/test_setup.rs | 2 - 26 files changed, 880 insertions(+), 1010 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a8c5705f8f..e09908ba9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,12 +16,12 @@ dependencies = [ "derive_more", "futures-channel", "futures-util", - "log 0.4.14", + "log 0.4.11", "once_cell", - "parking_lot 0.11.1", - "pin-project 0.4.28", - "smallvec 1.6.1", - "tokio 0.2.25", + "parking_lot 0.11.0", + "pin-project 0.4.27", + "smallvec 1.4.2", + "tokio 0.2.22", "tokio-util", "trust-dns-proto", "trust-dns-resolver", @@ -37,9 +37,9 @@ dependencies = [ "bytes 0.5.6", "futures-core", "futures-sink", - "log 0.4.14", - "pin-project 0.4.28", - "tokio 0.2.25", + "log 0.4.11", + "pin-project 0.4.27", + "tokio 0.2.22", "tokio-util", ] @@ -56,8 +56,8 @@ dependencies = [ "derive_more", "either", "futures-util", - "http 0.2.4", - "log 0.4.14", + "http 0.2.1", + "log 0.4.11", "trust-dns-proto", "trust-dns-resolver", ] @@ -76,9 +76,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "2.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452299e87817ae5673910e53c243484ca38be3828db819b6011736fc6982e874" +checksum = "05dd80ba8f27c4a34357c07e338c8f5c38f8520e6d626ca1727d8fecc41b0cab" dependencies = [ "actix-codec", "actix-connect", @@ -86,7 +86,7 @@ dependencies = [ "actix-service", "actix-threadpool", "actix-utils", - "base64 0.13.0", + "base64 0.12.3", "bitflags", "brotli2", "bytes 0.5.6", @@ -100,32 +100,32 @@ dependencies = [ "futures-core", "futures-util", "fxhash", - "h2 0.2.7", - "http 0.2.4", + "h2 0.2.6", + "http 0.2.1", "httparse", "indexmap", "itoa", "language-tags", "lazy_static", - "log 0.4.14", + "log 0.4.11", "mime 0.3.16", "percent-encoding 2.1.0", - "pin-project 1.0.7", + "pin-project 0.4.27", "rand 0.7.3", "regex", "serde", "serde_json", "serde_urlencoded", - "sha-1 0.9.7", + "sha-1 0.9.1", "slab", - "time 0.2.27", + "time 0.2.22", ] [[package]] name = "actix-macros" -version = "0.1.3" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655" +checksum = "a60f9ba7c4e6df97f3aacb14bb5c0cd7d98a49dcbaed0d7f292912ad9a6a3ed2" dependencies = [ "quote", "syn", @@ -133,13 +133,13 @@ dependencies = [ [[package]] name = "actix-router" -version = "0.2.7" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad299af73649e1fc893e333ccf86f377751eb95ff875d095131574c6f43452c" +checksum = "bbd1f7dbda1645bf7da33554db60891755f6c01c1b2169e2f4c492098d30c235" dependencies = [ "bytestring", - "http 0.2.4", - "log 0.4.14", + "http 0.2.1", + "log 0.4.11", "regex", "serde", ] @@ -155,8 +155,8 @@ dependencies = [ "copyless", "futures-channel", "futures-util", - "smallvec 1.6.1", - "tokio 0.2.25", + "smallvec 1.4.2", + "tokio 0.2.22", ] [[package]] @@ -171,12 +171,12 @@ dependencies = [ "actix-utils", "futures-channel", "futures-util", - "log 0.4.14", + "log 0.4.11", "mio", "mio-uds", "num_cpus", "slab", - "socket2 0.3.19", + "socket2", ] [[package]] @@ -186,7 +186,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" dependencies = [ "futures-util", - "pin-project 0.4.28", + "pin-project 0.4.27", ] [[package]] @@ -199,8 +199,8 @@ dependencies = [ "actix-rt", "actix-server", "actix-service", - "log 0.4.14", - "socket2 0.3.19", + "log 0.4.11", + "socket2", ] [[package]] @@ -212,9 +212,9 @@ dependencies = [ "derive_more", "futures-channel", "lazy_static", - "log 0.4.14", + "log 0.4.11", "num_cpus", - "parking_lot 0.11.1", + "parking_lot 0.11.0", "threadpool", ] @@ -245,16 +245,16 @@ dependencies = [ "futures-channel", "futures-sink", "futures-util", - "log 0.4.14", - "pin-project 0.4.28", + "log 0.4.11", + "pin-project 0.4.27", "slab", ] [[package]] name = "actix-web" -version = "3.3.2" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e641d4a172e7faa0862241a20ff4f1f5ab0ab7c279f00c2d4587b77483477b86" +checksum = "c1b12fe25e11cd9ed2ef2e428427eb6178a1b363f3f7f0dab8278572f11b2da1" dependencies = [ "actix-codec", "actix-http", @@ -276,17 +276,17 @@ dependencies = [ "futures-core", "futures-util", "fxhash", - "log 0.4.14", + "log 0.4.11", "mime 0.3.16", - "pin-project 1.0.7", + "pin-project 0.4.27", "regex", "serde", "serde_json", "serde_urlencoded", - "socket2 0.3.19", - "time 0.2.27", - "tinyvec", - "url 2.2.2", + "socket2", + "time 0.2.22", + "tinyvec 1.0.1", + "url 2.2.1", ] [[package]] @@ -302,14 +302,14 @@ dependencies = [ "bytes 0.5.6", "futures-channel", "futures-core", - "pin-project 0.4.28", + "pin-project 0.4.27", ] [[package]] name = "actix-web-codegen" -version = "0.4.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb" +checksum = "750ca8fb60bbdc79491991650ba5d2ae7cd75f3fc00ead51390cfe9efda0d4d8" dependencies = [ "proc-macro2", "quote", @@ -318,12 +318,14 @@ dependencies = [ [[package]] name = "actix-web-httpauth" -version = "0.5.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3b11a07a3df3f7970fd8bd38cc66998b5549f507c54cc64c6e843bc82d6358" +checksum = "536a75d767c5c2b3e64d3f569621f38ed7609359a0c82d149c88290a6ba41b22" dependencies = [ + "actix-service", "actix-web", - "base64 0.13.0", + "base64 0.12.3", + "bytes 0.5.6", "futures-util", ] @@ -340,18 +342,18 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.14.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" +checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" dependencies = [ "gimli", ] [[package]] name = "adler" -version = "1.0.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" [[package]] name = "aes" @@ -415,20 +417,20 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] name = "ahash" -version = "0.6.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "796540673305a66d127804eef19ad696f1f204b8c1025aaca4958c17eab32877" +checksum = "a75b7e6a93ecd6dbd2c225154d0fa7f86205574ecaa6c87429fb5f66ee677c44" dependencies = [ - "getrandom 0.2.3", - "once_cell", - "version_check 0.9.3", + "getrandom 0.2.0", + "lazy_static", + "version_check 0.9.2", ] [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d" dependencies = [ "memchr", ] @@ -464,9 +466,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c" [[package]] name = "approx" @@ -479,9 +481,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "0.4.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8" +checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" [[package]] name = "arrayref" @@ -500,15 +502,15 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.5.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" [[package]] name = "async-channel" -version = "1.6.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9" dependencies = [ "concurrent-queue", "event-listener", @@ -517,29 +519,26 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.4.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "d373d78ded7d0b3fa8039375718cde0aace493f2e34fb60f51cbf567562ca801" dependencies = [ "async-task", "concurrent-queue", "fastrand", "futures-lite", "once_cell", - "slab", + "vec-arena", ] [[package]] name = "async-global-executor" -version = "2.0.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" +checksum = "124ac8c265e407641c3362b8f4d39cdb4e243885b71eef087be27199790f5a3a" dependencies = [ - "async-channel", "async-executor", "async-io", - "async-mutex", - "blocking", "futures-lite", "num_cpus", "once_cell", @@ -547,32 +546,24 @@ dependencies = [ [[package]] name = "async-io" -version = "1.6.0" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +checksum = "d54bc4c1c7292475efb2253227dbcfad8fe1ca4c02bc62c510cc2f3da5c4704e" dependencies = [ "concurrent-queue", + "fastrand", "futures-lite", "libc", - "log 0.4.14", + "log 0.4.11", + "nb-connect", "once_cell", "parking", "polling", - "slab", - "socket2 0.4.0", + "vec-arena", "waker-fn", "winapi 0.3.9", ] -[[package]] -name = "async-lock" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" -dependencies = [ - "event-listener", -] - [[package]] name = "async-mutex" version = "1.4.0" @@ -591,31 +582,31 @@ dependencies = [ "async-std", "native-tls", "thiserror", - "url 2.2.2", + "url 2.2.1", ] [[package]] name = "async-std" -version = "1.9.0" +version = "1.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341" +checksum = "a9fa76751505e8df1c7a77762f60486f60c71bbd9b8557f4da6ad47d083732ed" dependencies = [ - "async-channel", "async-global-executor", "async-io", - "async-lock", - "crossbeam-utils 0.8.5", + "async-mutex", + "blocking", + "crossbeam-utils 0.7.2", "futures-channel", "futures-core", "futures-io", "futures-lite", "gloo-timers", "kv-log-macro", - "log 0.4.14", + "log 0.4.11", "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.2.7", + "pin-project-lite 0.1.11", "pin-utils", "slab", "wasm-bindgen-futures", @@ -629,9 +620,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.50" +version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" +checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" dependencies = [ "proc-macro2", "quote", @@ -687,20 +678,19 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "awc" -version = "2.0.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b381e490e7b0cfc37ebc54079b0413d8093ef43d14a4e4747083f7fa47a9e691" +checksum = "150e00c06683ab44c5f97d033950e5d87a7a042d06d77f5eecb443cbd23d0575" dependencies = [ "actix-codec", "actix-http", "actix-rt", "actix-service", - "base64 0.13.0", + "base64 0.12.3", "bytes 0.5.6", - "cfg-if 1.0.0", "derive_more", "futures-core", - "log 0.4.14", + "log 0.4.11", "mime 0.3.16", "percent-encoding 2.1.0", "rand 0.7.3", @@ -727,16 +717,16 @@ checksum = "721c249ab59cbc483ad4294c9ee2671835c1e43e9ffc277e6b4ecfef733cfdc5" dependencies = [ "futures-core", "instant", - "pin-project 0.4.28", + "pin-project 0.4.27", "rand 0.7.3", - "tokio 0.2.25", + "tokio 0.2.22", ] [[package]] name = "backtrace" -version = "0.3.57" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ed203b9ba68b242c62b3fb7480f589dd49829be1edb3fe8fc8b4ffda2dcb8d" +checksum = "707b586e0e2f247cbde68cdd2c3ce69ea7b7be43e1c5b426e37c9319c4b9838e" dependencies = [ "addr2line", "cfg-if 1.0.0", @@ -748,9 +738,9 @@ dependencies = [ [[package]] name = "base-x" -version = "0.2.8" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1" [[package]] name = "base64" @@ -786,7 +776,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bellman_ce" version = "0.3.2" -source = "git+https://github.com/matter-labs/bellman?branch=beta#455480a2db44ecc0423785b295981074800913e6" +source = "git+https://github.com/matter-labs/bellman?branch=beta#48441155ec7006bf7bfac553b5fb7d466d7fcd00" dependencies = [ "bit-vec", "blake2s_const", @@ -794,7 +784,7 @@ dependencies = [ "byteorder", "cfg-if 1.0.0", "crossbeam", - "futures 0.3.15", + "futures 0.3.6", "hex", "lazy_static", "num_cpus", @@ -809,7 +799,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc403c26e6b03005522e6e8053384c4e881dfe5b2bf041c0c2c49be33d64a539" dependencies = [ - "num-bigint 0.3.2", + "num-bigint 0.3.1", "num-integer", "num-traits", "serde", @@ -817,9 +807,9 @@ dependencies = [ [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3" [[package]] name = "bitflags" @@ -848,9 +838,9 @@ dependencies = [ [[package]] name = "bitvec" -version = "0.19.5" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81" dependencies = [ "funty", "radium 0.5.3", @@ -883,21 +873,21 @@ dependencies = [ [[package]] name = "blake2s_const" version = "0.6.0" -source = "git+https://github.com/matter-labs/bellman?branch=beta#455480a2db44ecc0423785b295981074800913e6" +source = "git+https://github.com/matter-labs/bellman?branch=beta#48441155ec7006bf7bfac553b5fb7d466d7fcd00" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.5.1", "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "0.5.11" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" +checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.5.1", "constant_time_eq", ] @@ -910,7 +900,7 @@ dependencies = [ "block-padding 0.1.5", "byte-tools", "byteorder", - "generic-array 0.12.4", + "generic-array 0.12.3", ] [[package]] @@ -929,7 +919,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" dependencies = [ - "generic-array 0.12.4", + "generic-array 0.12.3", ] [[package]] @@ -964,7 +954,7 @@ dependencies = [ "anyhow", "ethabi", "structopt", - "tokio 0.2.25", + "tokio 0.2.22", "web3", "zksync_config", "zksync_eth_client", @@ -1008,9 +998,9 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.16" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" dependencies = [ "lazy_static", "memchr", @@ -1020,9 +1010,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" [[package]] name = "byte-slice-cast" @@ -1038,9 +1028,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "bytes" @@ -1059,19 +1049,13 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" -[[package]] -name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" - [[package]] name = "bytestring" -version = "1.0.0" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d" +checksum = "fc7c05fa5172da78a62d9949d662d2ac89d4cc7355d7b49adee5163f1fb3f363" dependencies = [ - "bytes 1.0.1", + "bytes 0.5.6", ] [[package]] @@ -1080,35 +1064,25 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" -[[package]] -name = "cargo-platform" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7" -dependencies = [ - "serde", -] - [[package]] name = "cargo_metadata" -version = "0.12.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f" +checksum = "83f95cf4bf0dda0ac2e65371ae7215d0dce3c187613a9dbf23aaa9374186f97a" dependencies = [ - "cargo-platform", "semver 0.11.0", - "semver-parser 0.10.2", + "semver-parser 0.10.0", "serde", "serde_json", ] [[package]] name = "cast" -version = "0.2.7" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" dependencies = [ - "rustc_version 0.4.0", + "rustc_version", ] [[package]] @@ -1140,7 +1114,7 @@ dependencies = [ "num-traits", "rustc-serialize", "serde", - "time 0.1.43", + "time 0.1.44", "winapi 0.3.9", ] @@ -1168,6 +1142,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "cloudabi" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467" +dependencies = [ + "bitflags", +] + [[package]] name = "colored" version = "2.0.0" @@ -1215,7 +1198,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.0", "lazy_static", "proc-macro-hack", "tiny-keccak 2.0.2", @@ -1223,9 +1206,9 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.8" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" +checksum = "ce90df4c658c62f12d78f7508cf92f9173e5184a539c10bfe54a3107b3ffd0f2" [[package]] name = "constant_time_eq" @@ -1233,21 +1216,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "cookie" -version = "0.14.4" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" +checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0" dependencies = [ "percent-encoding 2.1.0", - "time 0.2.27", - "version_check 0.9.3", + "time 0.2.22", + "version_check 0.9.2", ] [[package]] @@ -1258,9 +1235,9 @@ checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" [[package]] name = "core-foundation" -version = "0.9.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" dependencies = [ "core-foundation-sys", "libc", @@ -1268,26 +1245,23 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] -name = "cpufeatures" -version = "0.1.5" +name = "cpuid-bool" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" -dependencies = [ - "libc", -] +checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" [[package]] name = "crc32fast" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", ] [[package]] @@ -1301,8 +1275,8 @@ dependencies = [ "clap", "criterion-plot", "csv", - "futures 0.3.15", - "itertools 0.10.1", + "futures 0.3.6", + "itertools 0.10.0", "lazy_static", "num-traits", "oorandom", @@ -1314,7 +1288,7 @@ dependencies = [ "serde_derive", "serde_json", "tinytemplate", - "tokio 1.8.2", + "tokio 1.1.0", "walkdir", ] @@ -1336,7 +1310,7 @@ checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ "cfg-if 0.1.10", "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.3", + "crossbeam-deque", "crossbeam-epoch 0.8.2", "crossbeam-queue 0.2.3", "crossbeam-utils 0.7.2", @@ -1354,12 +1328,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", + "crossbeam-utils 0.8.1", ] [[package]] @@ -1373,17 +1347,6 @@ dependencies = [ "maybe-uninit", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch 0.9.5", - "crossbeam-utils 0.8.5", -] - [[package]] name = "crossbeam-epoch" version = "0.8.2" @@ -1395,20 +1358,21 @@ dependencies = [ "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", - "memoffset 0.5.6", + "memoffset", "scopeguard", ] [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", + "const_fn", + "crossbeam-utils 0.8.1", "lazy_static", - "memoffset 0.6.4", + "memoffset", "scopeguard", ] @@ -1425,12 +1389,12 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" +checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", + "crossbeam-utils 0.8.1", ] [[package]] @@ -1446,10 +1410,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" dependencies = [ + "autocfg 1.0.1", "cfg-if 1.0.0", "lazy_static", ] @@ -1466,7 +1431,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" dependencies = [ - "generic-array 0.12.4", + "generic-array 0.12.3", "subtle 1.0.0", ] @@ -1477,7 +1442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.4", - "subtle 2.4.1", + "subtle 2.3.0", ] [[package]] @@ -1487,14 +1452,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" dependencies = [ "generic-array 0.14.4", - "subtle 2.4.1", + "subtle 2.3.0", ] [[package]] name = "csv" -version = "1.1.6" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279" dependencies = [ "bstr", "csv-core", @@ -1512,16 +1477,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ctor" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "ctr" version = "0.3.2" @@ -1534,9 +1489,9 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.1.9" +version = "3.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232295399409a8b7ae41276757b5a1cc21032848d42bff2352261f958b3ca29a" +checksum = "b57a92e9749e10f25a171adcebfafe72991d45e7ec2dcb853e8f83d9dafaeb08" dependencies = [ "nix", "winapi 0.3.9", @@ -1544,9 +1499,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.13.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "757c0ded2af11d8e739c4daea1ac623dd1624b06c844cf3f5a39f1bdbd99bb12" +checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c" dependencies = [ "darling_core", "darling_macro", @@ -1554,9 +1509,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3" +checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36" dependencies = [ "fnv", "ident_case", @@ -1568,9 +1523,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.13.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc" +checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" dependencies = [ "darling_core", "quote", @@ -1608,7 +1563,7 @@ dependencies = [ "crossbeam-queue 0.2.3", "num_cpus", "serde", - "tokio 0.2.25", + "tokio 0.2.22", ] [[package]] @@ -1623,14 +1578,12 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.16" +version = "0.99.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" +checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" dependencies = [ - "convert_case", "proc-macro2", "quote", - "rustc_version 0.3.3", "syn", ] @@ -1640,7 +1593,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90" dependencies = [ - "generic-array 0.9.1", + "generic-array 0.9.0", ] [[package]] @@ -1649,7 +1602,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.4", + "generic-array 0.12.3", ] [[package]] @@ -1673,6 +1626,12 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" +[[package]] +name = "dtoa" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" + [[package]] name = "either" version = "1.6.1" @@ -1684,11 +1643,11 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.28" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +checksum = "a51b8cf747471cb9499b6d59e59b0444f4c90eba8968c4e44874e92b5b64ace2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", ] [[package]] @@ -1788,9 +1747,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "fastrand" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" +checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" dependencies = [ "instant", ] @@ -1809,11 +1768,11 @@ dependencies = [ [[package]] name = "ff_derive_ce" -version = "0.9.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde5a00073374b4d7aa2d3a8359a5709f9c0bfac8393f254655d16b4acdfe823" +checksum = "77d4fecbd8714dc12f4bab026d74e3f5766436bf4d9fc1161709d6e45a593400" dependencies = [ - "num-bigint 0.4.0", + "num-bigint 0.2.6", "num-integer", "num-traits", "proc-macro2", @@ -1835,11 +1794,11 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.20" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +checksum = "da80be589a72651dcda34d8b35bcdc9b7254ad06325611074d9cc0fbb19f60ee" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "crc32fast", "libc", "miniz_oxide", @@ -1879,7 +1838,7 @@ dependencies = [ [[package]] name = "franklin-crypto" version = "0.0.5" -source = "git+https://github.com/matter-labs/franklin-crypto.git?branch=beta#942368fcde0fe87451bed82e716ec18cfd725fa2" +source = "git+https://github.com/matter-labs/franklin-crypto.git?branch=beta#4a706d93628980e036249e3b182b91af8797ce8c" dependencies = [ "bellman_ce", "bit-vec", @@ -1891,7 +1850,7 @@ dependencies = [ "hex", "hmac 0.7.1", "itertools 0.9.0", - "num-bigint 0.3.2", + "num-bigint 0.3.1", "num-integer", "num-traits", "poseidon_hash", @@ -1933,15 +1892,15 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.1.31" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" +checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" [[package]] name = "futures" -version = "0.3.15" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" +checksum = "5d8e3078b7b2a8a671cb7a3d17b4760e4181ea243227776ba83fd043b4ca034e" dependencies = [ "futures-channel", "futures-core", @@ -1954,9 +1913,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.15" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" dependencies = [ "futures-core", "futures-sink", @@ -1964,9 +1923,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.15" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" +checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" [[package]] name = "futures-cpupool" @@ -1974,15 +1933,15 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", "num_cpus", ] [[package]] name = "futures-executor" -version = "0.3.15" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" +checksum = "cc709ca1da6f66143b8c9bec8e6260181869893714e9b5a490b169b0414144ab" dependencies = [ "futures-core", "futures-task", @@ -1992,32 +1951,31 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.15" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" +checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658" dependencies = [ "fastrand", "futures-core", "futures-io", "memchr", "parking", - "pin-project-lite 0.2.7", + "pin-project-lite 0.1.11", "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.15" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" +checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" dependencies = [ - "autocfg 1.0.1", "proc-macro-hack", "proc-macro2", "quote", @@ -2026,15 +1984,18 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.15" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" +checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" [[package]] name = "futures-task" -version = "0.3.15" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" +checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" +dependencies = [ + "once_cell", +] [[package]] name = "futures-timer" @@ -2044,12 +2005,11 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.15" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" dependencies = [ - "autocfg 1.0.1", - "futures 0.1.31", + "futures 0.1.30", "futures-channel", "futures-core", "futures-io", @@ -2057,7 +2017,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.7", + "pin-project 1.0.2", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -2081,18 +2041,18 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generic-array" -version = "0.9.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d00328cedcac5e81c683e5620ca6a30756fc23027ebf9bff405c0e8da1fbb7e" +checksum = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" dependencies = [ "typenum", ] [[package]] name = "generic-array" -version = "0.12.4" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" dependencies = [ "typenum", ] @@ -2104,47 +2064,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", - "version_check 0.9.3", + "version_check 0.9.2", ] [[package]] name = "getrandom" -version = "0.1.16" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] name = "gimli" -version = "0.23.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" +checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" [[package]] name = "globset" -version = "0.4.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120" dependencies = [ "aho-corasick", "bstr", "fnv", - "log 0.4.14", + "log 0.4.11", "regex", ] @@ -2170,10 +2130,10 @@ dependencies = [ "byteorder", "bytes 0.4.12", "fnv", - "futures 0.1.31", + "futures 0.1.30", "http 0.1.21", "indexmap", - "log 0.4.14", + "log 0.4.11", "slab", "string", "tokio-io", @@ -2181,40 +2141,39 @@ dependencies = [ [[package]] name = "h2" -version = "0.2.7" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" dependencies = [ "bytes 0.5.6", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.4", + "http 0.2.1", "indexmap", "slab", - "tokio 0.2.25", + "tokio 0.2.22", "tokio-util", "tracing", - "tracing-futures", ] [[package]] name = "half" -version = "1.7.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" +checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177" [[package]] name = "handlebars" -version = "3.5.5" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3" +checksum = "dcd1b5399b9884f9ae18b5d4105d180720c8f602aeb73d3ceae9d6b1d13a5fa7" dependencies = [ - "log 0.4.14", + "log 0.4.11", "pest", "pest_derive", - "quick-error 2.0.1", + "quick-error 2.0.0", "serde", "serde_json", ] @@ -2228,58 +2187,52 @@ dependencies = [ "ahash 0.4.7", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - [[package]] name = "hashlink" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8" dependencies = [ - "hashbrown 0.9.1", + "hashbrown", ] [[package]] name = "hdrhistogram" -version = "7.3.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa51471caf8069812385974ce947bf4b71a806d7e5a0d1f710af57d6a9a45ad" +checksum = "af54a13c410de2b5e2d611475072834b86d7b2f835a2a8f7b1b1248d3e9bfbd8" dependencies = [ "base64 0.13.0", "byteorder", - "crossbeam-channel 0.5.1", + "crossbeam-channel 0.5.0", "flate2", - "nom 6.1.2", + "nom 6.1.0", "num-traits", ] [[package]] name = "heck" -version = "0.3.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" dependencies = [ "unicode-segmentation", ] [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" dependencies = [ "libc", ] [[package]] name = "hex" -version = "0.4.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" [[package]] name = "hmac" @@ -2325,11 +2278,11 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes 1.0.1", + "bytes 0.5.6", "fnv", "itoa", ] @@ -2341,7 +2294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "http 0.1.21", "tokio-buf", ] @@ -2353,14 +2306,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ "bytes 0.5.6", - "http 0.2.4", + "http 0.2.1", ] [[package]] name = "httparse" -version = "1.4.1" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" [[package]] name = "httpdate" @@ -2380,7 +2333,7 @@ dependencies = [ "log 0.3.9", "mime 0.2.6", "num_cpus", - "time 0.1.43", + "time 0.1.44", "traitobject", "typeable", "unicase 1.4.2", @@ -2389,12 +2342,12 @@ dependencies = [ [[package]] name = "hyper" -version = "0.12.36" +version = "0.12.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" +checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "futures-cpupool", "h2 0.1.26", "http 0.1.21", @@ -2402,10 +2355,10 @@ dependencies = [ "httparse", "iovec", "itoa", - "log 0.4.14", + "log 0.4.11", "net2", - "rustc_version 0.2.3", - "time 0.1.43", + "rustc_version", + "time 0.1.44", "tokio 0.1.22", "tokio-buf", "tokio-executor", @@ -2419,23 +2372,23 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.10" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" dependencies = [ "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", - "h2 0.2.7", - "http 0.2.4", + "h2 0.2.6", + "http 0.2.1", "http-body 0.3.1", "httparse", "httpdate", "itoa", - "pin-project 1.0.7", - "socket2 0.3.19", - "tokio 0.2.25", + "pin-project 0.4.27", + "socket2", + "tokio 0.2.22", "tower-service", "tracing", "want 0.3.0", @@ -2448,9 +2401,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper 0.13.10", + "hyper 0.13.8", "native-tls", - "tokio 0.2.25", + "tokio 0.2.22", "tokio-tls 0.3.1", ] @@ -2473,9 +2426,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" dependencies = [ "matches", "unicode-bidi", @@ -2493,7 +2446,7 @@ dependencies = [ "rand_xoshiro", "sized-chunks", "typenum", - "version_check 0.9.3", + "version_check 0.9.2", ] [[package]] @@ -2525,21 +2478,21 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2" dependencies = [ "autocfg 1.0.1", - "hashbrown 0.11.2", + "hashbrown", ] [[package]] name = "instant" -version = "0.1.10" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", ] [[package]] @@ -2557,7 +2510,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" dependencies = [ - "socket2 0.3.19", + "socket2", "widestring", "winapi 0.3.9", "winreg 0.6.2", @@ -2565,9 +2518,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" [[package]] name = "itertools" @@ -2589,24 +2542,24 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" dependencies = [ "either", ] [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" [[package]] name = "js-sys" -version = "0.3.51" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8" dependencies = [ "wasm-bindgen", ] @@ -2618,11 +2571,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2773fa94a2a1fd51efb89a8f45b8861023dbb415d18d3c9235ae9388d780f9ec" dependencies = [ "failure", - "futures 0.1.31", - "hyper 0.12.36", + "futures 0.1.30", + "hyper 0.12.35", "jsonrpc-core", "jsonrpc-pubsub", - "log 0.4.14", + "log 0.4.11", "serde", "serde_json", "tokio 0.1.22", @@ -2636,8 +2589,8 @@ version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62" dependencies = [ - "futures 0.1.31", - "log 0.4.14", + "futures 0.1.30", + "log 0.4.11", "serde", "serde_derive", "serde_json", @@ -2670,10 +2623,10 @@ version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0da906d682799df05754480dac1b9e70ec92e12c19ebafd2662a5ea1c9fd6522" dependencies = [ - "hyper 0.12.36", + "hyper 0.12.35", "jsonrpc-core", "jsonrpc-server-utils", - "log 0.4.14", + "log 0.4.11", "net2", "parking_lot 0.10.2", "unicase 2.6.0", @@ -2686,7 +2639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d44f5602a11d657946aac09357956d2841299ed422035edf140c552cb057986" dependencies = [ "jsonrpc-core", - "log 0.4.14", + "log 0.4.11", "parking_lot 0.10.2", "rand 0.7.3", "serde", @@ -2702,7 +2655,7 @@ dependencies = [ "globset", "jsonrpc-core", "lazy_static", - "log 0.4.14", + "log 0.4.11", "tokio 0.1.22", "tokio-codec", "unicase 2.6.0", @@ -2716,7 +2669,7 @@ checksum = "903d3109fe7c4acb932b567e1e607e0f524ed04741b09fb0e61841bc40a022fc" dependencies = [ "jsonrpc-core", "jsonrpc-server-utils", - "log 0.4.14", + "log 0.4.11", "parking_lot 0.10.2", "slab", "ws", @@ -2762,7 +2715,7 @@ dependencies = [ "rust-crypto", "serde_json", "structopt", - "time 0.1.43", + "time 0.1.44", "vlog", "zksync_circuit", "zksync_config", @@ -2778,7 +2731,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" dependencies = [ - "log 0.4.14", + "log 0.4.11", ] [[package]] @@ -2801,22 +2754,22 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lexical-core" -version = "0.7.6" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.5.1", "bitflags", - "cfg-if 1.0.0", + "cfg-if 0.1.10", "ryu", "static_assertions", ] [[package]] name = "libc" -version = "0.2.98" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" [[package]] name = "libm" @@ -2826,9 +2779,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" [[package]] name = "loadnext" @@ -2836,13 +2789,13 @@ version = "0.1.0" dependencies = [ "anyhow", "envy", - "futures 0.3.15", + "futures 0.3.6", "hex", "num", "rand 0.7.3", "serde", "static_assertions", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "zksync", "zksync_eth_signer", @@ -2858,7 +2811,7 @@ dependencies = [ "async-trait", "chrono", "colored", - "futures 0.3.15", + "futures 0.3.6", "hex", "num", "once_cell", @@ -2867,7 +2820,7 @@ dependencies = [ "serde", "serde_json", "structopt", - "tokio 0.2.25", + "tokio 0.2.22", "toml", "vlog", "web3", @@ -2890,9 +2843,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c" dependencies = [ "scopeguard", ] @@ -2903,17 +2856,16 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.14", + "log 0.4.11", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if 1.0.0", - "value-bag", + "cfg-if 0.1.10", ] [[package]] @@ -2981,9 +2933,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.4.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" [[package]] name = "memoffset" @@ -2994,15 +2946,6 @@ dependencies = [ "autocfg 1.0.1", ] -[[package]] -name = "memoffset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -dependencies = [ - "autocfg 1.0.1", -] - [[package]] name = "metrics" version = "0.13.0-alpha.8" @@ -3021,12 +2964,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c507e712df1231dea654a2cf39da902a7098d0929360a0fab218c998abc729a" dependencies = [ "hdrhistogram", - "hyper 0.13.10", + "hyper 0.13.8", "metrics", "metrics-util", - "parking_lot 0.11.1", + "parking_lot 0.11.0", "thiserror", - "tokio 0.2.25", + "tokio 0.2.22", ] [[package]] @@ -3051,8 +2994,8 @@ checksum = "938d428ecdc2dc9a6ed8a8da2e6aefc6ee70ab7e26cfc68996a13cc560bced9c" dependencies = [ "arc-swap", "atomic-shim", - "crossbeam-epoch 0.9.5", - "crossbeam-utils 0.8.5", + "crossbeam-epoch 0.9.0", + "crossbeam-utils 0.8.1", "dashmap", "indexmap", "metrics", @@ -3085,9 +3028,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" dependencies = [ "adler", "autocfg 1.0.1", @@ -3095,9 +3038,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.6.23" +version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" dependencies = [ "cfg-if 0.1.10", "fuchsia-zircon", @@ -3105,8 +3048,8 @@ dependencies = [ "iovec", "kernel32-sys", "libc", - "log 0.4.14", - "miow 0.2.2", + "log 0.4.11", + "miow 0.2.1", "net2", "slab", "winapi 0.2.8", @@ -3119,7 +3062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" dependencies = [ "lazycell", - "log 0.4.14", + "log 0.4.11", "mio", "slab", ] @@ -3130,9 +3073,9 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ - "log 0.4.14", + "log 0.4.11", "mio", - "miow 0.3.7", + "miow 0.3.6", "winapi 0.3.9", ] @@ -3149,9 +3092,9 @@ dependencies = [ [[package]] name = "miow" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" dependencies = [ "kernel32-sys", "net2", @@ -3161,22 +3104,23 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.7" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ + "socket2", "winapi 0.3.9", ] [[package]] name = "native-tls" -version = "0.2.7" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" +checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" dependencies = [ "lazy_static", "libc", - "log 0.4.14", + "log 0.4.11", "openssl", "openssl-probe", "openssl-sys", @@ -3186,11 +3130,21 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nb-connect" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "net2" -version = "0.2.37" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853" dependencies = [ "cfg-if 0.1.10", "libc", @@ -3199,13 +3153,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" dependencies = [ "bitflags", "cc", - "cfg-if 1.0.0", + "cfg-if 0.1.10", "libc", ] @@ -3223,20 +3177,19 @@ checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ "lexical-core", "memchr", - "version_check 0.9.3", + "version_check 0.9.2", ] [[package]] name = "nom" -version = "6.1.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +checksum = "ab6f70b46d6325aa300f1c7bb3d470127dfc27806d8ea6bf294ee0ce643ce2b1" dependencies = [ - "bitvec 0.19.5", - "funty", + "bitvec 0.19.4", "lexical-core", "memchr", - "version_check 0.9.3", + "version_check 0.9.2", ] [[package]] @@ -3245,7 +3198,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" dependencies = [ - "num-bigint 0.3.2", + "num-bigint 0.3.1", "num-complex 0.3.1", "num-integer", "num-iter", @@ -3266,9 +3219,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.3.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" +checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" dependencies = [ "autocfg 1.0.1", "num-integer", @@ -3276,17 +3229,6 @@ dependencies = [ "serde", ] -[[package]] -name = "num-bigint" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512" -dependencies = [ - "autocfg 1.0.1", - "num-integer", - "num-traits", -] - [[package]] name = "num-complex" version = "0.2.4" @@ -3335,7 +3277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg 1.0.1", - "num-bigint 0.3.2", + "num-bigint 0.3.1", "num-integer", "num-traits", "serde", @@ -3363,21 +3305,21 @@ dependencies = [ [[package]] name = "object" -version = "0.23.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" +checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693" [[package]] name = "once_cell" -version = "1.8.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "a170cebd8021a008ea92e4db85a72f80b35df514ec664b296fdcbb654eac0b2c" [[package]] name = "opaque-debug" @@ -3393,29 +3335,29 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.35" +version = "0.10.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" +checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if 0.1.10", "foreign-types", + "lazy_static", "libc", - "once_cell", "openssl-sys", ] [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-sys" -version = "0.9.65" +version = "0.9.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" +checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" dependencies = [ "autocfg 1.0.1", "cc", @@ -3456,18 +3398,18 @@ dependencies = [ "scrypt", "secp256k1", "sha2 0.8.2", - "subtle 2.4.1", + "subtle 2.3.0", "tiny-keccak 2.0.2", "zeroize", ] [[package]] name = "parity-scale-codec" -version = "1.3.7" +version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" +checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.5.1", "bitvec 0.17.4", "byte-slice-cast", "serde", @@ -3487,7 +3429,7 @@ checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" dependencies = [ "lock_api 0.3.4", "parking_lot_core 0.6.2", - "rustc_version 0.2.3", + "rustc_version", ] [[package]] @@ -3502,13 +3444,13 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733" dependencies = [ "instant", - "lock_api 0.4.4", - "parking_lot_core 0.8.3", + "lock_api 0.4.1", + "parking_lot_core 0.8.0", ] [[package]] @@ -3518,11 +3460,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" dependencies = [ "cfg-if 0.1.10", - "cloudabi", + "cloudabi 0.0.3", "libc", - "redox_syscall 0.1.57", - "rustc_version 0.2.3", - "smallvec 0.6.14", + "redox_syscall", + "rustc_version", + "smallvec 0.6.13", "winapi 0.3.9", ] @@ -3533,24 +3475,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" dependencies = [ "cfg-if 0.1.10", - "cloudabi", + "cloudabi 0.0.3", "libc", - "redox_syscall 0.1.57", - "smallvec 1.6.1", + "redox_syscall", + "smallvec 1.4.2", "winapi 0.3.9", ] [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", + "cloudabi 0.1.0", "instant", "libc", - "redox_syscall 0.2.9", - "smallvec 1.6.1", + "redox_syscall", + "smallvec 1.4.2", "winapi 0.3.9", ] @@ -3579,11 +3522,11 @@ dependencies = [ [[package]] name = "pem" -version = "0.8.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" +checksum = "59698ea79df9bf77104aefd39cc3ec990cb9693fb59c3b0a70ddf2646fdffb4b" dependencies = [ - "base64 0.13.0", + "base64 0.12.3", "once_cell", "regex", ] @@ -3645,27 +3588,27 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.28" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" +checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" dependencies = [ - "pin-project-internal 0.4.28", + "pin-project-internal 0.4.27", ] [[package]] name = "pin-project" -version = "1.0.7" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" +checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" dependencies = [ - "pin-project-internal 1.0.7", + "pin-project-internal 1.0.2", ] [[package]] name = "pin-project-internal" -version = "0.4.28" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" dependencies = [ "proc-macro2", "quote", @@ -3674,9 +3617,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.7" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" +checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" dependencies = [ "proc-macro2", "quote", @@ -3685,15 +3628,15 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.1.12" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" +checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" [[package]] name = "pin-utils" @@ -3709,9 +3652,9 @@ checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "plotters" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" +checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" dependencies = [ "num-traits", "plotters-backend", @@ -3722,29 +3665,29 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" +checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590" [[package]] name = "plotters-svg" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" +checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211" dependencies = [ "plotters-backend", ] [[package]] name = "polling" -version = "2.1.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" +checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "libc", - "log 0.4.14", - "wepoll-ffi", + "log 0.4.11", + "wepoll-sys", "winapi 0.3.9", ] @@ -3769,15 +3712,15 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" [[package]] name = "primitive-types" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809" +checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8" dependencies = [ "fixed-hash", "impl-codec", @@ -3805,7 +3748,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "version_check 0.9.3", + "version_check 0.9.2", ] [[package]] @@ -3816,7 +3759,7 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "version_check 0.9.3", + "version_check 0.9.2", ] [[package]] @@ -3827,15 +3770,15 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" +checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" [[package]] name = "proc-macro2" -version = "1.0.27" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" dependencies = [ "unicode-xid", ] @@ -3857,15 +3800,15 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-error" -version = "2.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" +checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ "proc-macro2", ] @@ -3911,7 +3854,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" dependencies = [ - "cloudabi", + "cloudabi 0.0.3", "fuchsia-cprng", "libc", "rand_core 0.3.1", @@ -3943,7 +3886,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom 0.1.16", + "getrandom 0.1.15", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", @@ -3951,18 +3894,6 @@ dependencies = [ "rand_pcg 0.2.1", ] -[[package]] -name = "rand" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", -] - [[package]] name = "rand_chacha" version = "0.1.1" @@ -3983,16 +3914,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.3", -] - [[package]] name = "rand_core" version = "0.3.1" @@ -4014,16 +3935,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.3", + "getrandom 0.1.15", ] [[package]] @@ -4044,15 +3956,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_isaac" version = "0.1.1" @@ -4079,7 +3982,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" dependencies = [ - "cloudabi", + "cloudabi 0.0.3", "fuchsia-cprng", "libc", "rand_core 0.4.2", @@ -4126,25 +4029,25 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" dependencies = [ "autocfg 1.0.1", - "crossbeam-deque 0.8.0", + "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" dependencies = [ - "crossbeam-channel 0.5.1", - "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.5", + "crossbeam-channel 0.4.4", + "crossbeam-deque", + "crossbeam-utils 0.7.2", "lazy_static", "num_cpus", ] @@ -4166,7 +4069,7 @@ dependencies = [ "franklin-crypto", "hex", "once_cell", - "sha2 0.9.5", + "sha2 0.9.1", ] [[package]] @@ -4175,40 +4078,33 @@ version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" -[[package]] -name = "redox_syscall" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" -dependencies = [ - "bitflags", -] - [[package]] name = "regex" -version = "1.5.4" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" dependencies = [ "aho-corasick", "memchr", "regex-syntax", + "thread_local", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" dependencies = [ + "byteorder", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" [[package]] name = "remove_dir_all" @@ -4221,34 +4117,34 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.10" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e" dependencies = [ - "base64 0.13.0", + "base64 0.12.3", "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", - "http 0.2.4", + "http 0.2.1", "http-body 0.3.1", - "hyper 0.13.10", + "hyper 0.13.8", "hyper-tls", "ipnet", "js-sys", "lazy_static", - "log 0.4.14", + "log 0.4.11", "mime 0.3.16", "mime_guess", "native-tls", "percent-encoding 2.1.0", - "pin-project-lite 0.2.7", + "pin-project-lite 0.1.11", "serde", "serde_json", "serde_urlencoded", - "tokio 0.2.25", + "tokio 0.2.22", "tokio-tls 0.3.1", - "url 2.2.2", + "url 2.2.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4262,7 +4158,7 @@ source = "git+https://github.com/matter-labs/rescue-poseidon.git?branch=stable#3 dependencies = [ "byteorder", "franklin-crypto", - "num-bigint 0.3.2", + "num-bigint 0.3.1", "num-integer", "num-iter", "num-traits", @@ -4272,9 +4168,9 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.7.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +checksum = "11834e137f3b14e309437a8276714eed3a80d1ef894869e510f2c0c0b98b9f4a" dependencies = [ "hostname", "quick-error 1.2.3", @@ -4325,14 +4221,14 @@ dependencies = [ "libc", "rand 0.3.23", "rustc-serialize", - "time 0.1.43", + "time 0.1.44", ] [[package]] name = "rustc-demangle" -version = "0.1.20" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" +checksum = "b2610b7f643d18c87dff3b489950269617e6601a51f1f05aa5daefee36f64f0b" [[package]] name = "rustc-hex" @@ -4355,29 +4251,11 @@ dependencies = [ "semver 0.9.0", ] -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.3", -] - [[package]] name = "rustversion" -version = "1.0.5" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" +checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" [[package]] name = "ryu" @@ -4450,9 +4328,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.3.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" dependencies = [ "bitflags", "core-foundation", @@ -4463,9 +4341,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.3.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" +checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" dependencies = [ "core-foundation-sys", "libc", @@ -4486,16 +4364,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser 0.10.2", + "semver-parser 0.10.0", "serde", ] -[[package]] -name = "semver" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe" - [[package]] name = "semver-parser" version = "0.7.0" @@ -4504,11 +4376,12 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "semver-parser" -version = "0.10.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +checksum = "0e012c6c5380fb91897ba7b9261a0f565e624e869d42fe1a1d03fa0d68a083d5" dependencies = [ "pest", + "pest_derive", ] [[package]] @@ -4558,7 +4431,7 @@ dependencies = [ "lazy_static", "libc", "regex", - "rustc_version 0.2.3", + "rustc_version", "sentry-core", "uname", ] @@ -4598,15 +4471,15 @@ dependencies = [ "serde", "serde_json", "thiserror", - "url 2.2.2", + "url 2.2.1", "uuid", ] [[package]] name = "serde" -version = "1.0.126" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] @@ -4623,9 +4496,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.126" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2", "quote", @@ -4634,9 +4507,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" dependencies = [ "indexmap", "itoa", @@ -4646,9 +4519,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" +checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" dependencies = [ "proc-macro2", "quote", @@ -4657,21 +4530,21 @@ dependencies = [ [[package]] name = "serde_urlencoded" -version = "0.7.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" dependencies = [ - "form_urlencoded", + "dtoa", "itoa", - "ryu", "serde", + "url 2.2.1", ] [[package]] name = "serde_with" -version = "1.9.4" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad9fdbb69badc8916db738c25efd04f0a65297d26c2f8de4b62e57b8c12bc72" +checksum = "33d14cb8c1b03d86e97ecbb3128d3e2f81fd8f02805680537b8d9ccb7dd8960b" dependencies = [ "rustversion", "serde", @@ -4680,9 +4553,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "1.4.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1569374bd54623ec8bd592cf22ba6e03c0f177ff55fbc8c29a49e296e7adecf" +checksum = "e48b35457e9d855d3dc05ef32a73e0df1e2c0fd72c38796a4ee909160c8eeec2" dependencies = [ "darling", "proc-macro2", @@ -4704,13 +4577,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.7" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a0c8611594e2ab4ebbf06ec7cbbf0a99450b8570e96cbf5188b5d5f6ef18d81" +checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", + "cfg-if 0.1.10", + "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -4735,13 +4608,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.5" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", + "cfg-if 0.1.10", + "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -4769,10 +4642,11 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" dependencies = [ + "arc-swap", "libc", ] @@ -4789,9 +4663,9 @@ dependencies = [ [[package]] name = "sized-chunks" -version = "0.6.5" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" +checksum = "65e65d6a9f13cd78f361ea5a2cf53a45d67cdda421ba0316b9be101560f3d207" dependencies = [ "bitmaps", "typenum", @@ -4799,24 +4673,24 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "smallvec" -version = "0.6.14" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" dependencies = [ "maybe-uninit", ] [[package]] name = "smallvec" -version = "1.6.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" [[package]] name = "socket2" @@ -4829,16 +4703,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "socket2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "soketto" version = "0.4.2" @@ -4847,11 +4711,11 @@ checksum = "b5c71ed3d54db0a699f4948e1bb3e45b450fa31fe602621dee6680361d569c88" dependencies = [ "base64 0.12.3", "bytes 0.5.6", - "futures 0.3.15", + "futures 0.3.6", "httparse", - "log 0.4.14", + "log 0.4.11", "rand 0.7.3", - "sha-1 0.9.7", + "sha-1 0.9.1", ] [[package]] @@ -4868,15 +4732,13 @@ checksum = "c85070f382340e8b23a75808e83573ddf65f9ad9143df9573ca37c1ed2ee956a" [[package]] name = "sqlformat" -version = "0.1.6" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d86e3c77ff882a828346ba401a7ef4b8e440df804491c6064fe8295765de71c" +checksum = "f699301eec598ffd6c39832cca1416381ea459ac73c506f6ca74c8750fb52969" dependencies = [ "lazy_static", "maplit", - "nom 6.1.2", "regex", - "unicode_categories", ] [[package]] @@ -4895,7 +4757,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36bb6a2ca3345a86493bc3b71eabc2c6c16a8bb1aa476cf5303bee27f67627d7" dependencies = [ - "ahash 0.6.3", + "ahash 0.6.2", "atoi", "base64 0.13.0", "bigdecimal", @@ -4903,9 +4765,9 @@ dependencies = [ "byteorder", "bytes 0.5.6", "chrono", - "crossbeam-channel 0.5.1", - "crossbeam-queue 0.3.2", - "crossbeam-utils 0.8.5", + "crossbeam-channel 0.5.0", + "crossbeam-queue 0.3.1", + "crossbeam-utils 0.8.1", "either", "futures-channel", "futures-core", @@ -4915,24 +4777,24 @@ dependencies = [ "hmac 0.10.1", "itoa", "libc", - "log 0.4.14", + "log 0.4.11", "md-5", "memchr", - "num-bigint 0.3.2", + "num-bigint 0.3.1", "once_cell", - "parking_lot 0.11.1", + "parking_lot 0.11.0", "percent-encoding 2.1.0", "rand 0.7.3", "serde", "serde_json", - "sha-1 0.9.7", - "sha2 0.9.5", - "smallvec 1.6.1", + "sha-1 0.9.1", + "sha2 0.9.1", + "smallvec 1.4.2", "sqlformat", "sqlx-rt", "stringprep", "thiserror", - "url 2.2.2", + "url 2.2.1", "whoami", ] @@ -4945,7 +4807,7 @@ dependencies = [ "cargo_metadata", "dotenv", "either", - "futures 0.3.15", + "futures 0.3.6", "heck", "hex", "lazy_static", @@ -4953,11 +4815,11 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.9.5", + "sha2 0.9.1", "sqlx-core", "sqlx-rt", "syn", - "url 2.2.2", + "url 2.2.1", ] [[package]] @@ -4968,17 +4830,17 @@ checksum = "63fc5454c9dd7aaea3a0eeeb65ca40d06d0d8e7413a8184f7c3a3ffa5056190b" dependencies = [ "native-tls", "once_cell", - "tokio 0.2.25", + "tokio 0.2.22", "tokio-native-tls", ] [[package]] name = "standback" -version = "0.2.17" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +checksum = "f4e0831040d2cf2bdfd51b844be71885783d489898a192f254ae25d57cce725c" dependencies = [ - "version_check 0.9.3", + "version_check 0.9.2", ] [[package]] @@ -4994,7 +4856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" dependencies = [ "discard", - "rustc_version 0.2.3", + "rustc_version", "stdweb-derive", "stdweb-internal-macros", "stdweb-internal-runtime", @@ -5042,7 +4904,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" dependencies = [ - "generic-array 0.12.4", + "generic-array 0.12.3", ] [[package]] @@ -5078,9 +4940,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.22" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" +checksum = "126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8" dependencies = [ "clap", "lazy_static", @@ -5089,9 +4951,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.15" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" +checksum = "65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8" dependencies = [ "heck", "proc-macro-error", @@ -5108,15 +4970,15 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.4.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd" [[package]] name = "syn" -version = "1.0.73" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" dependencies = [ "proc-macro2", "quote", @@ -5125,9 +4987,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.5" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" +checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2", "quote", @@ -5137,20 +4999,20 @@ dependencies = [ [[package]] name = "tap" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" [[package]] name = "tempfile" -version = "3.2.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "libc", - "rand 0.8.4", - "redox_syscall 0.2.9", + "rand 0.7.3", + "redox_syscall", "remove_dir_all", "winapi 0.3.9", ] @@ -5166,18 +5028,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.26" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.26" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab" dependencies = [ "proc-macro2", "quote", @@ -5186,11 +5048,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" dependencies = [ - "once_cell", + "lazy_static", ] [[package]] @@ -5204,26 +5066,27 @@ 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 0.3.9", ] [[package]] name = "time" -version = "0.2.27" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +checksum = "55b7151c9065e80917fbf285d9a5d1432f60db41d170ccafc749a136b41a93af" dependencies = [ "const_fn", "libc", "standback", "stdweb", "time-macros", - "version_check 0.9.3", + "version_check 0.9.2", "winapi 0.3.9", ] @@ -5239,9 +5102,9 @@ dependencies = [ [[package]] name = "time-macros-impl" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -5270,9 +5133,9 @@ dependencies = [ [[package]] name = "tinytemplate" -version = "1.2.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f" dependencies = [ "serde", "serde_json", @@ -5280,9 +5143,15 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.2.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" + +[[package]] +name = "tinyvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575" dependencies = [ "tinyvec_macros", ] @@ -5300,7 +5169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "mio", "num_cpus", "tokio-codec", @@ -5319,9 +5188,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.25" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" dependencies = [ "bytes 0.5.6", "fnv", @@ -5334,7 +5203,7 @@ dependencies = [ "mio-named-pipes", "mio-uds", "num_cpus", - "pin-project-lite 0.1.12", + "pin-project-lite 0.1.11", "signal-hook-registry", "slab", "tokio-macros", @@ -5343,12 +5212,12 @@ dependencies = [ [[package]] name = "tokio" -version = "1.8.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2602b8af3767c285202012822834005f596c811042315fa7e9f5b12b2a43207" +checksum = "8efab2086f17abcddb8f756117665c958feee6b2e39974c2f1600592ab3a4195" dependencies = [ "autocfg 1.0.1", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.4", ] [[package]] @@ -5359,7 +5228,7 @@ checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" dependencies = [ "bytes 0.4.12", "either", - "futures 0.1.31", + "futures 0.1.30", ] [[package]] @@ -5369,7 +5238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "tokio-io", ] @@ -5379,7 +5248,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", "tokio-executor", ] @@ -5390,7 +5259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.31", + "futures 0.1.30", ] [[package]] @@ -5399,7 +5268,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", "tokio-io", "tokio-threadpool", ] @@ -5411,15 +5280,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", - "log 0.4.14", + "futures 0.1.30", + "log 0.4.11", ] [[package]] name = "tokio-macros" -version = "0.2.6" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" dependencies = [ "proc-macro2", "quote", @@ -5433,7 +5302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd608593a919a8e05a7d1fc6df885e40f6a88d3a70a3a7eff23ff27964eda069" dependencies = [ "native-tls", - "tokio 0.2.25", + "tokio 0.2.22", ] [[package]] @@ -5443,9 +5312,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.31", + "futures 0.1.30", "lazy_static", - "log 0.4.14", + "log 0.4.11", "mio", "num_cpus", "parking_lot 0.9.0", @@ -5462,7 +5331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" dependencies = [ "fnv", - "futures 0.1.31", + "futures 0.1.30", ] [[package]] @@ -5472,7 +5341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "iovec", "mio", "tokio-io", @@ -5485,12 +5354,12 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ - "crossbeam-deque 0.7.3", + "crossbeam-deque", "crossbeam-queue 0.2.3", "crossbeam-utils 0.7.2", - "futures 0.1.31", + "futures 0.1.30", "lazy_static", - "log 0.4.14", + "log 0.4.11", "num_cpus", "slab", "tokio-executor", @@ -5503,7 +5372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.31", + "futures 0.1.30", "slab", "tokio-executor", ] @@ -5514,7 +5383,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", "native-tls", "tokio-io", ] @@ -5526,7 +5395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio 0.2.25", + "tokio 0.2.22", ] [[package]] @@ -5536,8 +5405,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", - "log 0.4.14", + "futures 0.1.30", + "log 0.4.11", "mio", "tokio-codec", "tokio-io", @@ -5551,10 +5420,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "iovec", "libc", - "log 0.4.14", + "log 0.4.11", "mio", "mio-uds", "tokio-codec", @@ -5572,44 +5441,44 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", - "log 0.4.14", - "pin-project-lite 0.1.12", - "tokio 0.2.25", + "log 0.4.11", + "pin-project-lite 0.1.11", + "tokio 0.2.22", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" dependencies = [ "serde", ] [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" dependencies = [ "cfg-if 1.0.0", - "log 0.4.14", - "pin-project-lite 0.2.7", + "log 0.4.11", + "pin-project-lite 0.2.4", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.15" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" +checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" dependencies = [ "proc-macro2", "quote", @@ -5618,31 +5487,21 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.18" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" +checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" dependencies = [ "lazy_static", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project 1.0.7", - "tracing", -] - [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9" dependencies = [ "lazy_static", - "log 0.4.14", + "log 0.4.11", "tracing-core", ] @@ -5658,9 +5517,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.19" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48" +checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -5670,7 +5529,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec 1.6.1", + "smallvec 1.4.2", "thread_local", "tracing", "tracing-core", @@ -5686,40 +5545,41 @@ checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" [[package]] name = "trust-dns-proto" -version = "0.19.7" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cad71a0c0d68ab9941d2fb6e82f8fb2e86d9945b94e1661dd0aaea2b88215a9" +checksum = "cdd7061ba6f4d4d9721afedffbfd403f20f39a4301fee1b70d6fcd09cca69f28" dependencies = [ "async-trait", - "cfg-if 1.0.0", + "backtrace", "enum-as-inner", - "futures 0.3.15", - "idna 0.2.3", + "futures 0.3.6", + "idna 0.2.0", "lazy_static", - "log 0.4.14", + "log 0.4.11", "rand 0.7.3", - "smallvec 1.6.1", + "smallvec 1.4.2", "thiserror", - "tokio 0.2.25", - "url 2.2.2", + "tokio 0.2.22", + "url 2.2.1", ] [[package]] name = "trust-dns-resolver" -version = "0.19.7" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb" +checksum = "0f23cdfdc3d8300b3c50c9e84302d3bd6d860fb9529af84ace6cf9665f181b77" dependencies = [ + "backtrace", "cfg-if 0.1.10", - "futures 0.3.15", + "futures 0.3.6", "ipconfig", "lazy_static", - "log 0.4.14", + "log 0.4.11", "lru-cache", "resolv-conf", - "smallvec 1.6.1", + "smallvec 1.4.2", "thiserror", - "tokio 0.2.25", + "tokio 0.2.22", "trust-dns-proto", ] @@ -5737,9 +5597,9 @@ checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" [[package]] name = "typenum" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" [[package]] name = "ucd-trie" @@ -5783,32 +5643,32 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "version_check 0.9.3", + "version_check 0.9.2", ] [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" +checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" dependencies = [ "matches", ] [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" dependencies = [ - "tinyvec", + "tinyvec 0.3.4", ] [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" [[package]] name = "unicode-width" @@ -5818,15 +5678,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "unicode_categories" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "untrusted" @@ -5847,12 +5701,12 @@ dependencies = [ [[package]] name = "url" -version = "2.2.2" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" dependencies = [ "form_urlencoded", - "idna 0.2.3", + "idna 0.2.0", "matches", "percent-encoding 2.1.0", "serde", @@ -5864,25 +5718,21 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.0", "serde", ] [[package]] -name = "value-bag" -version = "1.0.0-alpha.7" +name = "vcpkg" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae" -dependencies = [ - "ctor", - "version_check 0.9.3", -] +checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" [[package]] -name = "vcpkg" -version = "0.2.15" +name = "vec-arena" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d" [[package]] name = "vec_map" @@ -5898,9 +5748,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" [[package]] name = "vlog" @@ -5920,9 +5770,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ "same-file", "winapi 0.3.9", @@ -5935,8 +5785,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" dependencies = [ - "futures 0.1.31", - "log 0.4.14", + "futures 0.1.30", + "log 0.4.11", "try-lock", ] @@ -5946,7 +5796,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "log 0.4.14", + "log 0.4.11", "try-lock", ] @@ -5958,17 +5808,17 @@ 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 = "wasm-bindgen" -version = "0.2.74" +version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "serde", "serde_json", "wasm-bindgen-macro", @@ -5976,13 +5826,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.74" +version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.14", + "log 0.4.11", "proc-macro2", "quote", "syn", @@ -5991,11 +5841,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.24" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" +checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "js-sys", "wasm-bindgen", "web-sys", @@ -6003,9 +5853,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.74" +version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6013,9 +5863,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.74" +version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" dependencies = [ "proc-macro2", "quote", @@ -6026,15 +5876,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.74" +version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" +checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307" [[package]] name = "web-sys" -version = "0.3.51" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d" dependencies = [ "js-sys", "wasm-bindgen", @@ -6046,21 +5896,21 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d03f64be59921dbc5791f05af61a87594bb454518fe4e97d827405422279a0" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.5.1", "async-native-tls", "async-std", "base64 0.12.3", "derive_more", "ethabi", "ethereum-types", - "futures 0.3.15", + "futures 0.3.6", "futures-timer", - "hyper 0.13.10", + "hyper 0.13.8", "hyper-tls", "jsonrpc-core", - "log 0.4.14", + "log 0.4.11", "native-tls", - "parking_lot 0.11.1", + "parking_lot 0.11.0", "rlp", "rustc-hex", "secp256k1", @@ -6068,7 +5918,7 @@ dependencies = [ "serde_json", "soketto", "tiny-keccak 2.0.2", - "url 2.2.2", + "url 2.2.1", ] [[package]] @@ -6078,7 +5928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413b37840b9e27b340ce91b319ede10731de8c72f5bc4cb0206ec1ca4ce581d0" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "hyper 0.10.16", "native-tls", "rand 0.6.5", @@ -6102,7 +5952,7 @@ dependencies = [ "bitflags", "byteorder", "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "native-tls", "rand 0.6.5", "sha1", @@ -6113,19 +5963,19 @@ dependencies = [ ] [[package]] -name = "wepoll-ffi" -version = "0.1.2" +name = "wepoll-sys" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" dependencies = [ "cc", ] [[package]] name = "whoami" -version = "1.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abacf325c958dfeaf1046931d37f2a901b6dfe0968ee965a29e94c6766b2af6" +checksum = "e35495e7faf4c657051a8e9725d9c37ac57879e915be3ed55bb401af84382035" dependencies = [ "wasm-bindgen", "web-sys", @@ -6207,13 +6057,13 @@ dependencies = [ "byteorder", "bytes 0.4.12", "httparse", - "log 0.4.14", + "log 0.4.11", "mio", "mio-extras", "rand 0.7.3", "sha-1 0.8.2", "slab", - "url 2.2.2", + "url 2.2.1", ] [[package]] @@ -6234,9 +6084,9 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "zeroize" -version = "1.4.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeafe61337cb2c879d328b74aa6cd9d794592c82da6be559fdf11493f02a2d18" +checksum = "05f33972566adbd2d3588b0491eb94b98b43695c4ef897903470ede4f3f5a28a" [[package]] name = "zksync" @@ -6253,7 +6103,7 @@ dependencies = [ "serde_json", "sha2 0.8.2", "thiserror", - "tokio 0.2.25", + "tokio 0.2.22", "web3", "zksync_config", "zksync_crypto", @@ -6278,8 +6128,8 @@ dependencies = [ "criterion", "ctrlc", "ethabi", - "futures 0.1.31", - "futures 0.3.15", + "futures 0.1.30", + "futures 0.3.6", "hex", "itertools 0.8.2", "jsonrpc-core", @@ -6303,7 +6153,7 @@ dependencies = [ "thiserror", "tiny-keccak 1.5.0", "tokio 0.1.22", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "web3", "zksync_api_client", @@ -6363,9 +6213,9 @@ dependencies = [ name = "zksync_balancer" version = "1.0.0" dependencies = [ - "futures 0.3.15", + "futures 0.3.6", "metrics", - "tokio 0.2.25", + "tokio 0.2.22", ] [[package]] @@ -6407,7 +6257,7 @@ dependencies = [ "serde_json", "toml", "tracing", - "url 2.2.2", + "url 2.2.1", "zksync_crypto", "zksync_types", "zksync_utils", @@ -6432,7 +6282,7 @@ dependencies = [ "chrono", "ctrlc", "ethabi", - "futures 0.3.15", + "futures 0.3.6", "itertools 0.9.0", "metrics", "num", @@ -6441,7 +6291,7 @@ dependencies = [ "serde_json", "thiserror", "tiny-keccak 1.5.0", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "web3", "zksync_api_types", @@ -6490,7 +6340,7 @@ dependencies = [ "chrono", "db_test_macro", "ethabi", - "futures 0.3.15", + "futures 0.3.6", "hex", "jsonrpc-core", "num", @@ -6498,7 +6348,7 @@ dependencies = [ "serde_json", "structopt", "tiny-keccak 1.5.0", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "web3", "zksync_config", @@ -6520,7 +6370,7 @@ dependencies = [ "metrics", "parity-crypto", "serde", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "web3", "zksync_config", @@ -6538,14 +6388,14 @@ dependencies = [ "chrono", "ctrlc", "ethabi", - "futures 0.3.15", + "futures 0.3.6", "hex", "lazy_static", "metrics", "num", "serde", "serde_json", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "web3", "zksync_basic_types", @@ -6566,7 +6416,7 @@ dependencies = [ "actix-rt", "actix-web", "async-trait", - "futures 0.3.15", + "futures 0.3.6", "hex", "jsonrpc-core", "parity-crypto", @@ -6576,7 +6426,7 @@ dependencies = [ "serde_derive", "serde_json", "thiserror", - "tokio 0.2.25", + "tokio 0.2.22", "zksync_types", ] @@ -6607,10 +6457,10 @@ dependencies = [ "chrono", "ethabi", "hex", - "log 0.4.14", + "log 0.4.11", "metrics", "num", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "web3", "zksync_api", @@ -6628,10 +6478,10 @@ dependencies = [ name = "zksync_gateway_watcher" version = "1.0.0" dependencies = [ - "futures 0.3.15", + "futures 0.3.6", "metrics", "thiserror", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "web3", "zksync_config", @@ -6645,7 +6495,7 @@ version = "1.0.0" dependencies = [ "anyhow", "bigdecimal", - "futures 0.3.15", + "futures 0.3.6", "hex", "num", "reqwest", @@ -6660,12 +6510,12 @@ version = "1.0.0" dependencies = [ "anyhow", "ctrlc", - "futures 0.3.15", + "futures 0.3.6", "metrics", "metrics-exporter-prometheus", "metrics-macros", "metrics-util", - "tokio 0.2.25", + "tokio 0.2.22", "tracing", "vlog", "zksync_config", @@ -6682,7 +6532,7 @@ dependencies = [ "backoff 0.2.1", "chrono", "ctrlc", - "futures 0.3.15", + "futures 0.3.6", "hex", "jsonwebtoken", "num", @@ -6691,7 +6541,7 @@ dependencies = [ "serde", "serde_json", "structopt", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "web3", "zksync_circuit", @@ -6715,7 +6565,7 @@ dependencies = [ "serde", "serde_json", "structopt", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "zksync_basic_types", "zksync_circuit", @@ -6732,12 +6582,12 @@ version = "1.0.0" dependencies = [ "anyhow", "ctrlc", - "futures 0.3.15", + "futures 0.3.6", "num", "serde", "serde_json", "structopt", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "zksync_api", "zksync_config", @@ -6791,7 +6641,7 @@ dependencies = [ "serde_json", "sqlx", "thiserror", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "zksync_api_types", "zksync_basic_types", @@ -6819,13 +6669,13 @@ version = "1.0.0" dependencies = [ "anyhow", "ethabi", - "futures 0.3.15", + "futures 0.3.6", "itertools 0.9.0", "num", "serde", "serde_json", "structopt", - "tokio 0.2.25", + "tokio 0.2.22", "vlog", "web3", "zksync_circuit", @@ -6874,12 +6724,12 @@ version = "1.0.0" dependencies = [ "anyhow", "bigdecimal", - "futures 0.3.15", + "futures 0.3.6", "hex", "num", "serde", "serde_json", - "tokio 0.2.25", + "tokio 0.2.22", ] [[package]] @@ -6893,14 +6743,14 @@ dependencies = [ "async-trait", "chrono", "ctrlc", - "futures 0.3.15", + "futures 0.3.6", "jsonwebtoken", "metrics", "num", "reqwest", "serde", "serde_json", - "tokio 0.2.25", + "tokio 0.2.22", "tracing", "vlog", "zksync_circuit", diff --git a/core/bin/prover/src/client.rs b/core/bin/prover/src/client.rs index 67c66db9ad..c13b4cb617 100644 --- a/core/bin/prover/src/client.rs +++ b/core/bin/prover/src/client.rs @@ -96,7 +96,7 @@ impl ApiClient { #[async_trait::async_trait] impl crate::ApiClient for ApiClient { async fn get_job(&self, req: ProverInputRequest) -> anyhow::Result { - let operation = || async { + let operation = (|| async { vlog::trace!("get prover job"); let response = self @@ -116,13 +116,13 @@ impl crate::ApiClient for ApiClient { .json() .await .map_err(|e| Transient(format_err!("failed parse json on get job request: {}", e))) - }; + }); self.with_retries(operation).await } async fn working_on(&self, job_id: i32, prover_name: &str) -> anyhow::Result<()> { - let operation = || async { + let operation = (|| async { log::trace!( "sending working_on job_id: {}, prover_name: {}", job_id, @@ -146,13 +146,13 @@ impl crate::ApiClient for ApiClient { } Ok(()) - }; + }); self.with_retries(operation).await } async fn publish(&self, data: ProverOutputRequest) -> anyhow::Result<()> { - let operation = || async { + let operation = (|| async { log::trace!("Trying publish proof: {:?}", data); let response = self @@ -169,13 +169,13 @@ impl crate::ApiClient for ApiClient { } Ok(()) - }; + }); self.with_retries(operation).await } async fn prover_stopped(&self, prover_name: String) -> anyhow::Result<()> { - let operation = || async { + let operation = (|| async { let response = self .http_client .post(self.stopped_url.clone()) @@ -194,7 +194,7 @@ impl crate::ApiClient for ApiClient { } Ok(()) - }; + }); self.with_retries(operation).await } diff --git a/core/bin/zksync_api/src/eth_checker.rs b/core/bin/zksync_api/src/eth_checker.rs index 19522afe90..3c1e003e98 100644 --- a/core/bin/zksync_api/src/eth_checker.rs +++ b/core/bin/zksync_api/src/eth_checker.rs @@ -141,7 +141,7 @@ mod tests { .await .expect("Check failed"); - assert!(result, "Signature is incorrect"); + assert_eq!(result, true, "Signature is incorrect"); } /// This test checks that the actual signature data taken from diff --git a/core/bin/zksync_api/src/fee_ticker/validator/mod.rs b/core/bin/zksync_api/src/fee_ticker/validator/mod.rs index 5b8fe52186..dedb958548 100644 --- a/core/bin/zksync_api/src/fee_ticker/validator/mod.rs +++ b/core/bin/zksync_api/src/fee_ticker/validator/mod.rs @@ -337,9 +337,9 @@ mod tests { .token_allowed(TokenLike::Address(eth_address)) .await .unwrap(); - assert!(dai_allowed); - assert!(!phnx_allowed); - assert!(eth_allowed); + assert_eq!(dai_allowed, true); + assert_eq!(phnx_allowed, false); + assert_eq!(eth_allowed, true); assert!(validator.tokens.get(&dai_token_address).unwrap().allowed); assert!(!validator.tokens.get(&phnx_token_address).unwrap().allowed); } diff --git a/core/bin/zksync_core/src/committer/aggregated_committer.rs b/core/bin/zksync_core/src/committer/aggregated_committer.rs index 20d30b37c1..43b0e799fd 100644 --- a/core/bin/zksync_core/src/committer/aggregated_committer.rs +++ b/core/bin/zksync_core/src/committer/aggregated_committer.rs @@ -218,7 +218,7 @@ async fn is_fast_processing_requested( break; } } - Ok(fast_processing) + return Ok(fast_processing); } async fn create_aggregated_commits_storage( diff --git a/core/bin/zksync_core/src/state_keeper/tests.rs b/core/bin/zksync_core/src/state_keeper/tests.rs index 2244c8828d..6b925ea50d 100644 --- a/core/bin/zksync_core/src/state_keeper/tests.rs +++ b/core/bin/zksync_core/src/state_keeper/tests.rs @@ -145,7 +145,7 @@ fn create_account_and_fast_withdrawal>( ) } -#[allow(clippy::too_many_arguments)] +#[allow(clippy::clippy::too_many_arguments)] fn create_account_and_withdrawal_impl>( tester: &mut StateKeeperTester, token_id: TokenId, @@ -337,8 +337,8 @@ mod apply_tx { let pending_block = tester.state_keeper.pending_block; assert!(result.is_ok()); - assert!(!old_pending_block.fast_processing_required); - assert!(pending_block.fast_processing_required); + assert_eq!(old_pending_block.fast_processing_required, false); + assert_eq!(pending_block.fast_processing_required, true); } /// Checks if withdrawal that will fail is processed correctly diff --git a/core/bin/zksync_eth_sender/src/tests/mock.rs b/core/bin/zksync_eth_sender/src/tests/mock.rs index 6d4aa9b8a8..fa9f4c0856 100644 --- a/core/bin/zksync_eth_sender/src/tests/mock.rs +++ b/core/bin/zksync_eth_sender/src/tests/mock.rs @@ -339,7 +339,7 @@ impl DatabaseInterface for MockDatabase { let eth_operations = self.eth_operations.read().await.clone(); // Consider an operation that affects sequential blocks. - let maybe_operation = eth_operations.iter().find(|eth_operation| { + let maybe_operation = eth_operations.iter().find(|(eth_operation)| { let op_block_range = eth_operation.op.as_ref().unwrap().1.get_block_range(); op_block_range.1 == first_block - 1 diff --git a/core/bin/zksync_witness_generator/src/tests/mock.rs b/core/bin/zksync_witness_generator/src/tests/mock.rs index 0191ba4738..63167818bf 100644 --- a/core/bin/zksync_witness_generator/src/tests/mock.rs +++ b/core/bin/zksync_witness_generator/src/tests/mock.rs @@ -382,9 +382,10 @@ impl DatabaseInterface for MockDatabase { ) -> anyhow::Result<()> { let witness_str = serde_json::to_string(&witness).expect("Failed to serialize witness"); let mut block_witness = self.block_witness.write().await; - let is_block_not_saved_yet = !block_witness + let is_block_not_saved_yet = block_witness .iter() - .any(|witness| witness.block == *block as i64); + .find(|witness| witness.block == *block as i64) + .is_none(); if is_block_not_saved_yet { block_witness.push(StorageBlockWitness { diff --git a/core/lib/circuit/src/witness/change_pubkey_offchain.rs b/core/lib/circuit/src/witness/change_pubkey_offchain.rs index fe75a200cb..de7ad623f0 100644 --- a/core/lib/circuit/src/witness/change_pubkey_offchain.rs +++ b/core/lib/circuit/src/witness/change_pubkey_offchain.rs @@ -64,7 +64,7 @@ impl Witness for ChangePubkeyOffChainWitness { let change_pubkey_data = ChangePubkeyOffChainData { account_id: *change_pubkey_offchain.account_id, address: eth_address_to_fr(&change_pubkey_offchain.tx.account), - new_pubkey_hash: change_pubkey_offchain.tx.new_pk_hash.as_fr(), + new_pubkey_hash: change_pubkey_offchain.tx.new_pk_hash.to_fr(), fee_token: *change_pubkey_offchain.tx.fee_token as u32, fee: change_pubkey_offchain.tx.fee.to_u128().unwrap(), nonce: fr_from(change_pubkey_offchain.tx.nonce), diff --git a/core/lib/storage/src/event/mod.rs b/core/lib/storage/src/event/mod.rs index aa24ff3bf4..e89ab18317 100644 --- a/core/lib/storage/src/event/mod.rs +++ b/core/lib/storage/src/event/mod.rs @@ -188,7 +188,8 @@ impl<'a, 'c> EventSchema<'a, 'c> { }, ) }) - .flatten() + .filter(|x| x.is_some()) + .map(|x| x.unwrap()) .collect(); transaction diff --git a/core/lib/storage/src/tests/chain/mempool.rs b/core/lib/storage/src/tests/chain/mempool.rs index eab6b742be..05abe42cf6 100644 --- a/core/lib/storage/src/tests/chain/mempool.rs +++ b/core/lib/storage/src/tests/chain/mempool.rs @@ -314,7 +314,10 @@ async fn contains_and_get_tx(mut storage: StorageProcessor<'_>) -> QueryResult<( for tx in &txs { let tx_hash = tx.hash(); - assert!(!MempoolSchema(&mut storage).contains_tx(tx_hash).await?); + assert_eq!( + MempoolSchema(&mut storage).contains_tx(tx_hash).await?, + false + ); assert!(MempoolSchema(&mut storage).get_tx(tx_hash).await?.is_none()); } @@ -335,7 +338,10 @@ async fn contains_and_get_tx(mut storage: StorageProcessor<'_>) -> QueryResult<( for tx in &txs { let tx_hash = tx.hash(); - assert!(MempoolSchema(&mut storage).contains_tx(tx_hash).await?); + assert_eq!( + MempoolSchema(&mut storage).contains_tx(tx_hash).await?, + true + ); assert_eq!( MempoolSchema(&mut storage) .get_tx(tx_hash) diff --git a/core/lib/storage/src/tests/chain/operations.rs b/core/lib/storage/src/tests/chain/operations.rs index 919b0ae3ab..4e6433d87d 100644 --- a/core/lib/storage/src/tests/chain/operations.rs +++ b/core/lib/storage/src/tests/chain/operations.rs @@ -37,7 +37,7 @@ async fn aggregated_operations(mut storage: StorageProcessor<'_>) -> QueryResult assert_eq!(stored_operation.from_block, 1); assert_eq!(stored_operation.to_block, 1); assert_eq!(stored_operation.action_type, action_type.to_string()); - assert!(!stored_operation.confirmed); + assert_eq!(stored_operation.confirmed, false); Ok(()) } @@ -248,7 +248,7 @@ async fn transaction_resent(mut storage: StorageProcessor<'_>) -> QueryResult<() .await? .unwrap(); assert_eq!(loaded_tx.tx_hash, executed_tx.tx_hash); - assert!(loaded_tx.success); + assert_eq!(loaded_tx.success, true); // Get the block transactions and check if there is exactly 1 tx (failed tx not copied but replaced). let block_txs = BlockSchema(&mut storage) @@ -268,7 +268,7 @@ async fn transaction_resent(mut storage: StorageProcessor<'_>) -> QueryResult<() .await? .unwrap(); assert_eq!(loaded_tx.tx_hash, executed_tx.tx_hash); - assert!(loaded_tx.success); + assert_eq!(loaded_tx.success, true); // ...and there still must be one operation. let block_txs = BlockSchema(&mut storage) diff --git a/core/lib/types/src/account/mod.rs b/core/lib/types/src/account/mod.rs index 888148b960..e991b0c32f 100644 --- a/core/lib/types/src/account/mod.rs +++ b/core/lib/types/src/account/mod.rs @@ -66,7 +66,7 @@ impl From for CircuitAccount { } circuit_account.nonce = Fr::from_str(&acc.nonce.to_string()).unwrap(); - circuit_account.pub_key_hash = acc.pub_key_hash.as_fr(); + circuit_account.pub_key_hash = acc.pub_key_hash.to_fr(); circuit_account.address = eth_address_to_fr(&acc.address); circuit_account } diff --git a/core/lib/types/src/account/pubkey_hash.rs b/core/lib/types/src/account/pubkey_hash.rs index a55ae47ad2..069940d84f 100644 --- a/core/lib/types/src/account/pubkey_hash.rs +++ b/core/lib/types/src/account/pubkey_hash.rs @@ -23,7 +23,7 @@ pub struct PubKeyHash { impl std::fmt::Debug for PubKeyHash { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.as_hex()) + write!(f, "{}", self.to_hex()) } } @@ -47,9 +47,9 @@ impl PubKeyHash { /// use zksync_types::account::PubKeyHash; /// /// let pubkey_hash = PubKeyHash::zero(); - /// assert_eq!(pubkey_hash.as_hex(), "sync:0000000000000000000000000000000000000000"); + /// assert_eq!(pubkey_hash.to_hex(), "sync:0000000000000000000000000000000000000000"); /// ``` - pub fn as_hex(&self) -> String { + pub fn to_hex(&self) -> String { format!("sync:{}", hex::encode(&self.data)) } @@ -92,7 +92,7 @@ impl PubKeyHash { } /// Converts the `PubKeyhash` into the field element. - pub fn as_fr(&self) -> Fr { + pub fn to_fr(&self) -> Fr { ff::from_hex(&format!("0x{}", hex::encode(&self.data))).unwrap() } @@ -108,7 +108,7 @@ impl Serialize for PubKeyHash { where S: Serializer, { - serializer.serialize_str(&self.as_hex()) + serializer.serialize_str(&self.to_hex()) } } diff --git a/core/lib/types/src/operations/full_exit_op.rs b/core/lib/types/src/operations/full_exit_op.rs index ba595df4ed..4562b02fe3 100644 --- a/core/lib/types/src/operations/full_exit_op.rs +++ b/core/lib/types/src/operations/full_exit_op.rs @@ -50,10 +50,16 @@ impl FullExitOp { .unwrap() .to_be_bytes(), ); - data.extend_from_slice(&self.creator_account_id.unwrap_or_default().to_be_bytes()); - data.extend_from_slice(&self.creator_address.unwrap_or_default().as_bytes()); - data.extend_from_slice(&self.serial_id.unwrap_or_default().to_be_bytes()); - data.extend_from_slice(&self.content_hash.unwrap_or_default().as_bytes()); + data.extend_from_slice( + &self + .creator_account_id + .clone() + .unwrap_or_default() + .to_be_bytes(), + ); + data.extend_from_slice(&self.creator_address.clone().unwrap_or_default().as_bytes()); + data.extend_from_slice(&self.serial_id.clone().unwrap_or_default().to_be_bytes()); + data.extend_from_slice(&self.content_hash.clone().unwrap_or_default().as_bytes()); data.resize(Self::CHUNKS * CHUNK_BYTES, 0x00); data } @@ -71,7 +77,13 @@ impl FullExitOp { .unwrap_or(0) .to_be_bytes(), ); - data.extend_from_slice(&self.creator_account_id.unwrap_or_default().to_be_bytes()); + data.extend_from_slice( + &self + .creator_account_id + .clone() + .unwrap_or_default() + .to_be_bytes(), + ); data } diff --git a/core/lib/types/src/tx/change_pubkey.rs b/core/lib/types/src/tx/change_pubkey.rs index 50bb286f0c..d99cdc4557 100644 --- a/core/lib/types/src/tx/change_pubkey.rs +++ b/core/lib/types/src/tx/change_pubkey.rs @@ -266,7 +266,7 @@ impl ChangePubKey { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.as_be_bytes()); + out.extend_from_slice(&time_range.to_be_bytes()); } out } @@ -287,7 +287,7 @@ impl ChangePubKey { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.as_be_bytes()); + out.extend_from_slice(&time_range.to_be_bytes()); } out } diff --git a/core/lib/types/src/tx/close.rs b/core/lib/types/src/tx/close.rs index 7172d2888f..4d8417009c 100644 --- a/core/lib/types/src/tx/close.rs +++ b/core/lib/types/src/tx/close.rs @@ -25,7 +25,7 @@ impl Close { out.extend_from_slice(&[Self::TX_TYPE]); out.extend_from_slice(&self.account.as_bytes()); out.extend_from_slice(&self.nonce.to_be_bytes()); - out.extend_from_slice(&self.time_range.as_be_bytes()); + out.extend_from_slice(&self.time_range.to_be_bytes()); out } diff --git a/core/lib/types/src/tx/forced_exit.rs b/core/lib/types/src/tx/forced_exit.rs index a5a414c228..80a0caff4b 100644 --- a/core/lib/types/src/tx/forced_exit.rs +++ b/core/lib/types/src/tx/forced_exit.rs @@ -120,7 +120,7 @@ impl ForcedExit { out.extend_from_slice(&(self.token.0 as u16).to_be_bytes()); out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); - out.extend_from_slice(&self.time_range.as_be_bytes()); + out.extend_from_slice(&self.time_range.to_be_bytes()); out } @@ -138,7 +138,7 @@ impl ForcedExit { out.extend_from_slice(&self.token.to_be_bytes()); out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); - out.extend_from_slice(&self.time_range.as_be_bytes()); + out.extend_from_slice(&self.time_range.to_be_bytes()); out } diff --git a/core/lib/types/src/tx/primitives/time_range.rs b/core/lib/types/src/tx/primitives/time_range.rs index d495ea64bc..fbd40646e7 100644 --- a/core/lib/types/src/tx/primitives/time_range.rs +++ b/core/lib/types/src/tx/primitives/time_range.rs @@ -18,7 +18,7 @@ impl TimeRange { } } - pub fn as_be_bytes(&self) -> [u8; 16] { + pub fn to_be_bytes(&self) -> [u8; 16] { [ self.valid_from.to_be_bytes(), self.valid_until.to_be_bytes(), diff --git a/core/lib/types/src/tx/swap.rs b/core/lib/types/src/tx/swap.rs index 1114d95670..eae1557178 100644 --- a/core/lib/types/src/tx/swap.rs +++ b/core/lib/types/src/tx/swap.rs @@ -80,7 +80,7 @@ impl Order { out.extend_from_slice(&pad_front(&self.price.0.to_bytes_be(), PRICE_BIT_WIDTH / 8)); out.extend_from_slice(&pad_front(&self.price.1.to_bytes_be(), PRICE_BIT_WIDTH / 8)); out.extend_from_slice(&pack_token_amount(&self.amount)); - out.extend_from_slice(&self.time_range.as_be_bytes()); + out.extend_from_slice(&self.time_range.to_be_bytes()); out } diff --git a/core/lib/types/src/tx/tests.rs b/core/lib/types/src/tx/tests.rs index 5f728fe35b..93f8f3593a 100644 --- a/core/lib/types/src/tx/tests.rs +++ b/core/lib/types/src/tx/tests.rs @@ -81,7 +81,7 @@ fn test_print_transfer_for_protocol() { transfer .time_range .expect("no time range on transfer") - .as_be_bytes() + .to_be_bytes() .to_vec(), ), ]; @@ -141,7 +141,7 @@ fn test_print_change_pub_key_for_protocol() { transfer .time_range .expect("no time range on transfer") - .as_be_bytes() + .to_be_bytes() .to_vec(), ), ]; @@ -204,7 +204,7 @@ fn test_print_withdraw_for_protocol() { withdraw .time_range .expect("no time range on withdraw") - .as_be_bytes() + .to_be_bytes() .to_vec(), ), ]; @@ -259,7 +259,7 @@ fn test_print_withdraw_nft_for_protocol() { ("fee_token", withdraw.fee_token.to_be_bytes().to_vec()), ("fee", pack_fee_amount(&withdraw.fee)), ("nonce", withdraw.nonce.to_be_bytes().to_vec()), - ("time_range", withdraw.time_range.as_be_bytes().to_vec()), + ("time_range", withdraw.time_range.to_be_bytes().to_vec()), ]; println!("Signed transaction fields:"); let mut field_concat = Vec::new(); diff --git a/core/lib/types/src/tx/transfer.rs b/core/lib/types/src/tx/transfer.rs index 8823ee7135..e19776655e 100644 --- a/core/lib/types/src/tx/transfer.rs +++ b/core/lib/types/src/tx/transfer.rs @@ -134,7 +134,7 @@ impl Transfer { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.as_be_bytes()); + out.extend_from_slice(&time_range.to_be_bytes()); } out } @@ -159,7 +159,7 @@ impl Transfer { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.as_be_bytes()); + out.extend_from_slice(&time_range.to_be_bytes()); } out } diff --git a/core/lib/types/src/tx/withdraw.rs b/core/lib/types/src/tx/withdraw.rs index 97eb4feb64..dc27facc8c 100644 --- a/core/lib/types/src/tx/withdraw.rs +++ b/core/lib/types/src/tx/withdraw.rs @@ -139,7 +139,7 @@ impl Withdraw { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.as_be_bytes()); + out.extend_from_slice(&time_range.to_be_bytes()); } out } @@ -161,7 +161,7 @@ impl Withdraw { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.as_be_bytes()); + out.extend_from_slice(&time_range.to_be_bytes()); } out } diff --git a/core/lib/types/src/tx/withdraw_nft.rs b/core/lib/types/src/tx/withdraw_nft.rs index 8db125208c..1e86699214 100644 --- a/core/lib/types/src/tx/withdraw_nft.rs +++ b/core/lib/types/src/tx/withdraw_nft.rs @@ -132,7 +132,7 @@ impl WithdrawNFT { out.extend_from_slice(&self.fee_token.to_be_bytes()); out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); - out.extend_from_slice(&self.time_range.as_be_bytes()); + out.extend_from_slice(&self.time_range.to_be_bytes()); out } diff --git a/core/tests/loadnext/src/corrupted_tx.rs b/core/tests/loadnext/src/corrupted_tx.rs index bb2f10287e..05fa12e23d 100644 --- a/core/tests/loadnext/src/corrupted_tx.rs +++ b/core/tests/loadnext/src/corrupted_tx.rs @@ -395,9 +395,10 @@ mod tests { let (modified_transfer, _eth_signature) = transfer.not_packable_amount(account.eth_account_data.unwrap_eoa_pk(), "ETH", 18); - assert!(!is_token_amount_packable( - &unwrap_transfer(modified_transfer).amount - )); + assert_eq!( + is_token_amount_packable(&unwrap_transfer(modified_transfer).amount), + false + ); } #[test] @@ -409,9 +410,10 @@ mod tests { let (modified_transfer, _eth_signature) = transfer.not_packable_fee(account.eth_account_data.unwrap_eoa_pk(), "ETH", 18); - assert!(!is_fee_amount_packable( - &unwrap_transfer(modified_transfer).fee - )); + assert_eq!( + is_fee_amount_packable(&unwrap_transfer(modified_transfer).fee), + false + ); } #[test] diff --git a/core/tests/testkit/src/test_setup.rs b/core/tests/testkit/src/test_setup.rs index dfd998ba11..2af980cb41 100644 --- a/core/tests/testkit/src/test_setup.rs +++ b/core/tests/testkit/src/test_setup.rs @@ -164,8 +164,6 @@ impl TestSetup { (receipts, deposit_op) } - #[allow(clippy::map_entry)] - // Due to await function map entry looks really ugly pub async fn setup_basic_l1_balances(&mut self, eth_account_id: ETHAccountId, token: Token) { if !self .expected_changes_for_current_block From 9ef9e019cabee3ddd3fc24173d53082e2f695d97 Mon Sep 17 00:00:00 2001 From: Stanislav Bezkorovainyi Date: Wed, 21 Jul 2021 11:07:27 +0300 Subject: [PATCH 2/3] Reverse some changes --- core/bin/prover/src/client.rs | 16 +++++++------- core/bin/zksync_api/src/eth_checker.rs | 2 +- .../src/fee_ticker/validator/mod.rs | 6 ++--- .../src/committer/aggregated_committer.rs | 2 +- .../bin/zksync_core/src/state_keeper/tests.rs | 6 ++--- core/bin/zksync_eth_sender/src/tests/mock.rs | 2 +- .../src/tests/mock.rs | 5 ++--- .../src/witness/change_pubkey_offchain.rs | 2 +- core/lib/storage/src/event/mod.rs | 3 +-- core/lib/storage/src/tests/chain/mempool.rs | 10 ++------- .../lib/storage/src/tests/chain/operations.rs | 6 ++--- core/lib/types/src/account/mod.rs | 2 +- core/lib/types/src/account/pubkey_hash.rs | 10 ++++----- core/lib/types/src/operations/full_exit_op.rs | 22 +++++-------------- core/lib/types/src/tx/change_pubkey.rs | 4 ++-- core/lib/types/src/tx/close.rs | 2 +- core/lib/types/src/tx/forced_exit.rs | 4 ++-- .../lib/types/src/tx/primitives/time_range.rs | 2 +- core/lib/types/src/tx/swap.rs | 2 +- core/lib/types/src/tx/tests.rs | 8 +++---- core/lib/types/src/tx/transfer.rs | 4 ++-- core/lib/types/src/tx/withdraw.rs | 4 ++-- core/lib/types/src/tx/withdraw_nft.rs | 2 +- core/tests/loadnext/src/corrupted_tx.rs | 14 +++++------- core/tests/testkit/src/test_setup.rs | 2 ++ docker/prover/Dockerfile | 2 +- docker/server/Dockerfile | 2 +- 27 files changed, 63 insertions(+), 83 deletions(-) diff --git a/core/bin/prover/src/client.rs b/core/bin/prover/src/client.rs index c13b4cb617..67c66db9ad 100644 --- a/core/bin/prover/src/client.rs +++ b/core/bin/prover/src/client.rs @@ -96,7 +96,7 @@ impl ApiClient { #[async_trait::async_trait] impl crate::ApiClient for ApiClient { async fn get_job(&self, req: ProverInputRequest) -> anyhow::Result { - let operation = (|| async { + let operation = || async { vlog::trace!("get prover job"); let response = self @@ -116,13 +116,13 @@ impl crate::ApiClient for ApiClient { .json() .await .map_err(|e| Transient(format_err!("failed parse json on get job request: {}", e))) - }); + }; self.with_retries(operation).await } async fn working_on(&self, job_id: i32, prover_name: &str) -> anyhow::Result<()> { - let operation = (|| async { + let operation = || async { log::trace!( "sending working_on job_id: {}, prover_name: {}", job_id, @@ -146,13 +146,13 @@ impl crate::ApiClient for ApiClient { } Ok(()) - }); + }; self.with_retries(operation).await } async fn publish(&self, data: ProverOutputRequest) -> anyhow::Result<()> { - let operation = (|| async { + let operation = || async { log::trace!("Trying publish proof: {:?}", data); let response = self @@ -169,13 +169,13 @@ impl crate::ApiClient for ApiClient { } Ok(()) - }); + }; self.with_retries(operation).await } async fn prover_stopped(&self, prover_name: String) -> anyhow::Result<()> { - let operation = (|| async { + let operation = || async { let response = self .http_client .post(self.stopped_url.clone()) @@ -194,7 +194,7 @@ impl crate::ApiClient for ApiClient { } Ok(()) - }); + }; self.with_retries(operation).await } diff --git a/core/bin/zksync_api/src/eth_checker.rs b/core/bin/zksync_api/src/eth_checker.rs index 3c1e003e98..19522afe90 100644 --- a/core/bin/zksync_api/src/eth_checker.rs +++ b/core/bin/zksync_api/src/eth_checker.rs @@ -141,7 +141,7 @@ mod tests { .await .expect("Check failed"); - assert_eq!(result, true, "Signature is incorrect"); + assert!(result, "Signature is incorrect"); } /// This test checks that the actual signature data taken from diff --git a/core/bin/zksync_api/src/fee_ticker/validator/mod.rs b/core/bin/zksync_api/src/fee_ticker/validator/mod.rs index dedb958548..5b8fe52186 100644 --- a/core/bin/zksync_api/src/fee_ticker/validator/mod.rs +++ b/core/bin/zksync_api/src/fee_ticker/validator/mod.rs @@ -337,9 +337,9 @@ mod tests { .token_allowed(TokenLike::Address(eth_address)) .await .unwrap(); - assert_eq!(dai_allowed, true); - assert_eq!(phnx_allowed, false); - assert_eq!(eth_allowed, true); + assert!(dai_allowed); + assert!(!phnx_allowed); + assert!(eth_allowed); assert!(validator.tokens.get(&dai_token_address).unwrap().allowed); assert!(!validator.tokens.get(&phnx_token_address).unwrap().allowed); } diff --git a/core/bin/zksync_core/src/committer/aggregated_committer.rs b/core/bin/zksync_core/src/committer/aggregated_committer.rs index 43b0e799fd..20d30b37c1 100644 --- a/core/bin/zksync_core/src/committer/aggregated_committer.rs +++ b/core/bin/zksync_core/src/committer/aggregated_committer.rs @@ -218,7 +218,7 @@ async fn is_fast_processing_requested( break; } } - return Ok(fast_processing); + Ok(fast_processing) } async fn create_aggregated_commits_storage( diff --git a/core/bin/zksync_core/src/state_keeper/tests.rs b/core/bin/zksync_core/src/state_keeper/tests.rs index 6b925ea50d..2244c8828d 100644 --- a/core/bin/zksync_core/src/state_keeper/tests.rs +++ b/core/bin/zksync_core/src/state_keeper/tests.rs @@ -145,7 +145,7 @@ fn create_account_and_fast_withdrawal>( ) } -#[allow(clippy::clippy::too_many_arguments)] +#[allow(clippy::too_many_arguments)] fn create_account_and_withdrawal_impl>( tester: &mut StateKeeperTester, token_id: TokenId, @@ -337,8 +337,8 @@ mod apply_tx { let pending_block = tester.state_keeper.pending_block; assert!(result.is_ok()); - assert_eq!(old_pending_block.fast_processing_required, false); - assert_eq!(pending_block.fast_processing_required, true); + assert!(!old_pending_block.fast_processing_required); + assert!(pending_block.fast_processing_required); } /// Checks if withdrawal that will fail is processed correctly diff --git a/core/bin/zksync_eth_sender/src/tests/mock.rs b/core/bin/zksync_eth_sender/src/tests/mock.rs index fa9f4c0856..6d4aa9b8a8 100644 --- a/core/bin/zksync_eth_sender/src/tests/mock.rs +++ b/core/bin/zksync_eth_sender/src/tests/mock.rs @@ -339,7 +339,7 @@ impl DatabaseInterface for MockDatabase { let eth_operations = self.eth_operations.read().await.clone(); // Consider an operation that affects sequential blocks. - let maybe_operation = eth_operations.iter().find(|(eth_operation)| { + let maybe_operation = eth_operations.iter().find(|eth_operation| { let op_block_range = eth_operation.op.as_ref().unwrap().1.get_block_range(); op_block_range.1 == first_block - 1 diff --git a/core/bin/zksync_witness_generator/src/tests/mock.rs b/core/bin/zksync_witness_generator/src/tests/mock.rs index 63167818bf..0191ba4738 100644 --- a/core/bin/zksync_witness_generator/src/tests/mock.rs +++ b/core/bin/zksync_witness_generator/src/tests/mock.rs @@ -382,10 +382,9 @@ impl DatabaseInterface for MockDatabase { ) -> anyhow::Result<()> { let witness_str = serde_json::to_string(&witness).expect("Failed to serialize witness"); let mut block_witness = self.block_witness.write().await; - let is_block_not_saved_yet = block_witness + let is_block_not_saved_yet = !block_witness .iter() - .find(|witness| witness.block == *block as i64) - .is_none(); + .any(|witness| witness.block == *block as i64); if is_block_not_saved_yet { block_witness.push(StorageBlockWitness { diff --git a/core/lib/circuit/src/witness/change_pubkey_offchain.rs b/core/lib/circuit/src/witness/change_pubkey_offchain.rs index de7ad623f0..fe75a200cb 100644 --- a/core/lib/circuit/src/witness/change_pubkey_offchain.rs +++ b/core/lib/circuit/src/witness/change_pubkey_offchain.rs @@ -64,7 +64,7 @@ impl Witness for ChangePubkeyOffChainWitness { let change_pubkey_data = ChangePubkeyOffChainData { account_id: *change_pubkey_offchain.account_id, address: eth_address_to_fr(&change_pubkey_offchain.tx.account), - new_pubkey_hash: change_pubkey_offchain.tx.new_pk_hash.to_fr(), + new_pubkey_hash: change_pubkey_offchain.tx.new_pk_hash.as_fr(), fee_token: *change_pubkey_offchain.tx.fee_token as u32, fee: change_pubkey_offchain.tx.fee.to_u128().unwrap(), nonce: fr_from(change_pubkey_offchain.tx.nonce), diff --git a/core/lib/storage/src/event/mod.rs b/core/lib/storage/src/event/mod.rs index e89ab18317..aa24ff3bf4 100644 --- a/core/lib/storage/src/event/mod.rs +++ b/core/lib/storage/src/event/mod.rs @@ -188,8 +188,7 @@ impl<'a, 'c> EventSchema<'a, 'c> { }, ) }) - .filter(|x| x.is_some()) - .map(|x| x.unwrap()) + .flatten() .collect(); transaction diff --git a/core/lib/storage/src/tests/chain/mempool.rs b/core/lib/storage/src/tests/chain/mempool.rs index 05abe42cf6..eab6b742be 100644 --- a/core/lib/storage/src/tests/chain/mempool.rs +++ b/core/lib/storage/src/tests/chain/mempool.rs @@ -314,10 +314,7 @@ async fn contains_and_get_tx(mut storage: StorageProcessor<'_>) -> QueryResult<( for tx in &txs { let tx_hash = tx.hash(); - assert_eq!( - MempoolSchema(&mut storage).contains_tx(tx_hash).await?, - false - ); + assert!(!MempoolSchema(&mut storage).contains_tx(tx_hash).await?); assert!(MempoolSchema(&mut storage).get_tx(tx_hash).await?.is_none()); } @@ -338,10 +335,7 @@ async fn contains_and_get_tx(mut storage: StorageProcessor<'_>) -> QueryResult<( for tx in &txs { let tx_hash = tx.hash(); - assert_eq!( - MempoolSchema(&mut storage).contains_tx(tx_hash).await?, - true - ); + assert!(MempoolSchema(&mut storage).contains_tx(tx_hash).await?); assert_eq!( MempoolSchema(&mut storage) .get_tx(tx_hash) diff --git a/core/lib/storage/src/tests/chain/operations.rs b/core/lib/storage/src/tests/chain/operations.rs index 4e6433d87d..919b0ae3ab 100644 --- a/core/lib/storage/src/tests/chain/operations.rs +++ b/core/lib/storage/src/tests/chain/operations.rs @@ -37,7 +37,7 @@ async fn aggregated_operations(mut storage: StorageProcessor<'_>) -> QueryResult assert_eq!(stored_operation.from_block, 1); assert_eq!(stored_operation.to_block, 1); assert_eq!(stored_operation.action_type, action_type.to_string()); - assert_eq!(stored_operation.confirmed, false); + assert!(!stored_operation.confirmed); Ok(()) } @@ -248,7 +248,7 @@ async fn transaction_resent(mut storage: StorageProcessor<'_>) -> QueryResult<() .await? .unwrap(); assert_eq!(loaded_tx.tx_hash, executed_tx.tx_hash); - assert_eq!(loaded_tx.success, true); + assert!(loaded_tx.success); // Get the block transactions and check if there is exactly 1 tx (failed tx not copied but replaced). let block_txs = BlockSchema(&mut storage) @@ -268,7 +268,7 @@ async fn transaction_resent(mut storage: StorageProcessor<'_>) -> QueryResult<() .await? .unwrap(); assert_eq!(loaded_tx.tx_hash, executed_tx.tx_hash); - assert_eq!(loaded_tx.success, true); + assert!(loaded_tx.success); // ...and there still must be one operation. let block_txs = BlockSchema(&mut storage) diff --git a/core/lib/types/src/account/mod.rs b/core/lib/types/src/account/mod.rs index e991b0c32f..888148b960 100644 --- a/core/lib/types/src/account/mod.rs +++ b/core/lib/types/src/account/mod.rs @@ -66,7 +66,7 @@ impl From for CircuitAccount { } circuit_account.nonce = Fr::from_str(&acc.nonce.to_string()).unwrap(); - circuit_account.pub_key_hash = acc.pub_key_hash.to_fr(); + circuit_account.pub_key_hash = acc.pub_key_hash.as_fr(); circuit_account.address = eth_address_to_fr(&acc.address); circuit_account } diff --git a/core/lib/types/src/account/pubkey_hash.rs b/core/lib/types/src/account/pubkey_hash.rs index 069940d84f..a55ae47ad2 100644 --- a/core/lib/types/src/account/pubkey_hash.rs +++ b/core/lib/types/src/account/pubkey_hash.rs @@ -23,7 +23,7 @@ pub struct PubKeyHash { impl std::fmt::Debug for PubKeyHash { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.to_hex()) + write!(f, "{}", self.as_hex()) } } @@ -47,9 +47,9 @@ impl PubKeyHash { /// use zksync_types::account::PubKeyHash; /// /// let pubkey_hash = PubKeyHash::zero(); - /// assert_eq!(pubkey_hash.to_hex(), "sync:0000000000000000000000000000000000000000"); + /// assert_eq!(pubkey_hash.as_hex(), "sync:0000000000000000000000000000000000000000"); /// ``` - pub fn to_hex(&self) -> String { + pub fn as_hex(&self) -> String { format!("sync:{}", hex::encode(&self.data)) } @@ -92,7 +92,7 @@ impl PubKeyHash { } /// Converts the `PubKeyhash` into the field element. - pub fn to_fr(&self) -> Fr { + pub fn as_fr(&self) -> Fr { ff::from_hex(&format!("0x{}", hex::encode(&self.data))).unwrap() } @@ -108,7 +108,7 @@ impl Serialize for PubKeyHash { where S: Serializer, { - serializer.serialize_str(&self.to_hex()) + serializer.serialize_str(&self.as_hex()) } } diff --git a/core/lib/types/src/operations/full_exit_op.rs b/core/lib/types/src/operations/full_exit_op.rs index 4562b02fe3..ba595df4ed 100644 --- a/core/lib/types/src/operations/full_exit_op.rs +++ b/core/lib/types/src/operations/full_exit_op.rs @@ -50,16 +50,10 @@ impl FullExitOp { .unwrap() .to_be_bytes(), ); - data.extend_from_slice( - &self - .creator_account_id - .clone() - .unwrap_or_default() - .to_be_bytes(), - ); - data.extend_from_slice(&self.creator_address.clone().unwrap_or_default().as_bytes()); - data.extend_from_slice(&self.serial_id.clone().unwrap_or_default().to_be_bytes()); - data.extend_from_slice(&self.content_hash.clone().unwrap_or_default().as_bytes()); + data.extend_from_slice(&self.creator_account_id.unwrap_or_default().to_be_bytes()); + data.extend_from_slice(&self.creator_address.unwrap_or_default().as_bytes()); + data.extend_from_slice(&self.serial_id.unwrap_or_default().to_be_bytes()); + data.extend_from_slice(&self.content_hash.unwrap_or_default().as_bytes()); data.resize(Self::CHUNKS * CHUNK_BYTES, 0x00); data } @@ -77,13 +71,7 @@ impl FullExitOp { .unwrap_or(0) .to_be_bytes(), ); - data.extend_from_slice( - &self - .creator_account_id - .clone() - .unwrap_or_default() - .to_be_bytes(), - ); + data.extend_from_slice(&self.creator_account_id.unwrap_or_default().to_be_bytes()); data } diff --git a/core/lib/types/src/tx/change_pubkey.rs b/core/lib/types/src/tx/change_pubkey.rs index d99cdc4557..50bb286f0c 100644 --- a/core/lib/types/src/tx/change_pubkey.rs +++ b/core/lib/types/src/tx/change_pubkey.rs @@ -266,7 +266,7 @@ impl ChangePubKey { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.to_be_bytes()); + out.extend_from_slice(&time_range.as_be_bytes()); } out } @@ -287,7 +287,7 @@ impl ChangePubKey { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.to_be_bytes()); + out.extend_from_slice(&time_range.as_be_bytes()); } out } diff --git a/core/lib/types/src/tx/close.rs b/core/lib/types/src/tx/close.rs index 4d8417009c..7172d2888f 100644 --- a/core/lib/types/src/tx/close.rs +++ b/core/lib/types/src/tx/close.rs @@ -25,7 +25,7 @@ impl Close { out.extend_from_slice(&[Self::TX_TYPE]); out.extend_from_slice(&self.account.as_bytes()); out.extend_from_slice(&self.nonce.to_be_bytes()); - out.extend_from_slice(&self.time_range.to_be_bytes()); + out.extend_from_slice(&self.time_range.as_be_bytes()); out } diff --git a/core/lib/types/src/tx/forced_exit.rs b/core/lib/types/src/tx/forced_exit.rs index 80a0caff4b..a5a414c228 100644 --- a/core/lib/types/src/tx/forced_exit.rs +++ b/core/lib/types/src/tx/forced_exit.rs @@ -120,7 +120,7 @@ impl ForcedExit { out.extend_from_slice(&(self.token.0 as u16).to_be_bytes()); out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); - out.extend_from_slice(&self.time_range.to_be_bytes()); + out.extend_from_slice(&self.time_range.as_be_bytes()); out } @@ -138,7 +138,7 @@ impl ForcedExit { out.extend_from_slice(&self.token.to_be_bytes()); out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); - out.extend_from_slice(&self.time_range.to_be_bytes()); + out.extend_from_slice(&self.time_range.as_be_bytes()); out } diff --git a/core/lib/types/src/tx/primitives/time_range.rs b/core/lib/types/src/tx/primitives/time_range.rs index fbd40646e7..d495ea64bc 100644 --- a/core/lib/types/src/tx/primitives/time_range.rs +++ b/core/lib/types/src/tx/primitives/time_range.rs @@ -18,7 +18,7 @@ impl TimeRange { } } - pub fn to_be_bytes(&self) -> [u8; 16] { + pub fn as_be_bytes(&self) -> [u8; 16] { [ self.valid_from.to_be_bytes(), self.valid_until.to_be_bytes(), diff --git a/core/lib/types/src/tx/swap.rs b/core/lib/types/src/tx/swap.rs index eae1557178..1114d95670 100644 --- a/core/lib/types/src/tx/swap.rs +++ b/core/lib/types/src/tx/swap.rs @@ -80,7 +80,7 @@ impl Order { out.extend_from_slice(&pad_front(&self.price.0.to_bytes_be(), PRICE_BIT_WIDTH / 8)); out.extend_from_slice(&pad_front(&self.price.1.to_bytes_be(), PRICE_BIT_WIDTH / 8)); out.extend_from_slice(&pack_token_amount(&self.amount)); - out.extend_from_slice(&self.time_range.to_be_bytes()); + out.extend_from_slice(&self.time_range.as_be_bytes()); out } diff --git a/core/lib/types/src/tx/tests.rs b/core/lib/types/src/tx/tests.rs index 93f8f3593a..5f728fe35b 100644 --- a/core/lib/types/src/tx/tests.rs +++ b/core/lib/types/src/tx/tests.rs @@ -81,7 +81,7 @@ fn test_print_transfer_for_protocol() { transfer .time_range .expect("no time range on transfer") - .to_be_bytes() + .as_be_bytes() .to_vec(), ), ]; @@ -141,7 +141,7 @@ fn test_print_change_pub_key_for_protocol() { transfer .time_range .expect("no time range on transfer") - .to_be_bytes() + .as_be_bytes() .to_vec(), ), ]; @@ -204,7 +204,7 @@ fn test_print_withdraw_for_protocol() { withdraw .time_range .expect("no time range on withdraw") - .to_be_bytes() + .as_be_bytes() .to_vec(), ), ]; @@ -259,7 +259,7 @@ fn test_print_withdraw_nft_for_protocol() { ("fee_token", withdraw.fee_token.to_be_bytes().to_vec()), ("fee", pack_fee_amount(&withdraw.fee)), ("nonce", withdraw.nonce.to_be_bytes().to_vec()), - ("time_range", withdraw.time_range.to_be_bytes().to_vec()), + ("time_range", withdraw.time_range.as_be_bytes().to_vec()), ]; println!("Signed transaction fields:"); let mut field_concat = Vec::new(); diff --git a/core/lib/types/src/tx/transfer.rs b/core/lib/types/src/tx/transfer.rs index e19776655e..8823ee7135 100644 --- a/core/lib/types/src/tx/transfer.rs +++ b/core/lib/types/src/tx/transfer.rs @@ -134,7 +134,7 @@ impl Transfer { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.to_be_bytes()); + out.extend_from_slice(&time_range.as_be_bytes()); } out } @@ -159,7 +159,7 @@ impl Transfer { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.to_be_bytes()); + out.extend_from_slice(&time_range.as_be_bytes()); } out } diff --git a/core/lib/types/src/tx/withdraw.rs b/core/lib/types/src/tx/withdraw.rs index dc27facc8c..97eb4feb64 100644 --- a/core/lib/types/src/tx/withdraw.rs +++ b/core/lib/types/src/tx/withdraw.rs @@ -139,7 +139,7 @@ impl Withdraw { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.to_be_bytes()); + out.extend_from_slice(&time_range.as_be_bytes()); } out } @@ -161,7 +161,7 @@ impl Withdraw { out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); if let Some(time_range) = &self.time_range { - out.extend_from_slice(&time_range.to_be_bytes()); + out.extend_from_slice(&time_range.as_be_bytes()); } out } diff --git a/core/lib/types/src/tx/withdraw_nft.rs b/core/lib/types/src/tx/withdraw_nft.rs index 1e86699214..8db125208c 100644 --- a/core/lib/types/src/tx/withdraw_nft.rs +++ b/core/lib/types/src/tx/withdraw_nft.rs @@ -132,7 +132,7 @@ impl WithdrawNFT { out.extend_from_slice(&self.fee_token.to_be_bytes()); out.extend_from_slice(&pack_fee_amount(&self.fee)); out.extend_from_slice(&self.nonce.to_be_bytes()); - out.extend_from_slice(&self.time_range.to_be_bytes()); + out.extend_from_slice(&self.time_range.as_be_bytes()); out } diff --git a/core/tests/loadnext/src/corrupted_tx.rs b/core/tests/loadnext/src/corrupted_tx.rs index 05fa12e23d..bb2f10287e 100644 --- a/core/tests/loadnext/src/corrupted_tx.rs +++ b/core/tests/loadnext/src/corrupted_tx.rs @@ -395,10 +395,9 @@ mod tests { let (modified_transfer, _eth_signature) = transfer.not_packable_amount(account.eth_account_data.unwrap_eoa_pk(), "ETH", 18); - assert_eq!( - is_token_amount_packable(&unwrap_transfer(modified_transfer).amount), - false - ); + assert!(!is_token_amount_packable( + &unwrap_transfer(modified_transfer).amount + )); } #[test] @@ -410,10 +409,9 @@ mod tests { let (modified_transfer, _eth_signature) = transfer.not_packable_fee(account.eth_account_data.unwrap_eoa_pk(), "ETH", 18); - assert_eq!( - is_fee_amount_packable(&unwrap_transfer(modified_transfer).fee), - false - ); + assert!(!is_fee_amount_packable( + &unwrap_transfer(modified_transfer).fee + )); } #[test] diff --git a/core/tests/testkit/src/test_setup.rs b/core/tests/testkit/src/test_setup.rs index 2af980cb41..dfd998ba11 100644 --- a/core/tests/testkit/src/test_setup.rs +++ b/core/tests/testkit/src/test_setup.rs @@ -164,6 +164,8 @@ impl TestSetup { (receipts, deposit_op) } + #[allow(clippy::map_entry)] + // Due to await function map entry looks really ugly pub async fn setup_basic_l1_balances(&mut self, eth_account_id: ETHAccountId, token: Token) { if !self .expected_changes_for_current_block diff --git a/docker/prover/Dockerfile b/docker/prover/Dockerfile index 4e358f66fa..09f7508b39 100644 --- a/docker/prover/Dockerfile +++ b/docker/prover/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM rust:1.51 as builder +FROM rust:1.53 as builder WORKDIR /usr/src/zksync COPY . . RUN --mount=type=cache,target=/usr/local/cargo/registry \ diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 41519be72f..f513c0f3ab 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM rust:1.51 as builder +FROM rust:1.53 as builder WORKDIR /usr/src/zksync COPY . . RUN --mount=type=cache,target=/usr/local/cargo/registry \ From 8da7cc010ac64d49ef8b71f8a4a1355754c21235 Mon Sep 17 00:00:00 2001 From: Stanislav Bezkorovainyi Date: Wed, 21 Jul 2021 11:51:21 +0300 Subject: [PATCH 3/3] Change lexical-core and sqlx --- Cargo.lock | 6 +- core/lib/storage/sqlx-data.json | 141 -------------------------------- 2 files changed, 3 insertions(+), 144 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e09908ba9e..34715c825b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2754,13 +2754,13 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lexical-core" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec 0.5.1", "bitflags", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "ryu", "static_assertions", ] diff --git a/core/lib/storage/sqlx-data.json b/core/lib/storage/sqlx-data.json index 512ec0e775..9c67e8f1f9 100644 --- a/core/lib/storage/sqlx-data.json +++ b/core/lib/storage/sqlx-data.json @@ -2526,19 +2526,6 @@ "nullable": [] } }, - "5bfcd9e4747395bdd0cd3f48700c70ae930af359b357f707da1cbe7ea8267273": { - "query": "\n INSERT INTO txs_batches_hashes (batch_id, batch_hash)\n SELECT u.batch_id, u.batch_hash\n FROM UNNEST ($1::bigint[], $2::bytea[])\n AS u(batch_id, batch_hash)\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int8Array", - "ByteaArray" - ] - }, - "nullable": [] - } - }, "5d114595ec0f4fb9c49b846b4f245e454b02a47e88fa3b800d90c50564db74f0": { "query": "UPDATE eth_parameters SET last_committed_block = $1 WHERE id = true", "describe": { @@ -2686,19 +2673,6 @@ ] } }, - "6c25f6955c7381b5ed9bf4f2eb233adbd2923baafc688f36b66b86f44b456668": { - "query": "UPDATE blocks\n SET root_hash = $1\n WHERE number = $2", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Bytea", - "Int8" - ] - }, - "nullable": [] - } - }, "6d676581f14d0935983aca496bc37b58206b90320058290809020a2604b11df3": { "query": "SELECT max(number) FROM blocks", "describe": { @@ -3868,30 +3842,6 @@ "nullable": [] } }, - "9e72348619aa9c7f0f330c31f5ea4b3a73a4727a817e65e026756feea4d13d69": { - "query": "SELECT batch_id, array_agg(tx_hash) as txs\n FROM executed_transactions\n WHERE batch_id IS NOT NULL AND batch_id != 0\n GROUP BY batch_id\n ORDER BY batch_id;\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "batch_id", - "type_info": "Int8" - }, - { - "ordinal": 1, - "name": "txs", - "type_info": "ByteaArray" - } - ], - "parameters": { - "Left": [] - }, - "nullable": [ - true, - null - ] - } - }, "9fb67f0d0bc8387201e5358ca011da4b6d4d48c38c5de3f628c9818804c01376": { "query": "\n WITH transactions AS (\n SELECT\n tx_hash,\n tx as op,\n block_number,\n created_at,\n success,\n fail_reason,\n Null::bytea as eth_hash,\n Null::bigint as priority_op_serialid,\n block_index\n FROM executed_transactions\n WHERE block_number = $1 AND created_at <= $2\n ), priority_ops AS (\n SELECT\n tx_hash,\n operation as op,\n block_number,\n created_at,\n true as success,\n Null as fail_reason,\n eth_hash,\n priority_op_serialid,\n block_index\n FROM executed_priority_operations\n WHERE block_number = $1 AND created_at <= $2\n ), everything AS (\n SELECT * FROM transactions\n UNION ALL\n SELECT * FROM priority_ops\n )\n SELECT\n tx_hash as \"tx_hash!\",\n block_number as \"block_number!\",\n op as \"op!\",\n created_at as \"created_at!\",\n success as \"success!\",\n fail_reason as \"fail_reason?\",\n eth_hash as \"eth_hash?\",\n priority_op_serialid as \"priority_op_serialid?\"\n FROM everything\n ORDER BY created_at DESC, block_index DESC\n LIMIT $3\n ", "describe": { @@ -5434,19 +5384,6 @@ ] } }, - "d5c6be595f62ef758fd39d8263139cf2ce777612bae32805daba299881d9b1e0": { - "query": "\n UPDATE executed_priority_operations\n SET tx_hash = u.tx_hash\n FROM (\n SELECT * FROM\n UNNEST($1::bytea[], $2::bigint[])\n AS u(tx_hash, id)\n ) u\n WHERE priority_op_serialid = u.id\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "ByteaArray", - "Int8Array" - ] - }, - "nullable": [] - } - }, "d71db9de5e4ec2dc9a511d4a1247d912b15250bbd8f834f11b252de653c73176": { "query": "DELETE FROM account_creates WHERE block_number > $1", "describe": { @@ -6039,42 +5976,6 @@ ] } }, - "e80dba3fa7252902a9c53f7500f7e498bbe062eb833baeb271ecb1c9af468dc1": { - "query": "SELECT priority_op_serialid, eth_hash, eth_block, eth_block_index FROM executed_priority_operations", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "priority_op_serialid", - "type_info": "Int8" - }, - { - "ordinal": 1, - "name": "eth_hash", - "type_info": "Bytea" - }, - { - "ordinal": 2, - "name": "eth_block", - "type_info": "Int8" - }, - { - "ordinal": 3, - "name": "eth_block_index", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [] - }, - "nullable": [ - false, - false, - false, - true - ] - } - }, "e99d990d2d9b1c6068efb623634d6d6cf49a3c7ec33a5a916b7ddaa745e24c9b": { "query": "\n SELECT * FROM prover_job_queue\n WHERE job_status = $1\n ORDER BY (job_priority, id, first_block)\n LIMIT 1\n ", "describe": { @@ -6221,36 +6122,6 @@ ] } }, - "ed39b22ac81b690c2102487ae3351915eec23b00a9cf9e409de08662c42fa20d": { - "query": "SELECT * FROM balances", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "account_id", - "type_info": "Int8" - }, - { - "ordinal": 1, - "name": "coin_id", - "type_info": "Int4" - }, - { - "ordinal": 2, - "name": "balance", - "type_info": "Numeric" - } - ], - "parameters": { - "Left": [] - }, - "nullable": [ - false, - false, - false - ] - } - }, "ed4f6300995e13af62d0263cad9dfce76ae5aa8d2a5bc2be8e2f4b7de32fa2f6": { "query": "\n SELECT * FROM mint_nft_updates\n WHERE block_number = $1\n ", "describe": { @@ -6691,18 +6562,6 @@ ] } }, - "f5bb5886974577c7f43179f77638507511ffbe1462bb75844a1f1c72414a4d83": { - "query": "\n DELETE FROM account_tree_cache \n WHERE block = $1\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [] - } - }, "f7599bbef8c317c1ab1a61b2bcba3c5b03855b8a536bcdf369332c567b29d92c": { "query": "SELECT pg_notify($1, $2)", "describe": {